From 791df6f1174b4e13429519072391f355cf8a9336 Mon Sep 17 00:00:00 2001 From: Hyunjee Kim Date: Mon, 9 Dec 2019 15:36:21 +0900 Subject: [PATCH] Imported Upstream version 2.2.0 Change-Id: I780bcb203f85b468839f734ecff25749882cafd1 Signed-off-by: Hyunjee Kim --- Makefile.am | 3 +- Makefile.in | 5 ++- aminclude_static.am | 2 +- configure | 20 +++++----- configure.ac | 2 +- docs/Makefile | 6 +-- docs/man/Makefile | 8 ++-- docs/man/man1/Makefile | 6 +-- docs/man/man1misc/Makefile | 6 +-- docs/man/man5/Makefile | 6 +-- docs/man/man8/Makefile | 6 +-- docs/man/man8misc/Makefile | 6 +-- docs/reference/Makefile | 8 ++-- docs/reference/libkeymap/Doxyfile | 2 +- docs/reference/libkeymap/Makefile | 6 +-- docs/reference/libkeymap/html/Doxyheader.html | 4 +- docs/reference/libkeymap/html/annotated.html | 4 +- docs/reference/libkeymap/html/array_8h.html | 4 +- docs/reference/libkeymap/html/array_8h_source.html | 4 +- docs/reference/libkeymap/html/charset_8h.html | 4 +- .../libkeymap/html/charset_8h_source.html | 4 +- docs/reference/libkeymap/html/classes.html | 4 +- docs/reference/libkeymap/html/common_8h.html | 4 +- .../reference/libkeymap/html/common_8h_source.html | 4 +- docs/reference/libkeymap/html/context_8h.html | 4 +- .../libkeymap/html/context_8h_source.html | 4 +- .../html/dir_3023c0a2bf5f8a69a2e782253c163d72.html | 4 +- .../html/dir_49e56c817e5e54854c35e136979f97ca.html | 4 +- .../html/dir_4bd0647920563407f6428cd81f4b239d.html | 4 +- .../html/dir_5ba4a5643591dc5dc7d346d490557182.html | 4 +- .../html/dir_62c7a06ab6d0517e94baecab48e4799d.html | 4 +- .../html/dir_68267d1309a1af8e8297ef4c3efbcdba.html | 4 +- docs/reference/libkeymap/html/dump_8h.html | 4 +- docs/reference/libkeymap/html/dump_8h_source.html | 4 +- docs/reference/libkeymap/html/files.html | 4 +- docs/reference/libkeymap/html/functions.html | 4 +- docs/reference/libkeymap/html/functions_vars.html | 4 +- docs/reference/libkeymap/html/globals.html | 4 +- docs/reference/libkeymap/html/globals_defs.html | 4 +- docs/reference/libkeymap/html/globals_enum.html | 4 +- docs/reference/libkeymap/html/globals_eval.html | 4 +- docs/reference/libkeymap/html/globals_func.html | 4 +- docs/reference/libkeymap/html/globals_type.html | 4 +- docs/reference/libkeymap/html/index.html | 4 +- docs/reference/libkeymap/html/kernel_8h.html | 4 +- .../reference/libkeymap/html/kernel_8h_source.html | 4 +- docs/reference/libkeymap/html/kmap_8h.html | 4 +- docs/reference/libkeymap/html/kmap_8h_source.html | 4 +- docs/reference/libkeymap/html/logging_8h.html | 4 +- .../libkeymap/html/logging_8h_source.html | 4 +- docs/reference/libkeymap/html/structkmapinfo.html | 4 +- docs/reference/libkeymap/html/structlk__array.html | 4 +- .../libkeymap/html/structlk__kbdiacr.html | 4 +- po/cs.gmo | Bin 32009 -> 32009 bytes po/cs.po | 42 ++++++++++----------- po/da.gmo | Bin 23756 -> 23756 bytes po/da.po | 42 ++++++++++----------- po/de.gmo | Bin 32860 -> 32860 bytes po/de.po | 42 ++++++++++----------- po/el.gmo | Bin 41084 -> 41084 bytes po/el.po | 42 ++++++++++----------- po/eo.gmo | Bin 30963 -> 30963 bytes po/eo.po | 42 ++++++++++----------- po/es.gmo | Bin 22006 -> 22006 bytes po/es.po | 42 ++++++++++----------- po/fr.gmo | Bin 28224 -> 28224 bytes po/fr.po | 42 ++++++++++----------- po/gr.gmo | Bin 23540 -> 23540 bytes po/gr.po | 42 ++++++++++----------- po/id.gmo | Bin 21486 -> 21486 bytes po/id.po | 42 ++++++++++----------- po/it.gmo | Bin 25561 -> 25561 bytes po/it.po | 42 ++++++++++----------- po/kbd.pot | 42 ++++++++++----------- po/nl.gmo | Bin 32395 -> 32395 bytes po/nl.po | 42 ++++++++++----------- po/pl.gmo | Bin 32132 -> 32132 bytes po/pl.po | 42 ++++++++++----------- po/ro.gmo | Bin 17854 -> 17854 bytes po/ro.po | 42 ++++++++++----------- po/ru.gmo | Bin 42076 -> 42076 bytes po/ru.po | 42 ++++++++++----------- po/sv.gmo | Bin 31460 -> 31460 bytes po/sv.po | 42 ++++++++++----------- po/tr.gmo | Bin 17576 -> 17576 bytes po/tr.po | 42 ++++++++++----------- po/uk.gmo | Bin 41755 -> 41755 bytes po/uk.po | 42 ++++++++++----------- po/vi.gmo | Bin 34586 -> 34586 bytes po/vi.po | 42 ++++++++++----------- po/zh_CN.gmo | Bin 29933 -> 29933 bytes po/zh_CN.po | 42 ++++++++++----------- src/libkbdfile/kbdfile.c | 10 ++--- src/loadkeys.c | 32 ++++++++++++---- src/setfont.c | 23 ++++++----- tests/Makefile.am | 1 + tests/Makefile.in | 35 +++++++++++++++++ tests/libkbdfile-test01.c | 8 ++-- tests/libkbdfile-test02.c | 12 +++--- tests/libkbdfile-test03.c | 11 +++--- tests/libkbdfile-test04.c | 12 +++--- tests/libkbdfile-test05.c | 11 +++--- tests/libkbdfile-test06.c | 12 +++--- tests/libkbdfile-test07.c | 12 +++--- tests/libkbdfile-test08.c | 11 +++--- tests/libkbdfile-test09.c | 10 +++-- tests/libkbdfile-test10.c | 8 ++-- tests/libkbdfile-test11.c | 12 +++--- tests/libkbdfile-test12.c | 12 +++--- tests/libkeymap-bkeymap.c | 2 + tests/libkeymap-dumpkeys.c | 6 ++- tests/libkeymap-mktable.c | 2 + tests/libkeymap-showmaps.c | 2 + tests/libkeymap-test01.c | 16 ++++---- tests/libkeymap-test02.c | 18 +++++---- tests/libkeymap-test03.c | 8 ++-- tests/libkeymap-test04.c | 12 +++--- tests/libkeymap-test05.c | 26 +++++++------ tests/libkeymap-test06.c | 18 +++++---- tests/libkeymap-test07.c | 16 ++++---- tests/libkeymap-test08.c | 16 ++++---- tests/libkeymap-test09.c | 20 +++++----- tests/libkeymap-test10.c | 16 ++++---- tests/libkeymap-test11.c | 20 +++++----- tests/libkeymap-test12.c | 14 ++++--- tests/libkeymap-test13.c | 22 ++++++----- tests/libkeymap-test14.c | 10 +++-- tests/libkeymap-test15.c | 12 +++--- tests/libkeymap-test16.c | 10 +++-- tests/libkeymap-test17.c | 8 ++-- tests/libkeymap-test18.c | 8 ++-- 131 files changed, 862 insertions(+), 736 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5a05551..111c90c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,8 @@ include $(top_srcdir)/aminclude_static.am AM_DISTCHECK_CONFIGURE_FLAGS = \ --disable-code-coverage \ --enable-libkeymap \ - --enable-optional-progs + --enable-optional-progs \ + ${DISTCHECK_CONFIGURE_EXTRA_FLAGS} ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index cf28ade..9551471 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # aminclude_static.am generated automatically by Autoconf -# from AX_AM_MACROS_STATIC on Mon Jul 15 11:10:11 CEST 2019 +# from AX_AM_MACROS_STATIC on Wed Jul 31 11:59:20 CEST 2019 VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -397,7 +397,8 @@ CODE_COVERAGE_OUTPUT_DIRECTORY = coverage AM_DISTCHECK_CONFIGURE_FLAGS = \ --disable-code-coverage \ --enable-libkeymap \ - --enable-optional-progs + --enable-optional-progs \ + ${DISTCHECK_CONFIGURE_EXTRA_FLAGS} ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ diff --git a/aminclude_static.am b/aminclude_static.am index f73a148..b9c8789 100644 --- a/aminclude_static.am +++ b/aminclude_static.am @@ -1,6 +1,6 @@ # aminclude_static.am generated automatically by Autoconf -# from AX_AM_MACROS_STATIC on Mon Jul 15 11:10:11 CEST 2019 +# from AX_AM_MACROS_STATIC on Wed Jul 31 11:59:20 CEST 2019 # Code coverage diff --git a/configure b/configure index 42a2531..3076eb9 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for kbd 2.1.0. +# Generated by GNU Autoconf 2.69 for kbd 2.2.0. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='kbd' PACKAGE_TARNAME='kbd' -PACKAGE_VERSION='2.1.0' -PACKAGE_STRING='kbd 2.1.0' +PACKAGE_VERSION='2.2.0' +PACKAGE_STRING='kbd 2.2.0' PACKAGE_BUGREPORT='gladkov.alexey@gmail.com' PACKAGE_URL='http://kbd-project.org/' @@ -1376,7 +1376,7 @@ if test "$ac_init_help" = "long"; then # 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.1.0 to adapt to many kinds of systems. +\`configure' configures kbd 2.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1446,7 +1446,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of kbd 2.1.0:";; + short | recursive ) echo "Configuration of kbd 2.2.0:";; esac cat <<\_ACEOF @@ -1581,7 +1581,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -kbd configure 2.1.0 +kbd configure 2.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2033,7 +2033,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by kbd $as_me 2.1.0, which was +It was created by kbd $as_me 2.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2903,7 +2903,7 @@ fi # Define the identity of the package. PACKAGE='kbd' - VERSION='2.1.0' + VERSION='2.2.0' cat >>confdefs.h <<_ACEOF @@ -16796,7 +16796,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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.1.0, which was +This file was extended by kbd $as_me 2.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16863,7 +16863,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -kbd config.status 2.1.0 +kbd config.status 2.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 43823eb..6bf6401 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([kbd],[2.1.0],[gladkov.alexey@gmail.com],[],[http://kbd-project.org/]) +AC_INIT([kbd],[2.2.0],[gladkov.alexey@gmail.com],[],[http://kbd-project.org/]) AC_PREREQ([2.69]) diff --git a/docs/Makefile b/docs/Makefile index 20cf734..627fd8f 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -267,10 +267,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -283,7 +283,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = diff --git a/docs/man/Makefile b/docs/man/Makefile index d5b925c..3c58f2a 100644 --- a/docs/man/Makefile +++ b/docs/man/Makefile @@ -87,7 +87,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = x86_64-pc-linux-gnu host_triplet = x86_64-pc-linux-gnu -am__append_1 = man1misc man8misc +#am__append_1 = man1misc man8misc subdir = docs/man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ @@ -268,10 +268,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -284,7 +284,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = diff --git a/docs/man/man1/Makefile b/docs/man/man1/Makefile index 6b38ec3..0515583 100644 --- a/docs/man/man1/Makefile +++ b/docs/man/man1/Makefile @@ -240,10 +240,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -256,7 +256,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = diff --git a/docs/man/man1misc/Makefile b/docs/man/man1misc/Makefile index 1e72b37..aa4b2f7 100644 --- a/docs/man/man1misc/Makefile +++ b/docs/man/man1misc/Makefile @@ -238,10 +238,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -254,7 +254,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = diff --git a/docs/man/man5/Makefile b/docs/man/man5/Makefile index 93926d1..cd410d7 100644 --- a/docs/man/man5/Makefile +++ b/docs/man/man5/Makefile @@ -238,10 +238,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -254,7 +254,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = diff --git a/docs/man/man8/Makefile b/docs/man/man8/Makefile index c297559..7e50e5c 100644 --- a/docs/man/man8/Makefile +++ b/docs/man/man8/Makefile @@ -239,10 +239,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -255,7 +255,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = diff --git a/docs/man/man8misc/Makefile b/docs/man/man8misc/Makefile index f33e8e7..7f5226b 100644 --- a/docs/man/man8misc/Makefile +++ b/docs/man/man8misc/Makefile @@ -238,10 +238,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -254,7 +254,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = diff --git a/docs/reference/Makefile b/docs/reference/Makefile index dae3889..2c41388 100644 --- a/docs/reference/Makefile +++ b/docs/reference/Makefile @@ -267,10 +267,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -283,7 +283,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -341,7 +341,7 @@ target_alias = top_build_prefix = ../../ top_builddir = ../.. top_srcdir = ../.. -SUBDIRS = libkeymap +#SUBDIRS = libkeymap all: all-recursive .SUFFIXES: diff --git a/docs/reference/libkeymap/Doxyfile b/docs/reference/libkeymap/Doxyfile index bc58e1c..57c2345 100644 --- a/docs/reference/libkeymap/Doxyfile +++ b/docs/reference/libkeymap/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "libkeymap" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.0.90 +PROJECT_NUMBER = 2.1.0 # 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 a diff --git a/docs/reference/libkeymap/Makefile b/docs/reference/libkeymap/Makefile index a3c2b65..54b3978 100644 --- a/docs/reference/libkeymap/Makefile +++ b/docs/reference/libkeymap/Makefile @@ -237,10 +237,10 @@ OTOOL64 = PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.1.0 +PACKAGE_STRING = kbd 2.2.0 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.1.0 +PACKAGE_VERSION = 2.2.0 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -253,7 +253,7 @@ SET_MAKE = SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.1.0 +VERSION = 2.2.0 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = diff --git a/docs/reference/libkeymap/html/Doxyheader.html b/docs/reference/libkeymap/html/Doxyheader.html index 40d65c1..5b25eab 100644 --- a/docs/reference/libkeymap/html/Doxyheader.html +++ b/docs/reference/libkeymap/html/Doxyheader.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -51,7 +51,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/annotated.html b/docs/reference/libkeymap/html/annotated.html index 92489ac..7be9456 100644 --- a/docs/reference/libkeymap/html/annotated.html +++ b/docs/reference/libkeymap/html/annotated.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -54,7 +54,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/array_8h.html b/docs/reference/libkeymap/html/array_8h.html index d44368a..efe666e 100644 --- a/docs/reference/libkeymap/html/array_8h.html +++ b/docs/reference/libkeymap/html/array_8h.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -331,7 +331,7 @@ Functions
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/array_8h_source.html b/docs/reference/libkeymap/html/array_8h_source.html index a213e25..aa5df17 100644 --- a/docs/reference/libkeymap/html/array_8h_source.html +++ b/docs/reference/libkeymap/html/array_8h_source.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -65,7 +65,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/charset_8h.html b/docs/reference/libkeymap/html/charset_8h.html index e3ad766..5c269c5 100644 --- a/docs/reference/libkeymap/html/charset_8h.html +++ b/docs/reference/libkeymap/html/charset_8h.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -158,7 +158,7 @@ Functions
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/charset_8h_source.html b/docs/reference/libkeymap/html/charset_8h_source.html index 6f44a4b..4930960 100644 --- a/docs/reference/libkeymap/html/charset_8h_source.html +++ b/docs/reference/libkeymap/html/charset_8h_source.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -55,7 +55,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/classes.html b/docs/reference/libkeymap/html/classes.html index c2370df..4e86799 100644 --- a/docs/reference/libkeymap/html/classes.html +++ b/docs/reference/libkeymap/html/classes.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -57,7 +57,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/common_8h.html b/docs/reference/libkeymap/html/common_8h.html index c436535..6a4ef1f 100644 --- a/docs/reference/libkeymap/html/common_8h.html +++ b/docs/reference/libkeymap/html/common_8h.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -291,7 +291,7 @@ Functions
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/common_8h_source.html b/docs/reference/libkeymap/html/common_8h_source.html index 0af978f..325a3d3 100644 --- a/docs/reference/libkeymap/html/common_8h_source.html +++ b/docs/reference/libkeymap/html/common_8h_source.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -62,7 +62,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/context_8h.html b/docs/reference/libkeymap/html/context_8h.html index 4936b22..2c05357 100644 --- a/docs/reference/libkeymap/html/context_8h.html +++ b/docs/reference/libkeymap/html/context_8h.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -151,7 +151,7 @@ Enumerations
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/context_8h_source.html b/docs/reference/libkeymap/html/context_8h_source.html index 0f03574..b730f4c 100644 --- a/docs/reference/libkeymap/html/context_8h_source.html +++ b/docs/reference/libkeymap/html/context_8h_source.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -66,7 +66,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/dir_3023c0a2bf5f8a69a2e782253c163d72.html b/docs/reference/libkeymap/html/dir_3023c0a2bf5f8a69a2e782253c163d72.html index 87fad96..ff34fb2 100644 --- a/docs/reference/libkeymap/html/dir_3023c0a2bf5f8a69a2e782253c163d72.html +++ b/docs/reference/libkeymap/html/dir_3023c0a2bf5f8a69a2e782253c163d72.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -57,7 +57,7 @@ Directories
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/dir_49e56c817e5e54854c35e136979f97ca.html b/docs/reference/libkeymap/html/dir_49e56c817e5e54854c35e136979f97ca.html index d8c6b20..13ef5b5 100644 --- a/docs/reference/libkeymap/html/dir_49e56c817e5e54854c35e136979f97ca.html +++ b/docs/reference/libkeymap/html/dir_49e56c817e5e54854c35e136979f97ca.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -57,7 +57,7 @@ Directories
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/dir_4bd0647920563407f6428cd81f4b239d.html b/docs/reference/libkeymap/html/dir_4bd0647920563407f6428cd81f4b239d.html index df3715d..264c70d 100644 --- a/docs/reference/libkeymap/html/dir_4bd0647920563407f6428cd81f4b239d.html +++ b/docs/reference/libkeymap/html/dir_4bd0647920563407f6428cd81f4b239d.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -57,7 +57,7 @@ Files
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/dir_5ba4a5643591dc5dc7d346d490557182.html b/docs/reference/libkeymap/html/dir_5ba4a5643591dc5dc7d346d490557182.html index cc6ad02..44135ab 100644 --- a/docs/reference/libkeymap/html/dir_5ba4a5643591dc5dc7d346d490557182.html +++ b/docs/reference/libkeymap/html/dir_5ba4a5643591dc5dc7d346d490557182.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -57,7 +57,7 @@ Directories
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/dir_62c7a06ab6d0517e94baecab48e4799d.html b/docs/reference/libkeymap/html/dir_62c7a06ab6d0517e94baecab48e4799d.html index 617a4b3..7cd7684 100644 --- a/docs/reference/libkeymap/html/dir_62c7a06ab6d0517e94baecab48e4799d.html +++ b/docs/reference/libkeymap/html/dir_62c7a06ab6d0517e94baecab48e4799d.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -78,7 +78,7 @@ Files
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/docs/reference/libkeymap/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html index 96e72ac..e21a1ac 100644 --- a/docs/reference/libkeymap/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/docs/reference/libkeymap/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -57,7 +57,7 @@ Directories
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/dump_8h.html b/docs/reference/libkeymap/html/dump_8h.html index 8dd9e8e..e5f8fad 100644 --- a/docs/reference/libkeymap/html/dump_8h.html +++ b/docs/reference/libkeymap/html/dump_8h.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -613,7 +613,7 @@ Functions
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/dump_8h_source.html b/docs/reference/libkeymap/html/dump_8h_source.html index 7826025..bea18a3 100644 --- a/docs/reference/libkeymap/html/dump_8h_source.html +++ b/docs/reference/libkeymap/html/dump_8h_source.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -82,7 +82,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/files.html b/docs/reference/libkeymap/html/files.html index 4abcc1a..2fedf64 100644 --- a/docs/reference/libkeymap/html/files.html +++ b/docs/reference/libkeymap/html/files.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -66,7 +66,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/functions.html b/docs/reference/libkeymap/html/functions.html index e08c038..0e0d46e 100644 --- a/docs/reference/libkeymap/html/functions.html +++ b/docs/reference/libkeymap/html/functions.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -93,7 +93,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/functions_vars.html b/docs/reference/libkeymap/html/functions_vars.html index 394bfa3..2c2460b 100644 --- a/docs/reference/libkeymap/html/functions_vars.html +++ b/docs/reference/libkeymap/html/functions_vars.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -93,7 +93,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/globals.html b/docs/reference/libkeymap/html/globals.html index b71cb3b..5c18a31 100644 --- a/docs/reference/libkeymap/html/globals.html +++ b/docs/reference/libkeymap/html/globals.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -273,7 +273,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/globals_defs.html b/docs/reference/libkeymap/html/globals_defs.html index 3eb071a..ce53ac6 100644 --- a/docs/reference/libkeymap/html/globals_defs.html +++ b/docs/reference/libkeymap/html/globals_defs.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -48,7 +48,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/globals_enum.html b/docs/reference/libkeymap/html/globals_enum.html index 908d86f..42c88ec 100644 --- a/docs/reference/libkeymap/html/globals_enum.html +++ b/docs/reference/libkeymap/html/globals_enum.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -54,7 +54,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/globals_eval.html b/docs/reference/libkeymap/html/globals_eval.html index 525ad11..908d900 100644 --- a/docs/reference/libkeymap/html/globals_eval.html +++ b/docs/reference/libkeymap/html/globals_eval.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -81,7 +81,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/globals_func.html b/docs/reference/libkeymap/html/globals_func.html index 7615964..5bfe425 100644 --- a/docs/reference/libkeymap/html/globals_func.html +++ b/docs/reference/libkeymap/html/globals_func.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -218,7 +218,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/globals_type.html b/docs/reference/libkeymap/html/globals_type.html index 74eaa86..ca3ed45 100644 --- a/docs/reference/libkeymap/html/globals_type.html +++ b/docs/reference/libkeymap/html/globals_type.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -48,7 +48,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:01 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/index.html b/docs/reference/libkeymap/html/index.html index 26b69a3..b854755 100644 --- a/docs/reference/libkeymap/html/index.html +++ b/docs/reference/libkeymap/html/index.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -47,7 +47,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/kernel_8h.html b/docs/reference/libkeymap/html/kernel_8h.html index 46719e8..ef700a9 100644 --- a/docs/reference/libkeymap/html/kernel_8h.html +++ b/docs/reference/libkeymap/html/kernel_8h.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -218,7 +218,7 @@ Functions
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/kernel_8h_source.html b/docs/reference/libkeymap/html/kernel_8h_source.html index ebf99e5..160d52d 100644 --- a/docs/reference/libkeymap/html/kernel_8h_source.html +++ b/docs/reference/libkeymap/html/kernel_8h_source.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -56,7 +56,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/kmap_8h.html b/docs/reference/libkeymap/html/kmap_8h.html index c77ed99..5139e80 100644 --- a/docs/reference/libkeymap/html/kmap_8h.html +++ b/docs/reference/libkeymap/html/kmap_8h.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -705,7 +705,7 @@ Functions
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/kmap_8h_source.html b/docs/reference/libkeymap/html/kmap_8h_source.html index 566c5eb..dc2e4fd 100644 --- a/docs/reference/libkeymap/html/kmap_8h_source.html +++ b/docs/reference/libkeymap/html/kmap_8h_source.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -73,7 +73,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/logging_8h.html b/docs/reference/libkeymap/html/logging_8h.html index 4866cef..fb0d553 100644 --- a/docs/reference/libkeymap/html/logging_8h.html +++ b/docs/reference/libkeymap/html/logging_8h.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -180,7 +180,7 @@ Functions
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/logging_8h_source.html b/docs/reference/libkeymap/html/logging_8h_source.html index c1c550f..ca0cb7a 100644 --- a/docs/reference/libkeymap/html/logging_8h_source.html +++ b/docs/reference/libkeymap/html/logging_8h_source.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -55,7 +55,7 @@ $(function() {
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/structkmapinfo.html b/docs/reference/libkeymap/html/structkmapinfo.html index 5d059a0..f900670 100644 --- a/docs/reference/libkeymap/html/structkmapinfo.html +++ b/docs/reference/libkeymap/html/structkmapinfo.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -214,7 +214,7 @@ Data Fields
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/structlk__array.html b/docs/reference/libkeymap/html/structlk__array.html index 65bb911..25bc1f7 100644 --- a/docs/reference/libkeymap/html/structlk__array.html +++ b/docs/reference/libkeymap/html/structlk__array.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -133,7 +133,7 @@ Data Fields
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/docs/reference/libkeymap/html/structlk__kbdiacr.html b/docs/reference/libkeymap/html/structlk__kbdiacr.html index f285db8..b8d7891 100644 --- a/docs/reference/libkeymap/html/structlk__kbdiacr.html +++ b/docs/reference/libkeymap/html/structlk__kbdiacr.html @@ -19,7 +19,7 @@
libkeymap -  2.0.90 +  2.1.0
Library to manage the Linux keymaps
@@ -112,7 +112,7 @@ Data Fields
-Generated on Mon Jul 15 2019 10:59:20 for libkeymap by   +Generated on Wed Jul 31 2019 11:57:00 for libkeymap by   doxygen 1.8.15
diff --git a/po/cs.gmo b/po/cs.gmo index a73182bec363f9a490ee830213fe3b8374106ec6..9736725747fa5bce9350106c61f375700c8201f9 100644 GIT binary patch delta 23 ecmeDD#n}0aaYL;Ohq0l8p^=rL<>pqG77GAvLI_0w delta 23 ecmeDD#n}0aaYL;Ohk=oTp}Ccb+2&T477GAvR|rS| diff --git a/po/cs.po b/po/cs.po index dd022c5..11c2c94 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2016-12-30 18:14+01:00\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -46,7 +46,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -157,7 +157,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "neznámá znaková sada %s - ignoruji požadavek na znakovou sadu\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: chyba při čtení režimu klávesnice: %m\n" @@ -735,12 +735,12 @@ msgstr "" " -v --verbose hlásí změny\n" " -V --version zobrazí číslo verze\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -749,7 +749,7 @@ msgstr "" "%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:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -758,12 +758,12 @@ msgstr "" "%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:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "%s nelze nalézt\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "soubor%s nelze otevřít\n" @@ -1081,7 +1081,7 @@ msgstr "appendunicode: neplatné unicode %u\n" msgid "Cannot write font file header" msgstr "Nemohu zapsat hlavičku souboru písma" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Nemohu zapsat soubor písma" @@ -1377,42 +1377,42 @@ msgstr "%s: chyba v do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Načítám mapovací tabulku Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Nemohu otevřít soubor písma %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Nemohu najít implicitní písmo\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Nemohu najít písmo %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Čtu soubor písma %s\n" @@ -1437,7 +1437,7 @@ msgstr "Hmm - písmo z restorefont? Používám první polovinu.\n" msgid "Bad input file size\n" msgstr "Å patná velikost vstupního souboru\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1446,17 +1446,17 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Nenalezeno nic k uložení\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, 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" diff --git a/po/da.gmo b/po/da.gmo index aee189d72fa296a5d30385c69f8ec009eefa142d..acd32c9139de8f7cd4eeb3183ea36a7409e2d560 100644 GIT binary patch delta 23 fcmX@Jlkv<>#tp|zIE)Py42`S|EjOPt`KJy5bCC%o delta 23 fcmX@Jlkv<>#tp|zI1G#w49%@f%r>7h`KJy5bEXL= diff --git a/po/da.po b/po/da.po index 63452a8..39c6884 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd-1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2011-06-03 22:01+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -45,7 +45,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -164,7 +164,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "ukendt tegnsæt %s - ignorerer anmodning om tegnsæt\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: fejl ved læsning af tastaturstilstand\n" @@ -737,12 +737,12 @@ msgstr "" " -u --unicode gennemtving konvertering til UCS\n" " -v --verbose udskriv ændringerne\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -751,7 +751,7 @@ msgstr "" "%s: advarsel: indlæser ikke-UCS keymap på UCS konsol\n" " (måske vil du gerne lave 'kbd_mode -a'?)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -760,12 +760,12 @@ msgstr "" "%s: advarsel: indlæser UCS keymap på ikke-UCS konsol\n" " (måske vil du gerne lave 'kbd_mode -u'?)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Kan ikke finde %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "Kan ikke åbne fil %s\n" @@ -1083,7 +1083,7 @@ msgstr "appendunicode: ugyldig UCS %u\n" msgid "Cannot write font file header" msgstr "Kan ikke skrive skrifttypefilhoved" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Kan ikke skrive til skrifttypefilen" @@ -1382,44 +1382,44 @@ msgstr "%s: fejl i do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Indlæser UCS-konverteringsstabel...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Kan ikke åbne skrifttypefilen %s\n" -#: src/setfont.c:432 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "Når flere skrifttyper læses ind skal alle være psf-skrifttyper - %s er det " "ikke\n" -#: src/setfont.c:445 +#: src/setfont.c:444 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Læste %d-tegns %d×%d-skrifttype fra filen %s\n" -#: src/setfont.c:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Når flere skrifttyper læses ind skal alle have samme højde\n" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "Når flere skrifttyper læses ind skal alle have samme bredde\n" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Kan ikke finde standardskrifttypen\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Kan ikke finde skrifttypen %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Læser skrifttypefilen %s\n" @@ -1444,7 +1444,7 @@ msgstr "Hmm - en skrifttype fra restorefont? Bruger f msgid "Bad input file size\n" msgstr "Fejlagtig størrelse på inddatafilen\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1453,18 +1453,18 @@ msgstr "" "Denne fil indeholder 3 skrifttyper: 8×8, 8×14 og 8×16. Vælg hvilken\n" "du vil indlæse via et af flagene -8, -14 eller -16.\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" "Du bad om skrifttypesstørrelsen %d, men kun 8, 14 og 16 er mulige her.\n" -#: src/setfont.c:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Fandt ikke noget at gemme\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Gemte %d-tegns %d×%d-skrifttypefil til %s\n" diff --git a/po/de.gmo b/po/de.gmo index 3204950180ee7ce53a5ace29d7ba85210b61f355..f98f6393e07d72608a70ceb1795db6b732b1f937 100644 GIT binary patch delta 23 ecmcc9z;vg9X+y0Ghq0l8p^=rL<>pqG>(&5hc?eGc delta 23 ecmcc9z;vg9X+y0Ghk=oTp}Ccb+2&T4>(&5hjtEi! diff --git a/po/de.po b/po/de.po index 4859ca9..e458236 100644 --- a/po/de.po +++ b/po/de.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2016-12-28 12:59+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" @@ -54,7 +54,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -166,7 +166,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "Unbekannter Zeichensatz %s - Zeichensatzanforderung wird ignoriert.\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: Fehler beim Lesen des Tastaturmodus: %m\n" @@ -750,13 +750,13 @@ msgstr "" " -v --verbose berichtet ausführlicher über vorgenommene Änderungen\n" " -V --version zeigt die Versionsnummer an\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -765,7 +765,7 @@ msgstr "" "%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:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -774,12 +774,12 @@ msgstr "" "%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:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "%s kann nicht gefunden werden.\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "Datei %s kann nicht geöffnet werden.\n" @@ -1097,7 +1097,7 @@ msgstr "appendunicode: Ungültiges Unicode-Zeichen %u.\n" msgid "Cannot write font file header" msgstr "Kopf der Font-Datei kann nicht geschrieben werden." -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Font-Datei kann nicht geschrieben werden." @@ -1398,45 +1398,45 @@ msgstr "%s: Fehler in do_loadtable.\n" msgid "Loading Unicode mapping table...\n" msgstr "Unicode-Tabelle wird geladen …\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Font-Datei %s kann nicht geöffnet werden.\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Standard-Font kann nicht gefunden werden.\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Font %s kann nicht gefunden werden.\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Font-Datei %s wird gelesen.\n" @@ -1461,7 +1461,7 @@ msgstr "Hmm - ein Font von restorefont? Die erste Hälfte wird verwendet.\n" msgid "Bad input file size\n" msgstr "Falsche Eingabedateigröße.\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1470,19 +1470,19 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Nichts zum Speichern gefunden.\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d-Zeichen %dx%d in Font-Datei %s gespeichert.\n" diff --git a/po/el.gmo b/po/el.gmo index 9f1bf533beef53cad4e9c25ec8fd1e139cbebbeb..6818044da52c533603c0b224c3ad22ec0f2e55f0 100644 GIT binary patch delta 23 ecmex!fa%WxrVWlR9L9zUhDKI~mYY3YjAH\n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2015-08-30 02:12+0300\n" "Last-Translator: Lefteris Dimitroulakis \n" "Language-Team: Greek \n" @@ -45,7 +45,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -165,7 +165,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "άγνωστο σύνολο χαρακτήρων %s - η αίτηση αγνοήθηκε\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: σφάλμα ανάγνωσης keyboard mode: %m\n" @@ -740,12 +740,12 @@ msgstr "" " -u --unicode υποχρεωτική μετατροπή σε Unicode\n" " -v --verbose αναφορά των αλλαγών\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Οι επιλογές --unicode and --ascii είναι αμοιβέα αποκλειόμενες\n" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -754,7 +754,7 @@ msgstr "" "%s: προειδοποίηση: φόρτωση μη-Unicode keymap σε κονσόλα Unicode\n" " (μήπως θες να δώσεις «kbd_mode -a»;)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -763,12 +763,12 @@ msgstr "" "%s: προειδοποίηση: φόρτωση Unicode keymap σε μη-Unicode κονσόλα\n" " (μήπως θέλεις να δώσεις `kbd_mode -u';)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Αδυναμία εύρεσης %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "Αδυνατώ ν' ανοίξω το αρχείο %s\n" @@ -1092,7 +1092,7 @@ msgstr "appendunicode: παράτυπος κωδικός unicode %u\n" msgid "Cannot write font file header" msgstr "Αδυνατώ να γράψω την επικεφαλίδα του αρχείου γραμματοσειράς" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Δεν μπορώ να γράψω στο αρχείο της γραμματοσειράς" @@ -1392,46 +1392,46 @@ msgstr "%s: bug στο do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Φόρτωση πίνακα απεικόνισης Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Αδυνατώ ν' ανοίξω το αρχείο γραμματοσειράς %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Ανάγνωση %d-χαρακτ. της γραμματοσειράς %dx%d από το αρχείο %s\n" -#: src/setfont.c:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "" "Κατά τη φόρτωση πολλών γραμματοσειρών, όλες πρέπει να έχουν το ίδιο ύψος\n" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" "Κατά τη φόρτωση πολλών γραμματοσειρών, όλες πρέπει να έχουν ίδιο πλάτος\n" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Αδυνατώ να βρώ την προεπιλεγμένη γραμματοσειρά\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Αδυνατώ να βρώ τη γραμματοσειρά %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Ανάγνωση αρχείου γραμματοσειράς %s\n" @@ -1456,7 +1456,7 @@ msgstr "Χμμ - γραμματοσειρά απο το restorefont; Χρήση msgid "Bad input file size\n" msgstr "Εσφαλμένο μέγεθος αρχείου εισόδου\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1465,18 +1465,18 @@ msgstr "" "Αυτό το αρχείο περιέχει 3 γραμματοσειρές: 8x8, 8x14 και 8x16. Παρακαλώ\n" "υποδείξτε με τις επιλογές -8 ή -14 ή -16 ποιά θέλετε.\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Τίποτε γιά διάσωση\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d-χαρακτ. της γραμματοσειράς %dx%d διασώθηκαν στο αρχείο %s\n" diff --git a/po/eo.gmo b/po/eo.gmo index 44987ffd3b7bca8673affb774bc8bd2732e277a2..ba31c05124fd6842f116839a29da8f1e65dbe9ad 100644 GIT binary patch delta 23 fcmezTk@53K#tn`x9L9zUhDKI~mYY3YR+#_*c{d2L delta 23 fcmezTk@53K#tn`x90o=ThUQi#W}7`-R+#_*c}xhj diff --git a/po/eo.po b/po/eo.po index 33732ee..86fa5dc 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2016-03-04 11:20-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -46,7 +46,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -164,7 +164,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "nekonata signaro %s - ni preteratentas peton de signaro\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: eraro dum legado de la klavar-reĝimo: %m\n" @@ -732,12 +732,12 @@ msgstr "" " -u --unicode devigi konvertadon al Unikodo\n" " -v --verbose listigi la ŝanĝojn\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -746,7 +746,7 @@ msgstr "" "%s: averto: ŝargado je ne-Unikoda klavmapo ĉe Unikoda konzolo\n" " (eble vi volas fari `kbd_mode -a'?)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -755,12 +755,12 @@ msgstr "" "%s: averto: ŝargado je Unikoda klavmapo al ne-Unikoda konzolo\n" " (eble vi volas fari `kbd_mode -u'?)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Ni ne povas trovi %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "ne malfermeblas la dosiero %s\n" @@ -1077,7 +1077,7 @@ msgstr "appendunicode: malpermesata unikodo %u\n" msgid "Cannot write font file header" msgstr "Ne eblas skribi tiparan dosier-kapon" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Ne eblas skribi tipar-dosieron" @@ -1371,42 +1371,42 @@ msgstr "%s: miso en do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Ŝargado je Unikoda mapiga tabelo...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Ne eblas malfermi la tipar-dosieron %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Ne eblas trovi aprioran tiparon\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Ne eblas trovi la tiparon %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Legado de tipar-dosiero %s\n" @@ -1431,7 +1431,7 @@ msgstr "Hmm - ĉu tiparo el restorefont? Ni uzas la unuan duonon.\n" msgid "Bad input file size\n" msgstr "Malĝusta grando de enig-dosiero\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1440,17 +1440,17 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Nenio trovita por konservi\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Konservita tipar-dosiero %d-char %dx%d en %s\n" diff --git a/po/es.gmo b/po/es.gmo index 95afcc43b808022fcb92315353042b9ff0619504..d0e64c7a63c9911bd6fb104240afd2cdd8cf3730 100644 GIT binary patch delta 23 ecmeyin(^Ce#tq3j9L9zUhDKI~mYcJ6x-|iBF$fg^ delta 23 ecmeyin(^Ce#tq3j90o=ThUQi#W}CBhx-|iBMhF-H diff --git a/po/es.po b/po/es.po index c40bb1a..186874f 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd-1.14.1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2008-05-14 23:48+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Spanish \n" @@ -44,7 +44,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -168,7 +168,7 @@ msgstr "" 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:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: error al establecer el modo de teclado\n" @@ -720,31 +720,31 @@ msgid "" " -V, --version print version number.\n" msgstr "" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, 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:195 +#: src/loadkeys.c:196 #, 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:213 +#: src/loadkeys.c:216 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "No se encontró el tipo %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "No se pudo abrir el fichero de tipo de letra %s\n" @@ -1050,7 +1050,7 @@ msgstr "appendunicode: unicode %u es erróneo\n" msgid "Cannot write font file header" msgstr "No se puede escribir la cabecera del fichero de tipo de letra" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "No se pudo escribir el fichero de tipos de letra " @@ -1357,43 +1357,43 @@ msgstr "%s: error en do_loadtable()\n" msgid "Loading Unicode mapping table...\n" msgstr "Cargando la tabla asociativa Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, 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:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "No se encontró el tipo predefinido\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "No se encontró el tipo %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Leyendo el fichero de tipo de letra %s\n" @@ -1419,7 +1419,7 @@ msgstr "" msgid "Bad input file size\n" msgstr "Tamaño de fichero de entrada incorrecto\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1428,17 +1428,17 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "No se encontró nada que guardar\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "" diff --git a/po/fr.gmo b/po/fr.gmo index cf8d89315667866d3a59a8a41f3c1cddbf1c6c60..132666be0540f1593ba306ece1db473c3e8595e0 100644 GIT binary patch delta 23 fcmX?bhw;E2#tpwMIE)Py42`S|EjKe;+L{6Yb|VN9 delta 23 fcmX?bhw;E2#tpwMI1G#w49%@f%r-My+L{6Yb~p$X diff --git a/po/fr.po b/po/fr.po index d22657d..082e475 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU kbd 1.15.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2012-12-28 10:27+0200\n" "Last-Translator: Jean-Baka Domelevo Entfellner \n" "Language-Team: French \n" @@ -47,7 +47,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -173,7 +173,7 @@ msgstr "" 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:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s : erreur lors de la lecture du mode du clavier : %m\n" @@ -759,12 +759,12 @@ msgstr "" " -u --unicode force la conversion vers Unicode\n" " -v --verbose affiche les modifications\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -773,7 +773,7 @@ msgstr "" "%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:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -782,12 +782,12 @@ msgstr "" "%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:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Impossible de trouver %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "Impossible d'ouvrir le fichier %s\n" @@ -1114,7 +1114,7 @@ msgstr "appendunicode : unicode illégal %u\n" msgid "Cannot write font file header" msgstr "Ne peut écrire l'en-tête du fichier de fontes" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Ne peut écrire le fichier de fonte" @@ -1418,48 +1418,48 @@ msgstr "%s : bug dans do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Chargement de la table de mapping Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Ne peut ouvrir le fichier de fonte %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Ne peut repérer la fonte par défaut\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Ne peut repérer la fonte %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Lecture du fichier de fonte %s\n" @@ -1486,7 +1486,7 @@ msgstr "" msgid "Bad input file size\n" msgstr "Taille erronée du fichier d'entrée\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1495,19 +1495,19 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Il n'y a rien à sauvegarder\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, 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" diff --git a/po/gr.gmo b/po/gr.gmo index f6a9e550e0590e142a874793fb360585ca727a01..58eabda7057fc05b9497676d404d63fbc482bf9d 100644 GIT binary patch delta 23 ecmeyeo$\n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2003-02-16 20:56+0200\n" "Last-Translator: Lefteris Dimitroulakis \n" "Language-Team: Greek \n" @@ -45,7 +45,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -172,7 +172,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "άγνωστο σύνολο χαρακτήρων %s - η αίτηση αγνοήθηκε\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: σφάλμα κατά τον ορισμό της κατάστασης πληκτρολογίου\n" @@ -726,31 +726,31 @@ msgid "" " -V, --version print version number.\n" msgstr "" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, 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:195 +#: src/loadkeys.c:196 #, 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:213 +#: src/loadkeys.c:216 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "Αδυνατώ να βρω τη γραμματοσειρά %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "Αδύνατο το άνοιγμα του αρχείου γραμματοσειράς %s\n" @@ -1061,7 +1061,7 @@ msgstr "appendunicode: παράτυπο unicode %u\n" msgid "Cannot write font file header" msgstr "Αδυναμία εγγραφής της επικεφαλίδας του αρχείου γραμματοσειράς" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Δε μπορώ να γράψω στο αρχείο της γραμματοσειράς" @@ -1361,46 +1361,46 @@ msgstr "%s: σφάλμα στο do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Φόρτωση πίνακα απεικόνισης Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Αδύνατο το άνοιγμα του αρχείου γραμματοσειράς %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Ανάγνωση %d-χαρακτ. της γραμματοσειράς %dx%d από το αρχείο %s\n" -#: src/setfont.c:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "" "Κατά τη φόρτωση πολλών γραμματοσειρών, όλες πρέπει να έχουν το ίδιο ύψος\n" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" "Κατά τη φόρτωση πολλών γραμματοσειρών, όλες πρέπει να έχουν ίδιο πλάτος\n" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Αδυνατώ να βρω την προεπιλεγμένη γραμματοσειρά\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Αδυνατώ να βρω τη γραμματοσειρά %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Ανάγνωση αρχείου γραμματοσειράς %s\n" @@ -1425,7 +1425,7 @@ msgstr "Χμμ - γραμματοσειρά από το restorefont; Χρήση msgid "Bad input file size\n" msgstr "Εσφαλμένο μέγεθος αρχείου εισόδου\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1434,19 +1434,19 @@ msgstr "" "Αυτό το αρχείο περιέχει 3 γραμματοσειρές: 8x8, 8x14 και 8x16. Παρακαλώ\n" "υποδείξτε με τις επιλογές -8 ή -14 ή -16 ποια θέλετε.\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Τίποτε για διάσωση\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d-χαρακτ. της γραμματοσειράς %dx%d διασώθηκαν στο αρχείο %s\n" diff --git a/po/id.gmo b/po/id.gmo index 0e12887af0dbc5c5be8e5004791a15fee487bbd7..2482a3d3c8f6f7c6af62c0c36654f35e32a54111 100644 GIT binary patch delta 23 fcmaF2oblaq#tl35IE)Py42`S|EjJ(3(^Ulkb5RIO delta 23 fcmaF2oblaq#tl35I1G#w49%@f%r+m?(^Ulkb7lxm diff --git a/po/id.po b/po/id.po index 80db76b..0e27356 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 1.15.2\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2010-07-07 23:30+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -43,7 +43,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -166,7 +166,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "charset %s tidak diketahui - mengabaikan permintaan charset\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: error membaca mode keyboard\n" @@ -735,12 +735,12 @@ msgstr "" " -u --unicode konversi implisit ke Unicode\n" " -v --verbose laporkan perubahan\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, fuzzy, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -749,7 +749,7 @@ msgstr "" "%s: peringatan: memuat peta-kunci Unicode dalam console tidak-Unicode\n" " (mungkin anda ingin melakukan `kbd_mode -u'?)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -758,12 +758,12 @@ msgstr "" "%s: peringatan: memuat peta-kunci Unicode dalam console tidak-Unicode\n" " (mungkin anda ingin melakukan `kbd_mode -u'?)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Tidak dapat menemukan %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "tidak dapat membuka berkas %s\n" @@ -1074,7 +1074,7 @@ msgstr "appendunicode: unicode %u tidak legal\n" msgid "Cannot write font file header" msgstr "Tidak dapat menulis font berkas header" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Tidak dapat menulis berkas font" @@ -1373,42 +1373,42 @@ msgstr "%s: bug dalam do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Meload tabel peta Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Tidak dapat membuka berkas font %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Tidak dapat menemukan font baku\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Tidak dapat menemukan font %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Membaca berkas font %s\n" @@ -1435,7 +1435,7 @@ msgstr "" msgid "Bad input file size\n" msgstr "Ukuran berkas masukan buruk\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1445,19 +1445,19 @@ msgstr "" "dengan menggunakan sebuah pilihan -8 atau -14 atau -16 mana yang anda ingin " "load.\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Ditemukan nothing untuk disimpan\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Disimpan %d-char %dx%d font berkas di %s\n" diff --git a/po/it.gmo b/po/it.gmo index 42fde45de76abbf7d6deea67a55cf506b8929073..14cd178f61987c5e0c308b475d92431c452b9042 100644 GIT binary patch delta 23 fcmcb4obl#y#tp|zIE)Py42`S|EjOPt;noKLb|46E delta 23 fcmcb4obl#y#tp|zI1G#w49%@f%r>7h;noKLb~Olc diff --git a/po/it.po b/po/it.po index cc1de99..be435f6 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd-1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2011-06-13 00:36+0200\n" "Last-Translator: Sergio Zanchetta \n" "Language-Team: Italian \n" @@ -45,7 +45,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -169,7 +169,7 @@ msgid "unknown charset %s - ignoring charset request\n" msgstr "" "set di caratteri %s sconosciuto - richiesta del set di caratteri ignorata\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: errore nella lettura della modalità di tastiera\n" @@ -749,12 +749,12 @@ msgstr "" " -u --unicode Forza la conversione a Unicode\n" " -v --verbose Riporta le modifiche\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -763,7 +763,7 @@ msgstr "" "%s: attenzione, caricata una mappatura non Unicode su una console Unicode\n" " (forse si vuole eseguire \"kbd_mode -a\")\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -772,12 +772,12 @@ msgstr "" "%s: attenzione, caricata una mappatura Unicode su una console non Unicode\n" " (forse si vuole eseguire \"kbd_mode -u\")\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Impossibile trovare %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "impossibile aprire il file %s\n" @@ -1100,7 +1100,7 @@ msgstr "appendunicode: carattere Unicode %u non consentito\n" msgid "Cannot write font file header" msgstr "Impossibile scrivere l'intestazione del file di carattere" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Impossibile scrivere il file di carattere" @@ -1402,48 +1402,48 @@ msgstr "%s: bug in do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Caricamento della tabella di mappatura Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Impossibile aprire il file di carattere %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Impossibile trovare il tipo di carattere predefinito\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Impossibile trovare il tipo di carattere %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Lettura del file di carattere %s\n" @@ -1469,7 +1469,7 @@ msgstr "" msgid "Bad input file size\n" msgstr "Dimensione errata del file di input\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1478,19 +1478,19 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Non è stato trovato nulla da salvare\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, 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" diff --git a/po/kbd.pot b/po/kbd.pot index dfddd0b..39162f3 100644 --- a/po/kbd.pot +++ b/po/kbd.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,7 +35,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -117,7 +117,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "" @@ -634,31 +634,31 @@ msgid "" " -V, --version print version number.\n" msgstr "" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, 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:195 +#: src/loadkeys.c:196 #, 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:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "" @@ -952,7 +952,7 @@ msgstr "" msgid "Cannot write font file header" msgstr "" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "" @@ -1206,42 +1206,42 @@ msgstr "" msgid "Loading Unicode mapping table...\n" msgstr "" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "" -#: src/setfont.c:432 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" -#: src/setfont.c:445 +#: src/setfont.c:444 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "" -#: src/setfont.c:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "" @@ -1266,24 +1266,24 @@ msgstr "" msgid "Bad input file size\n" msgstr "" -#: src/setfont.c:633 +#: src/setfont.c:636 #, 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:650 +#: src/setfont.c:653 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" -#: src/setfont.c:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "" diff --git a/po/nl.gmo b/po/nl.gmo index 0f89c32c5fb5c89ea7cc4918ececb045a3ae835c..05ee6267ac3161a0eed86195e3153aa6072d51e2 100644 GIT binary patch delta 23 ecmeDF%h>&waYL;Ohq0l8p^=rL<>powHY)&a83)q< delta 23 ecmeDF%h>&waYL;Ohk=oTp}Ccb+2&RkHY)&aE(g{C diff --git a/po/nl.po b/po/nl.po index e686047..3786a65 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd-2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2017-01-07 15:02+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" @@ -49,7 +49,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -161,7 +161,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "onbekende tekenset '%s' -- tekensetverzoek wordt genegeerd\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: fout tijdens lezen van toetsenbordmodus: %m\n" @@ -741,12 +741,12 @@ msgstr "" " -h, --help deze hulptekst tonen\n" " -V, --version programmaversie tonen\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -756,7 +756,7 @@ msgstr "" "terminal\n" " (wilt u misschien 'kbd_mode -a' doen?)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -766,12 +766,12 @@ msgstr "" "terminal\n" " (wilt u misschien 'kbd_mode -u' doen?)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Kan %s niet vinden\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "Kan bestand %s niet openen\n" @@ -1092,7 +1092,7 @@ msgstr "appendunicode: ongeldige Unicode %u\n" msgid "Cannot write font file header" msgstr "Kan kop van lettertypebestand niet schrijven" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Kan lettertypebestand niet schrijven" @@ -1393,48 +1393,48 @@ msgstr "%s: *interne programmafout* in 'do_loadtable'\n" msgid "Loading Unicode mapping table...\n" msgstr "Laden van Unicode-afbeeldingstabel...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Kan lettertypebestand %s niet openen\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Kan standaardlettertype niet vinden\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Kan lettertype %s niet vinden\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Lezen van lettertypebestand %s...\n" @@ -1461,7 +1461,7 @@ msgstr "" msgid "Bad input file size\n" msgstr "Ongeldige grootte van invoerbestand\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1470,18 +1470,18 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Niets gevonden om op te slaan\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, 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" diff --git a/po/pl.gmo b/po/pl.gmo index 0eb01fb2909bcad22fc2503bdd851478610df1b8..c73c61f99c7aaed629bfdd711026403bf0b56900 100644 GIT binary patch delta 23 ecmZqq&DipraYL;Ohq0l8p^=rL<>pqG{}upkiU_y> delta 23 ecmZqq&DipraYL;Ohk=oTp}Ccb+2&T4{}upkp9s4E diff --git a/po/pl.po b/po/pl.po index 90ed08a..d01564e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2016-12-28 16:31+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -44,7 +44,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -156,7 +156,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "nieznany zestaw znaków %s - ignorowanie żądania zestawu znaków\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: błąd podczas odczytu trybu klawiatury: %m\n" @@ -737,12 +737,12 @@ msgstr "" " -v --verbose informowanie o zmianach\n" " -V --version wyświetlenie numeru wersji\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -751,7 +751,7 @@ msgstr "" "%s: uwaga: wczytywanie nieunikodowej mapy klawiszy na nieunikodowej konsoli\n" " (być może powinno być jeszcze `kbd_mode -a'?)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -760,12 +760,12 @@ msgstr "" "%s: uwaga: wczytywanie unikodowej mapy klawiszy na nieunikodowej konsoli\n" " (być może powinno być jeszcze `kbd_mode -u'?)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Nie można odnaleźć %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "nie można otworzyć pliku %s\n" @@ -1086,7 +1086,7 @@ msgstr "appendunicode: błędny unikod %u\n" msgid "Cannot write font file header" msgstr "Nie można zapisać nagłówka pliku fontu" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Nie można zapisać pliku fontu" @@ -1379,43 +1379,43 @@ msgstr "%s: błąd w do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Wczytywanie tablicy odwzorowania Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Nie można otworzyć pliku fontu %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Nie można znaleźć domyślnego fontu\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Nie można znaleźć fontu %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Czytanie pliku fontu %s\n" @@ -1440,7 +1440,7 @@ msgstr "Hmm - font z restorefont? Używanie pierwszej połowy.\n" msgid "Bad input file size\n" msgstr "Błędny rozmiar pliku wejściowego\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1449,17 +1449,17 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Nie znaleziono nic do zapisania\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Zapisano %d-znakowy font %dx%d do pliku %s\n" diff --git a/po/ro.gmo b/po/ro.gmo index 5fa93b67a968e604d18235a982cdf0346704dd8b..d95abc855f70da3cc8e71b89777dcd52fb7e0646 100644 GIT binary patch delta 23 ecmdnj&A6|daYLyZhq0l8p^=rL<>p#7M|l8Y2L~wt delta 23 ecmdnj&A6|daYLyZhk=oTp}Ccb+2&d`M|l8Y90x1_ diff --git a/po/ro.po b/po/ro.po index e9c12ae..0d4e24f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 1.08\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2003-11-20 17:33+0200\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -43,7 +43,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -170,7 +170,7 @@ 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:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: eroare în setarea modului tastaturii\n" @@ -729,31 +729,31 @@ msgid "" " -V, --version print version number.\n" msgstr "" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, 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:195 +#: src/loadkeys.c:196 #, 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:213 +#: src/loadkeys.c:216 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "Nu se poate gãsi fontul %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "Nu se poate deschide fiºierul de font %s\n" @@ -1056,7 +1056,7 @@ msgstr "appendunicode: unicode ilegal %u\n" msgid "Cannot write font file header" msgstr "Nu se poate scrie header-ul fiºierului de font" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Nu se poate scrie fiºierul de font" @@ -1357,46 +1357,46 @@ msgstr "%s: bug msgid "Loading Unicode mapping table...\n" msgstr "Se încarcã tabela de mapare Unicode...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Nu se poate deschide fiºierul de font %s\n" -#: src/setfont.c:432 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "Când se încarcã mai multe fonturi, toate trebuie sã fie fonturi psf. - %s nu " "este\n" -#: src/setfont.c:445 +#: src/setfont.c:444 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "S-a citit %d-char fontul %dx%d din fiºierul %s\n" -#: src/setfont.c:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "" "Când se încarcã mai multe fonturi, toate trebuie sã aibã aceeaºi înãlþime\n" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" "Când se încarcã mai multe fonturi, toate trebuie sã aibã aceeaºi lãþime\n" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Nu se poate gãsi fontul implicit\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Nu se poate gãsi fontul %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Se citeºte fiºierul de font %s\n" @@ -1421,7 +1421,7 @@ msgstr "Hmm - un font din restorefont? Se folose msgid "Bad input file size\n" msgstr "Mãrime fiºier intrare(input) invalidã\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1430,18 +1430,18 @@ msgstr "" "Acest fiºier conþine 3 fonturi: 8x8, 8x14 ºi 8x16. Vã rugãm indicaþi\n" "folosind o opþiune -8 or -14 or -16 pentru a-l selecta pe cel dorit.\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" "Aþi cerut o mãrime de font %d, dar doar 8, 14, 16 sunt posibile aici.\n" -#: src/setfont.c:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Nu am gãsit nimic de salvat\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "S-a salvat fiºierul %d-char fontul %dx%d în %s\n" diff --git a/po/ru.gmo b/po/ru.gmo index 4087dfe88e892707c96e98153f56d14aba88f642..9ca8d1e6e3e6ca2c7e2476decfe7df226c6ff6f2 100644 GIT binary patch delta 23 fcmca}g6Yl)rVX_&9L9zUhDKI~mYZ8$uEzrabR`J` delta 23 fcmca}g6Yl)rVX_&90o=ThUQi#W}91GuEzrabUFzJ diff --git a/po/ru.po b/po/ru.po index baf57f3..dbbda3b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2016-12-27 19:55+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -47,7 +47,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -160,7 +160,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "неизвестная кодировка %s — пропускается запрос кодировки\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: ошибка чтения режима клавиатуры: %m\n" @@ -741,12 +741,12 @@ msgstr "" " -v --verbose сообщить об изменениях\n" " -V --version показать номер версии\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: параметры --unicode и --ascii взаимно исключают друг друга\n" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -756,7 +756,7 @@ msgstr "" "консоль\n" " (возможно, вы хотите выполнить «kbd_mode -u»?)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -766,12 +766,12 @@ msgstr "" "консоль\n" " (возможно, вы хотите выполнить «kbd_mode -u»?)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Не удалось найти %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "не удалось открыть файл %s\n" @@ -1097,7 +1097,7 @@ msgstr "appendunicode: недопустимый юникод %u\n" msgid "Cannot write font file header" msgstr "Не удалось записать заголовок файла шрифта" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Не удалось записать файл шрифта" @@ -1397,44 +1397,44 @@ msgstr "%s: ошибка в do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Загружается юникодная таблица отображения...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Не удалось открыть файл шрифта %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Читается %d-символ шрифта %dx%d из файла %s\n" -#: src/setfont.c:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "При загрузке нескольких шрифтов все должны быть одинаковой высоты\n" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "При загрузке нескольких шрифтов все должны быть одинаковой ширины\n" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Не удалось найти шрифт по умолчанию\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Не удалось найти шрифт %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Читается файл шрифта %s\n" @@ -1459,7 +1459,7 @@ msgstr "Хм. Шрифт из restorefont? Используется первая msgid "Bad input file size\n" msgstr "Некорректный размер входного файла\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1469,17 +1469,17 @@ msgstr "" "Укажите, одним из параметров: -8, -14 или -16,\n" "какой именно нужно загрузить.\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Не найдено что записывать\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Записывается %d-символ шрифта %dx%d файла в %s\n" diff --git a/po/sv.gmo b/po/sv.gmo index c1fca5edea1e696e9c09babd58f6d20210c1c3d6..c770f404684e10713c9e7f81b456b7ce32fd7b6d 100644 GIT binary patch delta 23 ecmaFzmGQ|}#tpSD9L9zUhDKI~mYZ8$;>`eiatO)* delta 23 ecmaFzmGQ|}#tpSD90o=ThUQi#W}91G;>`eihX~C8 diff --git a/po/sv.po b/po/sv.po index 7d19fdc..5053811 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2016-12-27 23:53+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -48,7 +48,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -159,7 +159,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "okänd teckenuppsättning %s - ignorerar begäran om teckenuppsättning\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: fel när tangentbordsläge lästes: %m\n" @@ -733,12 +733,12 @@ msgstr "" " -v --verbose rapportera ändringarna\n" " -V --version skriv ut versionsnummer\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Flaggorna --unicode och --ascii är ömsesidigt uteslutande\n" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -747,7 +747,7 @@ 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:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -756,12 +756,12 @@ 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:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Hittar inte %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "kan inte öppna filen %s\n" @@ -1082,7 +1082,7 @@ msgstr "appendunicode: ogiltig Unicode %u\n" msgid "Cannot write font file header" msgstr "Kan inte skriva typsnittsfilshuvud" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Kan inte skriva till typsnittsfilen" @@ -1380,43 +1380,43 @@ msgstr "%s: fel i do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Läser in Unicode-konverteringsstabell …\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Kan inte öppna typsnittsfilen %s\n" -#: src/setfont.c:432 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "När flera typsnitt läses in mÃ¥ste alla vara psf-typsnitt - %s är inte det\n" -#: src/setfont.c:445 +#: src/setfont.c:444 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Läste %d-teckens %d×%d-typsnitt frÃ¥n filen %s\n" -#: src/setfont.c:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "När flera typsnitt läses in mÃ¥ste alla ha samma höjd\n" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "När flera typsnitt läses in mÃ¥ste alla ha samma bredd\n" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Hittar inte standardtypsnittet\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Hittar inte typsnittet %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Läser typsnittsfilen %s\n" @@ -1441,7 +1441,7 @@ msgstr "Hmm - ett typsnitt frÃ¥n restorefont? Använder första halvan.\n" msgid "Bad input file size\n" msgstr "Felaktig storlek pÃ¥ indatafilen\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1450,18 +1450,18 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" "Du bad om typsnittsstorleken %d, men bara 8, 14 och 16 är möjliga här.\n" -#: src/setfont.c:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Hittade inget att spara\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Sparade %d-teckens %d×%d-typsnittsfil till %s\n" diff --git a/po/tr.gmo b/po/tr.gmo index ae4c418dd379a5d27d33cf5615ab3b4180a845af..4d408f740fae96cfcfbeef5cb6e1882ff9b1bcc3 100644 GIT binary patch delta 23 fcmZ3{$+)7Eal!T5W$y?^ delta 23 fcmZ3{$+)7Eal!T5W&{XH diff --git a/po/tr.po b/po/tr.po index 5c5d1c4..cb63a22 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 1.10\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2004-01-21 06:15+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -47,7 +47,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -177,7 +177,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "%s karakter seti bilinmiyor - istek yoksayildi\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: klavye kipi ayarlanirken hata\n" @@ -732,31 +732,31 @@ msgid "" " -V, --version print version number.\n" msgstr "" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, 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:195 +#: src/loadkeys.c:196 #, 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:213 +#: src/loadkeys.c:216 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "%s yazitipi bulunamiyor\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "%s yazitipi dosyasi acilamiyor\n" @@ -1065,7 +1065,7 @@ msgstr "appendunicode: kuraldi$i unicode %u\n" msgid "Cannot write font file header" msgstr "Yazitipi dosyasinin basligi yazilamiyor" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Yazitipi dosyasi yazilamiyor" @@ -1368,43 +1368,43 @@ msgstr "%s: do_loadtable'da yazilim hatasi\n" msgid "Loading Unicode mapping table...\n" msgstr "Unicode e$le$me tablosu yukleniyor...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "%s yazitipi dosyasi acilamiyor\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "\"default.cp[gz]\" yazitipi dosyasi bulunamiyor\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "%s yazitipi bulunamiyor\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "%s yazitipi dosyasi okunuyor\n" @@ -1429,7 +1429,7 @@ msgstr "Hmm - restorefont'tan bir yazitipi? ilk yarisi kullaniliyor.\n" msgid "Bad input file size\n" msgstr "Girdi dosyasi uzunlugu hatali\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1438,19 +1438,19 @@ msgstr "" "Bu dosya 3 yazitipi icerir: 8x8, 8x14 ve 8x16. istediginiz birini\n" "-8, -14 veya -16 seceneklerinden biri ile belirtebilirsiniz.\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Kaydedilecek hicbir sey yok\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d karakterlik %dx%d yazitipi %s dosyasina kaydedildi\n" diff --git a/po/uk.gmo b/po/uk.gmo index 4ed5dfc3995bc286ab03cf7ac32a5b29db64d353..1922ac8982c04072114455679a1ee50b07851d3d 100644 GIT binary patch delta 23 fcmbPzjA`~UrVX_&9L9zUhDKI~mYZ8$ro{mOXk`dH delta 23 fcmbPzjA`~UrVX_&90o=ThUQi#W}91Gro{mOXnF`f diff --git a/po/uk.po b/po/uk.po index b586056..4d32a6a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2016-12-27 13:13+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -46,7 +46,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -159,7 +159,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "невідомий набір символів %s - вказування набору символів ігнорується\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: помилка під час спроби читання режиму роботи клавіатури: %m\n" @@ -746,12 +746,12 @@ msgstr "" " -v --verbose повідомити про внесені зміни\n" " -V --version вивести номер версії\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: параметри --unicode і --ascii не можна використовувати одночасно\n" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -760,7 +760,7 @@ msgstr "" "%s: попередження: завантаження не-Unicode-розкладки до консолі Unicode\n" " (можливо, вам варто виконати «kbd_mode -a»?)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -769,12 +769,12 @@ msgstr "" "%s: попередження: завантаження Unicode-розкладки до не-Unicode-консолі\n" " (можливо, вам варто виконати «kbd_mode -u»?)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Не вдалося знайти %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "не вдалося відкрити файл %s\n" @@ -1099,7 +1099,7 @@ msgstr "appendunicode: некоректний unicode %u\n" msgid "Cannot write font file header" msgstr "Не вдалося записати заголовок файлу шрифту" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Не вдалося записати файл шрифту" @@ -1397,45 +1397,45 @@ msgstr "%s: помилка у do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Завантажується Unicode-таблиця...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "Не вдалося відкрити файл %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Завантажується %d-знаковий шрифт %dx%d з файлу %s\n" -#: src/setfont.c:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "При завантаженні кількох шрифтів, усі мають бути однакової висоти\n" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" "При завантаженні кількох шрифті, усі повинні мати однакову ширину символів\n" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Не вдалося знайти основний шрифт\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Не вдалося знайти шрифт %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Читається файл зі шрифтом %s\n" @@ -1460,7 +1460,7 @@ msgstr "Ой... шрифт з restorefont? Використовується пе msgid "Bad input file size\n" msgstr "Неприпустимий розмір вхідного файлу\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1470,17 +1470,17 @@ msgstr "" "Вкажіть одним з ключів: -8, -14 чи -16,\n" "який саме шрифт завантажувати.\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Немає що записувати\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Записано %d-знаковий шрифт %dx%d у файл %s\n" diff --git a/po/vi.gmo b/po/vi.gmo index 02c5e3b7e733b87dfd7bc98bbf92cdae3002a9fc..d1038714e4efaef2b653809edbb54944ca62a7c1 100644 GIT binary patch delta 23 ecmbQ$$26;tX+y0Ghq0l8p^=rL<>pqGsZIc2BnPYj delta 23 ecmbQ$$26;tX+y0Ghk=oTp}Ccb+2&T4sZIc2IR~!* diff --git a/po/vi.po b/po/vi.po index ae36ab4..386a10f 100644 --- a/po/vi.po +++ b/po/vi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2016-12-28 13:46+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -49,7 +49,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -162,7 +162,7 @@ msgstr "" 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:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, 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" @@ -734,13 +734,13 @@ msgstr "" " -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:162 +#: src/loadkeys.c:163 #, 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:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -750,7 +750,7 @@ msgstr "" "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:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -760,12 +760,12 @@ msgstr "" "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:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "Không tìm thấy %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "không mở được tập tin %s\n" @@ -1089,7 +1089,7 @@ msgstr "appendunicode: unicode không đúng %u\n" 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:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "Không thể ghi tập tin phông chữ" @@ -1387,43 +1387,43 @@ msgstr "%s: lỗi (bug) trong do_loadtable\n" msgid "Loading Unicode mapping table...\n" msgstr "Đang nạp bảng ánh xạ Unicode…\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, 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:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, 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:458 +#: src/setfont.c:459 #, 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:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "Không tìm thấy phông mặc định\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "Không tìm thấy phông %s\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "Đang đọc tập tin phông chữ %s\n" @@ -1448,7 +1448,7 @@ msgstr "Hừm - một phông chữ từ phông phục hồi? Sá»­ dụng ná»­a msgid "Bad input file size\n" msgstr "Kích thước tập tin nhập vào sai\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1457,18 +1457,18 @@ msgstr "" "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:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "Khôg tìm thấy gì để ghi nhớ\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, 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" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 991cd63fa08e2f0785c9c831c5b5c1dc49e00e99..7768e5a8e95e88e783fa2368af35879a6ea4f743 100644 GIT binary patch delta 23 fcmaF+lJV_J#tn`x9L9zUhDKI~mYY3YmKXp4cHIbz delta 23 fcmaF+lJV_J#tn`x90o=ThUQi#W}7`-mKXp4cJc_0 diff --git a/po/zh_CN.po b/po/zh_CN.po index 1e1e485..eaaa0e2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kbd 2.0.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2019-07-02 17:46+0200\n" +"POT-Creation-Date: 2019-07-31 12:19+0200\n" "PO-Revision-Date: 2015-11-03 10:39-0500\n" "Last-Translator: Mingye Wang (Arthur2e5) \n" "Language-Team: Chinese (simplified) \n" @@ -47,7 +47,7 @@ msgstr "" #: src/chvt.c:65 src/clrunimap.c:29 src/deallocvt.c:70 src/dumpkeys.c:154 #: src/fgconsole.c:68 src/getkeycodes.c:42 src/getunimap.c:70 src/kbdinfo.c:96 -#: src/kbd_mode.c:100 src/loadkeys.c:170 src/loadunimap.c:80 src/mapscrn.c:55 +#: src/kbd_mode.c:100 src/loadkeys.c:171 src/loadunimap.c:80 src/mapscrn.c:55 #: src/openvt.c:256 src/resizecons.c:164 src/setfont.c:191 src/setkeycodes.c:47 #: src/setlogcons.c:35 src/setmetamode.c:117 src/setpalette.c:36 #: src/setvesablank.c:32 src/setvtrgb.c:154 src/showconsolefont.c:150 @@ -164,7 +164,7 @@ msgstr "" msgid "unknown charset %s - ignoring charset request\n" msgstr "未知的字符集 %s - 忽略字符集请求\n" -#: src/dumpkeys.c:158 src/loadkeys.c:175 +#: src/dumpkeys.c:158 src/loadkeys.c:176 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: 设置键盘模式出错: %m\n" @@ -727,12 +727,12 @@ msgstr "" " -u --unicode 隐式转换为 Unicode\n" " -v --verbose 报告任何改变\n" -#: src/loadkeys.c:162 +#: src/loadkeys.c:163 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: 选项 --unicode 和 --ascii 互斥\n" -#: src/loadkeys.c:183 +#: src/loadkeys.c:184 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -741,7 +741,7 @@ msgstr "" "%s: 警告：正在 Unicode 终端上加载非 Unicode 键映射\n" " (或许你想 `kbd_mode -u'？)\n" -#: src/loadkeys.c:195 +#: src/loadkeys.c:196 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -750,12 +750,12 @@ msgstr "" "%s: 警告：正在非 Unicode 终端上加载 Unicode 键映射\n" " (或许你想 `kbd_mode -u'？)\n" -#: src/loadkeys.c:213 +#: src/loadkeys.c:216 #, c-format msgid "Cannot find %s\n" msgstr "无法找到 %s\n" -#: src/loadkeys.c:234 +#: src/loadkeys.c:249 #, c-format msgid "cannot open file %s\n" msgstr "无法打开文件 %s\n" @@ -1070,7 +1070,7 @@ msgstr "appendunicode: 非法的 unicode %u\n" msgid "Cannot write font file header" msgstr "无法写入字体文件头部" -#: src/psffontop.c:479 src/setfont.c:700 +#: src/psffontop.c:479 src/setfont.c:703 #, c-format msgid "Cannot write font file" msgstr "无法写入字体文件" @@ -1360,42 +1360,42 @@ msgstr "%s: do_loadtable 中的程序错误\n" msgid "Loading Unicode mapping table...\n" msgstr "正在加载 Unicode 映射表 ...\n" -#: src/setfont.c:421 src/setfont.c:516 +#: src/setfont.c:422 src/setfont.c:517 #, c-format msgid "Cannot open font file %s\n" msgstr "无法打开字体文件 %s\n" -#: src/setfont.c:432 +#: 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:445 +#: src/setfont.c:444 #, 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:451 +#: src/setfont.c:452 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "当加载多个字体时，它们必须具有相同的高度\n" -#: src/setfont.c:458 +#: src/setfont.c:459 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "当加载多个字体时，它们必须具有相同的宽度\n" -#: src/setfont.c:503 +#: src/setfont.c:504 #, c-format msgid "Cannot find default font\n" msgstr "无法找到默认字体\n" -#: src/setfont.c:510 +#: src/setfont.c:511 #, c-format msgid "Cannot find %s font\n" msgstr "无法找到 %s 字体\n" -#: src/setfont.c:522 +#: src/setfont.c:523 #, c-format msgid "Reading font file %s\n" msgstr "正在读取字体文件 %s\n" @@ -1420,7 +1420,7 @@ msgstr "嗯 - 一个来自 restorefont 的字体？使用它的前一半。\n" msgid "Bad input file size\n" msgstr "错误的输入文件大小\n" -#: src/setfont.c:633 +#: src/setfont.c:636 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1429,17 +1429,17 @@ msgstr "" "这个文件包含3种字体: 8x8, 8x14 和 8x16. 请使用\n" "选项 -8 或 -14 或 -16 来指定你想加载哪一个。\n" -#: src/setfont.c:650 +#: src/setfont.c:653 #, 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:696 +#: src/setfont.c:699 #, c-format msgid "Found nothing to save\n" msgstr "没有找到需要保存的东西\n" -#: src/setfont.c:705 +#: src/setfont.c:708 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d-字节 %dx%d 字体文件已保存到 %s\n" diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c index 2f87840..804f04a 100644 --- a/src/libkbdfile/kbdfile.c +++ b/src/libkbdfile/kbdfile.c @@ -120,7 +120,7 @@ pipe_open(const struct decompressor *dc, struct kbdfile *fp) if (!(fp->fd)) { char buf[200]; strerror_r(errno, buf, sizeof(buf)); - ERR(fp->ctx, "popen: %s", buf); + ERR(fp->ctx, "popen: %s: %s", pipe_cmd, buf); return -1; } @@ -153,7 +153,7 @@ maybe_pipe_open(struct kbdfile *fp) char buf[200]; strerror_r(errno, buf, sizeof(buf)); - ERR(fp->ctx, "fopen: %s", buf); + ERR(fp->ctx, "fopen: %s: %s", fp->pathname, buf); return -1; } @@ -273,7 +273,7 @@ findfile_in_dir(const char *fnam, const char *dir, const int recdepth, char **su if (dirents < 0) { strerror_r(errno, errbuf, sizeof(errbuf)); - ERR(fp->ctx, "scandir: %s", errbuf); + DBG(fp->ctx, "scandir: %s: %s", dir, errbuf); rc = -1; goto EndScan; } @@ -349,7 +349,7 @@ StartScan: if (!(fp->fd)) { strerror_r(errno, errbuf, sizeof(errbuf)); - ERR(fp->ctx, "fopen: %s", errbuf); + ERR(fp->ctx, "fopen: %s: %s", fp->pathname, errbuf); rc = -1; goto EndScan; } @@ -385,7 +385,7 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp) int rc, i; if (fp->fd != NULL) { - ERR(fp->ctx, "kbdfile already opened: %s", fp->pathname); + ERR(fp->ctx, "can't open `%s', because kbdfile already opened: %s", fnam, fp->pathname); return -1; } diff --git a/src/loadkeys.c b/src/loadkeys.c index ca2181a..406eef5 100644 --- a/src/loadkeys.c +++ b/src/loadkeys.c @@ -95,7 +95,8 @@ int main(int argc, char *argv[]) int kd_mode; char *console = NULL; char *ev; - struct kbdfile *fp; + struct kbdfile_ctx *fctx; + struct kbdfile *fp = NULL; set_progname(argv[0]); setuplocale(); @@ -105,7 +106,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if ((fp = kbdfile_new(NULL)) == NULL) + if ((fctx = kbdfile_context_new()) == NULL) nomem(); while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { @@ -207,25 +208,39 @@ int main(int argc, char *argv[]) } if (options & OPT_D) { - /* first read default map - search starts in . */ + if ((fp = kbdfile_new(fctx)) == NULL) + nomem(); + /* first read default map - search starts in . */ if (kbdfile_find((char *) DEFMAP, dirpath, suffixes, fp)) { fprintf(stderr, _("Cannot find %s\n"), DEFMAP); exit(EXIT_FAILURE); } - if ((rc = lk_parse_keymap(ctx, fp)) == -1) + rc = lk_parse_keymap(ctx, fp); + kbdfile_free(fp); + + if (rc == -1) goto fail; } else if (optind == argc) { + if ((fp = kbdfile_new(fctx)) == NULL) + nomem(); + kbdfile_set_file(fp, stdin); kbdfile_set_pathname(fp, ""); - if ((rc = lk_parse_keymap(ctx, fp)) == -1) + rc = lk_parse_keymap(ctx, fp); + kbdfile_free(fp); + + if (rc == -1) goto fail; } for (i = optind; argv[i]; i++) { + if ((fp = kbdfile_new(fctx)) == NULL) + nomem(); + if (!strcmp(argv[i], "-")) { kbdfile_set_file(fp, stdin); kbdfile_set_pathname(fp, ""); @@ -235,7 +250,10 @@ int main(int argc, char *argv[]) goto fail; } - if ((rc = lk_parse_keymap(ctx, fp)) == -1) + rc = lk_parse_keymap(ctx, fp); + kbdfile_free(fp); + + if (rc == -1) goto fail; } @@ -251,7 +269,7 @@ int main(int argc, char *argv[]) fail: lk_free(ctx); - kbdfile_free(fp); + kbdfile_context_free(fctx); if (fd >= 0) close(fd); diff --git a/src/setfont.c b/src/setfont.c index 8a3730f..3e21e7c 100644 --- a/src/setfont.c +++ b/src/setfont.c @@ -396,16 +396,12 @@ loadnewfonts(int fd, char **ifiles, int ifilct, int bigfontbuflth, bigfontsize, bigheight, bigwidth; struct unicode_list *uclistheads; int i; - struct kbdfile *fp; if (ifilct == 1) { loadnewfont(fd, ifiles[0], iunit, hwunit, no_m, no_u); return; } - if ((fp = kbdfile_new(NULL)) == NULL) - nomem(); - /* several fonts that must be merged */ /* We just concatenate the bitmaps - only allow psf fonts */ bigfontbuf = NULL; @@ -416,6 +412,11 @@ loadnewfonts(int fd, char **ifiles, int ifilct, bigwidth = 0; for (i = 0; i < ifilct; i++) { + struct kbdfile *fp; + + if ((fp = kbdfile_new(NULL)) == NULL) + nomem(); + ifil = ifiles[i]; if (findfont(ifil, fp) && findpartialfont(ifil, fp)) { fprintf(stderr, _("Cannot open font file %s\n"), ifil); @@ -436,8 +437,6 @@ loadnewfonts(int fd, char **ifiles, int ifilct, exit(EX_DATAERR); } - kbdfile_free(fp); // avoid zombies, jw@suse.de (#88501) - bytewidth = (width + 7) / 8; height = fontbuflth / (bytewidth * fontsize); @@ -445,6 +444,8 @@ loadnewfonts(int fd, char **ifiles, int ifilct, printf(_("Read %d-char %dx%d font from file %s\n"), fontsize, width, height, kbdfile_get_pathname(fp)); + kbdfile_free(fp); // avoid zombies, jw@suse.de (#88501) + if (bigheight == 0) bigheight = height; else if (bigheight != height) { @@ -528,7 +529,6 @@ loadnewfont(int fd, char *ifil, int iunit, int hwunit, int no_m, int no_u) if (readpsffont(kbdfile_get_file(fp), &inbuf, &inputlth, &fontbuf, &fontbuflth, &width, &fontsize, 0, no_u ? NULL : &uclistheads) == 0) { - kbdfile_free(fp); /* we've got a psf font */ bytewidth = (width + 7) / 8; @@ -536,15 +536,15 @@ loadnewfont(int fd, char *ifil, int iunit, int hwunit, int no_m, int no_u) do_loadfont(fd, fontbuf, width, height, hwunit, fontsize, kbdfile_get_pathname(fp)); + if (uclistheads && !no_u) do_loadtable(fd, uclistheads, fontsize); #if 1 if (!uclistheads && !no_u && def) loadunicodemap(fd, "def.uni"); #endif - return; + goto exit; } - kbdfile_free(fp); // avoid zombies, jw@suse.de (#88501) /* instructions to combine fonts? */ { @@ -574,7 +574,7 @@ loadnewfont(int fd, char *ifil, int iunit, int hwunit, int no_m, int no_u) } /* recursive call */ loadnewfonts(fd, ifiles, ifilct, iunit, hwunit, no_m, no_u); - return; + goto exit; } } @@ -617,6 +617,9 @@ loadnewfont(int fd, char *ifil, int iunit, int hwunit, int no_m, int no_u) } do_loadfont(fd, inbuf + offset, width, height, hwunit, fontsize, kbdfile_get_pathname(fp)); +exit: + kbdfile_free(fp); + return; } static int diff --git a/tests/Makefile.am b/tests/Makefile.am index f32b9aa..8d0ab69 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(CHECK_CFLAGS) $(CODE_COVERAGE_CFLAGS) LDADD = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ @INTLLIBS@ $(CODE_COVERAGE_LIBS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 1715fbc..e5c135d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -139,6 +139,7 @@ libkbdfile_test01_OBJECTS = $(am_libkbdfile_test01_OBJECTS) libkbdfile_test01_LDADD = $(LDADD) am__DEPENDENCIES_1 = libkbdfile_test01_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -150,6 +151,7 @@ am_libkbdfile_test02_OBJECTS = libkbdfile-test02.$(OBJEXT) libkbdfile_test02_OBJECTS = $(am_libkbdfile_test02_OBJECTS) libkbdfile_test02_LDADD = $(LDADD) libkbdfile_test02_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -157,6 +159,7 @@ am_libkbdfile_test03_OBJECTS = libkbdfile-test03.$(OBJEXT) libkbdfile_test03_OBJECTS = $(am_libkbdfile_test03_OBJECTS) libkbdfile_test03_LDADD = $(LDADD) libkbdfile_test03_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -164,6 +167,7 @@ am_libkbdfile_test04_OBJECTS = libkbdfile-test04.$(OBJEXT) libkbdfile_test04_OBJECTS = $(am_libkbdfile_test04_OBJECTS) libkbdfile_test04_LDADD = $(LDADD) libkbdfile_test04_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -171,6 +175,7 @@ am_libkbdfile_test05_OBJECTS = libkbdfile-test05.$(OBJEXT) libkbdfile_test05_OBJECTS = $(am_libkbdfile_test05_OBJECTS) libkbdfile_test05_LDADD = $(LDADD) libkbdfile_test05_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -178,6 +183,7 @@ am_libkbdfile_test06_OBJECTS = libkbdfile-test06.$(OBJEXT) libkbdfile_test06_OBJECTS = $(am_libkbdfile_test06_OBJECTS) libkbdfile_test06_LDADD = $(LDADD) libkbdfile_test06_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -185,6 +191,7 @@ am_libkbdfile_test07_OBJECTS = libkbdfile-test07.$(OBJEXT) libkbdfile_test07_OBJECTS = $(am_libkbdfile_test07_OBJECTS) libkbdfile_test07_LDADD = $(LDADD) libkbdfile_test07_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -192,6 +199,7 @@ am_libkbdfile_test08_OBJECTS = libkbdfile-test08.$(OBJEXT) libkbdfile_test08_OBJECTS = $(am_libkbdfile_test08_OBJECTS) libkbdfile_test08_LDADD = $(LDADD) libkbdfile_test08_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -199,6 +207,7 @@ am_libkbdfile_test09_OBJECTS = libkbdfile-test09.$(OBJEXT) libkbdfile_test09_OBJECTS = $(am_libkbdfile_test09_OBJECTS) libkbdfile_test09_LDADD = $(LDADD) libkbdfile_test09_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -206,6 +215,7 @@ am_libkbdfile_test10_OBJECTS = libkbdfile-test10.$(OBJEXT) libkbdfile_test10_OBJECTS = $(am_libkbdfile_test10_OBJECTS) libkbdfile_test10_LDADD = $(LDADD) libkbdfile_test10_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -213,6 +223,7 @@ am_libkbdfile_test11_OBJECTS = libkbdfile-test11.$(OBJEXT) libkbdfile_test11_OBJECTS = $(am_libkbdfile_test11_OBJECTS) libkbdfile_test11_LDADD = $(LDADD) libkbdfile_test11_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -220,6 +231,7 @@ am_libkbdfile_test12_OBJECTS = libkbdfile-test12.$(OBJEXT) libkbdfile_test12_OBJECTS = $(am_libkbdfile_test12_OBJECTS) libkbdfile_test12_LDADD = $(LDADD) libkbdfile_test12_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -227,6 +239,7 @@ am_libkeymap_bkeymap_OBJECTS = libkeymap-bkeymap.$(OBJEXT) libkeymap_bkeymap_OBJECTS = $(am_libkeymap_bkeymap_OBJECTS) libkeymap_bkeymap_LDADD = $(LDADD) libkeymap_bkeymap_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -234,6 +247,7 @@ am_libkeymap_dumpkeys_OBJECTS = libkeymap-dumpkeys.$(OBJEXT) libkeymap_dumpkeys_OBJECTS = $(am_libkeymap_dumpkeys_OBJECTS) libkeymap_dumpkeys_LDADD = $(LDADD) libkeymap_dumpkeys_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -241,6 +255,7 @@ am_libkeymap_mktable_OBJECTS = libkeymap-mktable.$(OBJEXT) libkeymap_mktable_OBJECTS = $(am_libkeymap_mktable_OBJECTS) libkeymap_mktable_LDADD = $(LDADD) libkeymap_mktable_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -248,6 +263,7 @@ am_libkeymap_showmaps_OBJECTS = libkeymap-showmaps.$(OBJEXT) libkeymap_showmaps_OBJECTS = $(am_libkeymap_showmaps_OBJECTS) libkeymap_showmaps_LDADD = $(LDADD) libkeymap_showmaps_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -255,6 +271,7 @@ am_libkeymap_test01_OBJECTS = libkeymap-test01.$(OBJEXT) libkeymap_test01_OBJECTS = $(am_libkeymap_test01_OBJECTS) libkeymap_test01_LDADD = $(LDADD) libkeymap_test01_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -262,6 +279,7 @@ am_libkeymap_test02_OBJECTS = libkeymap-test02.$(OBJEXT) libkeymap_test02_OBJECTS = $(am_libkeymap_test02_OBJECTS) libkeymap_test02_LDADD = $(LDADD) libkeymap_test02_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -269,6 +287,7 @@ am_libkeymap_test03_OBJECTS = libkeymap-test03.$(OBJEXT) libkeymap_test03_OBJECTS = $(am_libkeymap_test03_OBJECTS) libkeymap_test03_LDADD = $(LDADD) libkeymap_test03_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -276,6 +295,7 @@ am_libkeymap_test04_OBJECTS = libkeymap-test04.$(OBJEXT) libkeymap_test04_OBJECTS = $(am_libkeymap_test04_OBJECTS) libkeymap_test04_LDADD = $(LDADD) libkeymap_test04_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -283,6 +303,7 @@ am_libkeymap_test05_OBJECTS = libkeymap-test05.$(OBJEXT) libkeymap_test05_OBJECTS = $(am_libkeymap_test05_OBJECTS) libkeymap_test05_LDADD = $(LDADD) libkeymap_test05_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -290,6 +311,7 @@ am_libkeymap_test06_OBJECTS = libkeymap-test06.$(OBJEXT) libkeymap_test06_OBJECTS = $(am_libkeymap_test06_OBJECTS) libkeymap_test06_LDADD = $(LDADD) libkeymap_test06_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -297,6 +319,7 @@ am_libkeymap_test07_OBJECTS = libkeymap-test07.$(OBJEXT) libkeymap_test07_OBJECTS = $(am_libkeymap_test07_OBJECTS) libkeymap_test07_LDADD = $(LDADD) libkeymap_test07_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -304,6 +327,7 @@ am_libkeymap_test08_OBJECTS = libkeymap-test08.$(OBJEXT) libkeymap_test08_OBJECTS = $(am_libkeymap_test08_OBJECTS) libkeymap_test08_LDADD = $(LDADD) libkeymap_test08_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -311,6 +335,7 @@ am_libkeymap_test09_OBJECTS = libkeymap-test09.$(OBJEXT) libkeymap_test09_OBJECTS = $(am_libkeymap_test09_OBJECTS) libkeymap_test09_LDADD = $(LDADD) libkeymap_test09_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -318,6 +343,7 @@ am_libkeymap_test10_OBJECTS = libkeymap-test10.$(OBJEXT) libkeymap_test10_OBJECTS = $(am_libkeymap_test10_OBJECTS) libkeymap_test10_LDADD = $(LDADD) libkeymap_test10_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -325,6 +351,7 @@ am_libkeymap_test11_OBJECTS = libkeymap-test11.$(OBJEXT) libkeymap_test11_OBJECTS = $(am_libkeymap_test11_OBJECTS) libkeymap_test11_LDADD = $(LDADD) libkeymap_test11_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -332,6 +359,7 @@ am_libkeymap_test12_OBJECTS = libkeymap-test12.$(OBJEXT) libkeymap_test12_OBJECTS = $(am_libkeymap_test12_OBJECTS) libkeymap_test12_LDADD = $(LDADD) libkeymap_test12_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -339,6 +367,7 @@ am_libkeymap_test13_OBJECTS = libkeymap-test13.$(OBJEXT) libkeymap_test13_OBJECTS = $(am_libkeymap_test13_OBJECTS) libkeymap_test13_LDADD = $(LDADD) libkeymap_test13_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -346,6 +375,7 @@ am_libkeymap_test14_OBJECTS = libkeymap-test14.$(OBJEXT) libkeymap_test14_OBJECTS = $(am_libkeymap_test14_OBJECTS) libkeymap_test14_LDADD = $(LDADD) libkeymap_test14_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -353,6 +383,7 @@ am_libkeymap_test15_OBJECTS = libkeymap-test15.$(OBJEXT) libkeymap_test15_OBJECTS = $(am_libkeymap_test15_OBJECTS) libkeymap_test15_LDADD = $(LDADD) libkeymap_test15_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -360,6 +391,7 @@ am_libkeymap_test16_OBJECTS = libkeymap-test16.$(OBJEXT) libkeymap_test16_OBJECTS = $(am_libkeymap_test16_OBJECTS) libkeymap_test16_LDADD = $(LDADD) libkeymap_test16_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -367,6 +399,7 @@ am_libkeymap_test17_OBJECTS = libkeymap-test17.$(OBJEXT) libkeymap_test17_OBJECTS = $(am_libkeymap_test17_OBJECTS) libkeymap_test17_LDADD = $(LDADD) libkeymap_test17_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -374,6 +407,7 @@ am_libkeymap_test18_OBJECTS = libkeymap-test18.$(OBJEXT) libkeymap_test18_OBJECTS = $(am_libkeymap_test18_OBJECTS) libkeymap_test18_LDADD = $(LDADD) libkeymap_test18_DEPENDENCIES = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ $(am__DEPENDENCIES_1) @@ -876,6 +910,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(CHECK_CFLAGS) $(CODE_COVERAGE_CFLAGS) LDADD = \ + $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libkeymap/libkeymap.la \ $(top_builddir)/src/libkbdfile/libkbdfile.la \ @INTLLIBS@ $(CODE_COVERAGE_LIBS) diff --git a/tests/libkbdfile-test01.c b/tests/libkbdfile-test01.c index ce74648..f836a62 100644 --- a/tests/libkbdfile-test01.c +++ b/tests/libkbdfile-test01.c @@ -1,17 +1,19 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); kbdfile_free(fp); return EXIT_SUCCESS; } diff --git a/tests/libkbdfile-test02.c b/tests/libkbdfile-test02.c index 3ef9eb4..2906dd8 100644 --- a/tests/libkbdfile-test02.c +++ b/tests/libkbdfile-test02.c @@ -1,17 +1,19 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { ".map", 0 }; @@ -23,10 +25,10 @@ main(void) rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test03.c b/tests/libkbdfile-test03.c index d26e56b..adafe53 100644 --- a/tests/libkbdfile-test03.c +++ b/tests/libkbdfile-test03.c @@ -1,17 +1,18 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { "", ".kmap", ".map", 0 }; @@ -21,10 +22,10 @@ main(void) int rc = kbdfile_find((char *)"test2", (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test04.c b/tests/libkbdfile-test04.c index 364e4b5..51c6d9d 100644 --- a/tests/libkbdfile-test04.c +++ b/tests/libkbdfile-test04.c @@ -1,17 +1,19 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { ".map", "", ".kmap", 0 }; @@ -21,9 +23,9 @@ main(void) int rc = kbdfile_find((char *)"test2", (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test05.c b/tests/libkbdfile-test05.c index 49d7c88..0579420 100644 --- a/tests/libkbdfile-test05.c +++ b/tests/libkbdfile-test05.c @@ -1,17 +1,18 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { ".kmap", ".map", "", 0 }; @@ -21,10 +22,10 @@ main(void) int rc = kbdfile_find((char *)"test2", (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test06.c b/tests/libkbdfile-test06.c index 8e933f2..7a7a387 100644 --- a/tests/libkbdfile-test06.c +++ b/tests/libkbdfile-test06.c @@ -1,17 +1,19 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { ".foo", ".bar", ".map", ".baz", "", 0 }; @@ -21,10 +23,10 @@ main(void) int rc = kbdfile_find((char *)"test2", (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test07.c b/tests/libkbdfile-test07.c index e975b3c..0dba16c 100644 --- a/tests/libkbdfile-test07.c +++ b/tests/libkbdfile-test07.c @@ -1,17 +1,19 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { ".map", "", ".kmap", 0 }; @@ -21,10 +23,10 @@ main(void) int rc = kbdfile_find((char *)"test3", (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c index f596aa6..bf41707 100644 --- a/tests/libkbdfile-test08.c +++ b/tests/libkbdfile-test08.c @@ -1,17 +1,18 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { "", ".map", ".kmap", 0 }; @@ -23,10 +24,10 @@ main(void) rc = kbdfile_find((char *)(ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test09.c b/tests/libkbdfile-test09.c index 1d12cf6..e66525b 100644 --- a/tests/libkbdfile-test09.c +++ b/tests/libkbdfile-test09.c @@ -1,21 +1,23 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_open(NULL, DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map"); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *expect = DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map"; if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test10.c b/tests/libkbdfile-test10.c index d58e690..5c1d0b6 100644 --- a/tests/libkbdfile-test10.c +++ b/tests/libkbdfile-test10.c @@ -1,17 +1,19 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_open(NULL, DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0"); if (fp) - error(EXIT_FAILURE, 0, "unexpected kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unexpected kbdfile"); kbdfile_free(fp); diff --git a/tests/libkbdfile-test11.c b/tests/libkbdfile-test11.c index 76b9c53..cc4b8a3 100644 --- a/tests/libkbdfile-test11.c +++ b/tests/libkbdfile-test11.c @@ -1,17 +1,19 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { ".map", 0 }; @@ -23,10 +25,10 @@ main(void) rc = kbdfile_find((char *)"i386/qwerty/test3", (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkbdfile-test12.c b/tests/libkbdfile-test12.c index 04bbfb3..15cae73 100644 --- a/tests/libkbdfile-test12.c +++ b/tests/libkbdfile-test12.c @@ -1,17 +1,19 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct kbdfile *fp = kbdfile_new(NULL); if (!fp) - error(EXIT_FAILURE, 0, "unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; const char *const suffixes[] = { ".map", 0 }; @@ -23,10 +25,10 @@ main(void) rc = kbdfile_find((char *)"qwerty/test3", (char **) dirpath, (char **) suffixes, fp); if (rc != 0) - error(EXIT_FAILURE, 0, "unable to find file"); + kbd_error(EXIT_FAILURE, 0, "unable to find file"); if (strcmp(expect, kbdfile_get_pathname(fp)) != 0) - error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); + kbd_error(EXIT_FAILURE, 0, "unexpected file: %s (expected %s)", kbdfile_get_pathname(fp), expect); kbdfile_free(fp); diff --git a/tests/libkeymap-bkeymap.c b/tests/libkeymap-bkeymap.c index fd82711..96c521b 100644 --- a/tests/libkeymap-bkeymap.c +++ b/tests/libkeymap-bkeymap.c @@ -7,6 +7,8 @@ int main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; struct kbdfile *fp; struct kbdfile_ctx *kbdfile_ctx; diff --git a/tests/libkeymap-dumpkeys.c b/tests/libkeymap-dumpkeys.c index 363322d..861048c 100644 --- a/tests/libkeymap-dumpkeys.c +++ b/tests/libkeymap-dumpkeys.c @@ -4,8 +4,12 @@ #include #include -int main(int argc, char **argv) +#include "libcommon.h" + +int main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + lk_table_shape table; char numeric; struct lk_ctx *ctx; diff --git a/tests/libkeymap-mktable.c b/tests/libkeymap-mktable.c index f5af8a3..704e37d 100644 --- a/tests/libkeymap-mktable.c +++ b/tests/libkeymap-mktable.c @@ -8,6 +8,8 @@ int main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; struct kbdfile *fp; struct kbdfile_ctx *kbdfile_ctx; diff --git a/tests/libkeymap-showmaps.c b/tests/libkeymap-showmaps.c index 89bd310..cbf0efd 100644 --- a/tests/libkeymap-showmaps.c +++ b/tests/libkeymap-showmaps.c @@ -8,6 +8,8 @@ int main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + unsigned int i; struct lk_ctx *ctx; struct kbdfile *fp; diff --git a/tests/libkeymap-test01.c b/tests/libkeymap-test01.c index e4d5913..3c96260 100644 --- a/tests/libkeymap-test01.c +++ b/tests/libkeymap-test01.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + const char *s; FILE *f = NULL; struct kbdfile *fp = NULL; @@ -17,11 +19,11 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); @@ -30,17 +32,17 @@ main(void) f = fopen(DATADIR "/data/libkeymap/charset-keymap0.map", "r"); if (!f) - error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/charset-keymap0.map: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/charset-keymap0.map: %s", strerror(errno)); kbdfile_set_file(fp, f); if (lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); s = lk_get_charset(ctx); if (strcmp(s, "iso-8859-2")) - error(EXIT_FAILURE, 0, "Unable to parse charset"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse charset"); kbdfile_free(fp); kbdfile_context_free(kbdfile_ctx); diff --git a/tests/libkeymap-test02.c b/tests/libkeymap-test02.c index 1e48247..a780983 100644 --- a/tests/libkeymap-test02.c +++ b/tests/libkeymap-test02.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + const char *s; FILE *f = NULL; struct kbdfile *fp = NULL; @@ -17,17 +19,17 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); kbdfile_set_pathname(fp, "null"); f = fopen("/dev/null", "r"); if (!f) - error(EXIT_FAILURE, 0, "Unable to open: /dev/null: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: /dev/null: %s", strerror(errno)); kbdfile_set_file(fp, f); @@ -35,15 +37,15 @@ main(void) lk_set_log_fn(ctx, NULL, NULL); if (lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); s = lk_get_charset(ctx); if (s == NULL) - error(EXIT_FAILURE, 0, "Charset not found"); + kbd_error(EXIT_FAILURE, 0, "Charset not found"); if (strcmp(s, "iso-8859-1")) - error(EXIT_FAILURE, 0, "Unable to parse charset"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse charset"); kbdfile_free(fp); kbdfile_context_free(kbdfile_ctx); diff --git a/tests/libkeymap-test03.c b/tests/libkeymap-test03.c index 58c0557..93c30ef 100644 --- a/tests/libkeymap-test03.c +++ b/tests/libkeymap-test03.c @@ -1,18 +1,20 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; if ((ctx = lk_init()) == NULL) - error(EXIT_FAILURE, 0, "Unable to initialize structure by valid pointer"); + kbd_error(EXIT_FAILURE, 0, "Unable to initialize structure by valid pointer"); lk_free(ctx); diff --git a/tests/libkeymap-test04.c b/tests/libkeymap-test04.c index 47993be..7722ea0 100644 --- a/tests/libkeymap-test04.c +++ b/tests/libkeymap-test04.c @@ -1,26 +1,28 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; ctx = lk_init(); if (ctx == NULL) - error(EXIT_FAILURE, 0, "Unable to initialize structure by valid pointer"); + kbd_error(EXIT_FAILURE, 0, "Unable to initialize structure by valid pointer"); if (lk_free(ctx) != 0) - error(EXIT_FAILURE, 0, "Unable to free by valid pointer"); + kbd_error(EXIT_FAILURE, 0, "Unable to free by valid pointer"); if (lk_free(NULL) == 0) - error(EXIT_FAILURE, 0, "Possible to free NULL pointer"); + kbd_error(EXIT_FAILURE, 0, "Possible to free NULL pointer"); return EXIT_SUCCESS; } diff --git a/tests/libkeymap-test05.c b/tests/libkeymap-test05.c index 61496dc..155a56a 100644 --- a/tests/libkeymap-test05.c +++ b/tests/libkeymap-test05.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + int c; FILE *f = NULL; struct kbdfile *fp = NULL; @@ -17,11 +19,11 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); @@ -30,36 +32,36 @@ main(void) f = fopen(DATADIR "/data/libkeymap/keymap0.map", "r"); if (!f) - error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap0.map: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap0.map: %s", strerror(errno)); kbdfile_set_file(fp, f); if (lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); c = lk_get_key(ctx, 0, 16); if (KVAL(c) != 'q') - error(EXIT_FAILURE, 0, "Unable to get keycode 16"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode 16"); c = lk_get_key(ctx, 0, 17); if (KVAL(c) != 'w') - error(EXIT_FAILURE, 0, "Unable to get keycode 17"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode 17"); c = lk_get_key(ctx, 0, 18); if (KVAL(c) != 'e') - error(EXIT_FAILURE, 0, "Unable to get keycode 18"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode 18"); c = lk_get_key(ctx, 0, 19); if (KVAL(c) != 'r') - error(EXIT_FAILURE, 0, "Unable to get keycode 19"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode 19"); c = lk_get_key(ctx, 0, 20); if (KVAL(c) != 't') - error(EXIT_FAILURE, 0, "Unable to get keycode 20"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode 20"); c = lk_get_key(ctx, 0, 21); if (KVAL(c) != 'y') - error(EXIT_FAILURE, 0, "Unable to get keycode 21"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode 21"); kbdfile_free(fp); kbdfile_context_free(kbdfile_ctx); diff --git a/tests/libkeymap-test06.c b/tests/libkeymap-test06.c index 95bedf1..7eba273 100644 --- a/tests/libkeymap-test06.c +++ b/tests/libkeymap-test06.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + int c; FILE *f = NULL; struct kbdfile *fp = NULL; @@ -17,11 +19,11 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); @@ -30,20 +32,20 @@ main(void) f = fopen(DATADIR "/data/libkeymap/keymap1.map", "r"); if (!f) - error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap1.map: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap1.map: %s", strerror(errno)); kbdfile_set_file(fp, f); if(lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); c = lk_get_key(ctx, 0, 16); if (KVAL(c) != 'q') - error(EXIT_FAILURE, 0, "Unable to get keycode"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode"); c = lk_get_key(ctx, 1, 16); if (KVAL(c) != 'Q') - error(EXIT_FAILURE, 0, "Unable to get keycode"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode"); kbdfile_free(fp); kbdfile_context_free(kbdfile_ctx); diff --git a/tests/libkeymap-test07.c b/tests/libkeymap-test07.c index 98b1c2e..2239b62 100644 --- a/tests/libkeymap-test07.c +++ b/tests/libkeymap-test07.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + unsigned int i = 0; FILE *f = NULL; struct kbdfile *fp = NULL; @@ -17,11 +19,11 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); @@ -30,17 +32,17 @@ main(void) f = fopen(DATADIR "/data/libkeymap/keymap2.map", "r"); if(!f) - error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap2.map: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap2.map: %s", strerror(errno)); kbdfile_set_file(fp, f); if (lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); while (i < MAX_NR_KEYMAPS) { int c = lk_get_key(ctx, i, 17); if (KVAL(c) != 'x') - error(EXIT_FAILURE, 0, "Unable to get keycode"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode"); i++; } diff --git a/tests/libkeymap-test08.c b/tests/libkeymap-test08.c index 3ad1ca7..2df9ec2 100644 --- a/tests/libkeymap-test08.c +++ b/tests/libkeymap-test08.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + unsigned int i; char str[] = "qwertyuiopasdfghjklzxcvbnm"; FILE *f = NULL; @@ -18,11 +20,11 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); @@ -31,17 +33,17 @@ main(void) f = fopen(DATADIR "/data/libkeymap/keymap3.map", "r"); if (!f) - error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "data/libkeymap/keymap3.map: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "data/libkeymap/keymap3.map: %s", strerror(errno)); kbdfile_set_file(fp, f); if (lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); for (i = 0; i < 26; i++) { int c = lk_get_key(ctx, i, 17); if (KVAL(c) != str[i]) - error(EXIT_FAILURE, 0, "Unable to get keycode"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode"); } kbdfile_free(fp); diff --git a/tests/libkeymap-test09.c b/tests/libkeymap-test09.c index 2b1c9fc..84258a6 100644 --- a/tests/libkeymap-test09.c +++ b/tests/libkeymap-test09.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + int c; FILE *f = NULL; struct kbdfile *fp = NULL; @@ -19,11 +21,11 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); @@ -32,24 +34,24 @@ main(void) f = fopen(DATADIR "/data/libkeymap/keymap4.map", "r"); if (!f) - error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap4.map: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap4.map: %s", strerror(errno)); kbdfile_set_file(fp, f); if (lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); c = lk_get_key(ctx, 0, 16); if (KVAL(c) != 'q') - error(EXIT_FAILURE, 0, "Unable to get keycode"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode"); c = lk_get_key(ctx, 0, 17); if (KVAL(c) != 'w') - error(EXIT_FAILURE, 0, "Include40.map failed"); + kbd_error(EXIT_FAILURE, 0, "Include40.map failed"); c = lk_get_key(ctx, 0, 18); if (KVAL(c) != 'e') - error(EXIT_FAILURE, 0, "Include41.map failed"); + kbd_error(EXIT_FAILURE, 0, "Include41.map failed"); kbdfile_free(fp); kbdfile_context_free(kbdfile_ctx); diff --git a/tests/libkeymap-test10.c b/tests/libkeymap-test10.c index 32ea45c..a7daf23 100644 --- a/tests/libkeymap-test10.c +++ b/tests/libkeymap-test10.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + unsigned int i; FILE *f = NULL; struct kbdfile *fp = NULL; @@ -18,11 +20,11 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); @@ -31,18 +33,18 @@ main(void) f = fopen(DATADIR "/data/libkeymap/keymap5.map", "r"); if (!f) - error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap5.map: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap5.map: %s", strerror(errno)); kbdfile_set_file(fp, f); if (lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); for (i = 0; i < MAX_NR_FUNC; i++) { kbs.kb_func = (unsigned char) i; kbs.kb_string[0] = 0; if (lk_get_func(ctx, &kbs) != 0) - error(EXIT_FAILURE, 0, "Unable to get func %d", i); + kbd_error(EXIT_FAILURE, 0, "Unable to get func %d", i); } kbdfile_free(fp); diff --git a/tests/libkeymap-test11.c b/tests/libkeymap-test11.c index 99cca25..fd0f0e0 100644 --- a/tests/libkeymap-test11.c +++ b/tests/libkeymap-test11.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + FILE *f = NULL; struct kbdfile *fp = NULL; struct kbdfile_ctx *kbdfile_ctx; @@ -17,11 +19,11 @@ main(void) kbdfile_ctx = kbdfile_context_new(); if (!kbdfile_ctx) - error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile context"); fp = kbdfile_new(kbdfile_ctx); if (!fp) - error(EXIT_FAILURE, 0, "Unable to create kbdfile"); + kbd_error(EXIT_FAILURE, 0, "Unable to create kbdfile"); ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); @@ -30,27 +32,27 @@ main(void) f = fopen(DATADIR "/data/libkeymap/keymap6.map", "r"); if (!f) - error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap6.map: %s", strerror(errno)); + kbd_error(EXIT_FAILURE, 0, "Unable to open: " DATADIR "/data/libkeymap/keymap6.map: %s", strerror(errno)); kbdfile_set_file(fp, f); if (lk_parse_keymap(ctx, fp) != 0) - error(EXIT_FAILURE, 0, "Unable to parse keymap"); + kbd_error(EXIT_FAILURE, 0, "Unable to parse keymap"); kbs.kb_func = 0; kbs.kb_string[0] = 0; if (lk_get_func(ctx, &kbs) != 0) - error(EXIT_FAILURE, 0, "Unable to get func 0"); + kbd_error(EXIT_FAILURE, 0, "Unable to get func 0"); kbs.kb_func = 1; kbs.kb_string[0] = 0; if (lk_get_func(ctx, &kbs) != 0) - error(EXIT_FAILURE, 0, "Unable to get func 1"); + kbd_error(EXIT_FAILURE, 0, "Unable to get func 1"); kbs.kb_func = 2; kbs.kb_string[0] = 0; if (lk_get_func(ctx, &kbs) != -1) - error(EXIT_FAILURE, 0, "Possible to get not alloced func"); + kbd_error(EXIT_FAILURE, 0, "Possible to get not alloced func"); kbdfile_free(fp); kbdfile_context_free(kbdfile_ctx); diff --git a/tests/libkeymap-test12.c b/tests/libkeymap-test12.c index b00a09a..da4e6be 100644 --- a/tests/libkeymap-test12.c +++ b/tests/libkeymap-test12.c @@ -1,30 +1,32 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); if (lk_add_map(ctx, MAX_NR_KEYMAPS) != 0) - error(EXIT_FAILURE, 0, "Unable to define map == MAX_NR_KEYMAPS"); + kbd_error(EXIT_FAILURE, 0, "Unable to define map == MAX_NR_KEYMAPS"); if (lk_add_map(ctx, MAX_NR_KEYMAPS * 2) != 0) - error(EXIT_FAILURE, 0, "Unable to define map == MAX_NR_KEYMAPS*2"); + kbd_error(EXIT_FAILURE, 0, "Unable to define map == MAX_NR_KEYMAPS*2"); if (lk_add_map(ctx, 0) != 0) - error(EXIT_FAILURE, 0, "Unable to define map"); + kbd_error(EXIT_FAILURE, 0, "Unable to define map"); if (lk_add_map(ctx, 0) != 0) - error(EXIT_FAILURE, 0, "Unable to define map"); + kbd_error(EXIT_FAILURE, 0, "Unable to define map"); lk_free(ctx); diff --git a/tests/libkeymap-test13.c b/tests/libkeymap-test13.c index 6593407..d3df560 100644 --- a/tests/libkeymap-test13.c +++ b/tests/libkeymap-test13.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; struct kmapinfo info; @@ -16,36 +18,36 @@ main(void) lk_set_log_fn(ctx, NULL, NULL); if (lk_add_map(ctx, 0) != 0) - error(EXIT_FAILURE, 0, "Unable to define map"); + kbd_error(EXIT_FAILURE, 0, "Unable to define map"); lk_get_kmapinfo(ctx, &info); if (info.keymaps != 1) - error(EXIT_FAILURE, 0, "Wrong keymap number"); + kbd_error(EXIT_FAILURE, 0, "Wrong keymap number"); if (lk_add_map(ctx, 0) != 0) - error(EXIT_FAILURE, 0, "Unable to define map"); + kbd_error(EXIT_FAILURE, 0, "Unable to define map"); lk_get_kmapinfo(ctx, &info); if (info.keymaps != 1) - error(EXIT_FAILURE, 0, "Wrong keymap number"); + kbd_error(EXIT_FAILURE, 0, "Wrong keymap number"); if (lk_add_map(ctx, 1) != 0) - error(EXIT_FAILURE, 0, "Unable to define map"); + kbd_error(EXIT_FAILURE, 0, "Unable to define map"); lk_get_kmapinfo(ctx, &info); if (info.keymaps != 2) - error(EXIT_FAILURE, 0, "Wrong keymap number"); + kbd_error(EXIT_FAILURE, 0, "Wrong keymap number"); if (lk_add_map(ctx, 2) != 0) - error(EXIT_FAILURE, 0, "Unable to define map"); + kbd_error(EXIT_FAILURE, 0, "Unable to define map"); lk_get_kmapinfo(ctx, &info); if (info.keymaps != 3) - error(EXIT_FAILURE, 0, "Wrong keymap number"); + kbd_error(EXIT_FAILURE, 0, "Wrong keymap number"); lk_free(ctx); diff --git a/tests/libkeymap-test14.c b/tests/libkeymap-test14.c index 4d14303..af237c9 100644 --- a/tests/libkeymap-test14.c +++ b/tests/libkeymap-test14.c @@ -1,24 +1,26 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); if (lk_add_key(ctx, 0, NR_KEYS + 1, 0) != 0) - error(EXIT_FAILURE, 0, "Unable to use index > NR_KEYS"); + kbd_error(EXIT_FAILURE, 0, "Unable to use index > NR_KEYS"); if (lk_add_key(ctx, MAX_NR_KEYMAPS + 1, 0, 0) != 0) - error(EXIT_FAILURE, 0, "Unable to use table > MAX_NR_KEYMAPS"); + kbd_error(EXIT_FAILURE, 0, "Unable to use table > MAX_NR_KEYMAPS"); lk_free(ctx); diff --git a/tests/libkeymap-test15.c b/tests/libkeymap-test15.c index a440e10..28fdf63 100644 --- a/tests/libkeymap-test15.c +++ b/tests/libkeymap-test15.c @@ -1,27 +1,29 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; ctx = lk_init(); lk_set_log_fn(ctx, NULL, NULL); if (lk_add_key(ctx, 0, 0, 0) != 0) - error(EXIT_FAILURE, 0, "Unable to add keycode = 0"); + kbd_error(EXIT_FAILURE, 0, "Unable to add keycode = 0"); if (lk_add_key(ctx, 0, 0, 16) != 0) - error(EXIT_FAILURE, 0, "Unable to add keycode = 16"); + kbd_error(EXIT_FAILURE, 0, "Unable to add keycode = 16"); if (lk_add_key(ctx, 1, 1, K_HOLE) != 0) - error(EXIT_FAILURE, 0, "Unable to add keycode = K_HOLE"); + kbd_error(EXIT_FAILURE, 0, "Unable to add keycode = K_HOLE"); lk_free(ctx); diff --git a/tests/libkeymap-test16.c b/tests/libkeymap-test16.c index a65c112..a886d38 100644 --- a/tests/libkeymap-test16.c +++ b/tests/libkeymap-test16.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + struct lk_ctx *ctx; ctx = lk_init(); @@ -16,10 +18,10 @@ main(void) lk_set_parser_flags(ctx, LK_KEYWORD_ALTISMETA); if (lk_add_key(ctx, 0, 0, 16) != 0) - error(EXIT_FAILURE, 0, "Unable to add keycode"); + kbd_error(EXIT_FAILURE, 0, "Unable to add keycode"); if (lk_get_key(ctx, 0, 0) != 16) - error(EXIT_FAILURE, 0, "Unable to get keycode"); + kbd_error(EXIT_FAILURE, 0, "Unable to get keycode"); lk_free(ctx); diff --git a/tests/libkeymap-test17.c b/tests/libkeymap-test17.c index 9820a4f..af54040 100644 --- a/tests/libkeymap-test17.c +++ b/tests/libkeymap-test17.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + const char *stringvalues[30] = { /* F1 .. F20 */ "\033[[A", "\033[[B", "\033[[C", "\033[[D", "\033[[E", @@ -39,7 +41,7 @@ main(void) ke.kb_func = (unsigned char) i; if (lk_add_func(ctx, &ke) == -1) - error(EXIT_FAILURE, 0, "Unable to add function"); + kbd_error(EXIT_FAILURE, 0, "Unable to add function"); } lk_free(ctx); diff --git a/tests/libkeymap-test18.c b/tests/libkeymap-test18.c index b72132c..2656b79 100644 --- a/tests/libkeymap-test18.c +++ b/tests/libkeymap-test18.c @@ -1,14 +1,16 @@ #include #include #include -#include #include #include +#include "libcommon.h" int -main(void) +main(int __attribute__((unused)) argc, char **argv) { + set_progname(argv[0]); + int i = MAX_DIACR + 10; struct lk_ctx *ctx; struct lk_kbdiacr ptr; @@ -22,7 +24,7 @@ main(void) while (i > 0) { if (lk_append_diacr(ctx, &ptr) != 0) - error(EXIT_FAILURE, 0, "Unable to add diacr"); + kbd_error(EXIT_FAILURE, 0, "Unable to add diacr"); i--; } -- 2.7.4