[packages/kbd] - updated to 2.0.0 (introduces libkeymap library) - updated ngettext patch - added pl.po-update patc
qboosh
qboosh at pld-linux.org
Sun Sep 1 07:55:09 CEST 2013
commit 8d32414e01806feeb2672fc75c17be5941191687
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 1 07:54:49 2013 +0200
- updated to 2.0.0 (introduces libkeymap library)
- updated ngettext patch
- added pl.po-update patch
kbd-ngettext.patch | 118 ++++++++-------
kbd-pl.po-update.patch | 383 +++++++++++++++++++++++++++++++++++++++++++++++++
kbd.spec | 83 ++++++++++-
3 files changed, 529 insertions(+), 55 deletions(-)
---
diff --git a/kbd.spec b/kbd.spec
index c07cdae..aa74143 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -11,12 +11,12 @@ Summary: Linux console utilities
Summary(ko.UTF-8): 콘솔을 설정하는 도구 (글쇠판, 가상 터미널, 그 밖에)
Summary(pl.UTF-8): Narzędzia do obsługi konsoli
Name: kbd
-Version: 1.15.5
-Release: 2
+Version: 2.0.0
+Release: 1
License: GPL v2+
Group: Applications/Console
Source0: ftp://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz
-# Source0-md5: 34c71feead8ab9c01ec638acea8cd877
+# Source0-md5: 5ba259a0b2464196f6488a72070a3d60
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -39,14 +39,20 @@ Source12: console.upstart
Patch0: %{name}-unicode_start.patch
Patch1: %{name}-ngettext.patch
Patch2: %{name}-tty-detect.patch
+Patch3: %{name}-pl.po-update.patch
URL: http://www.win.tue.nl/~aeb/linux/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.9
BuildRequires: bison
+#BuildRequires: check >= 0.9.4
+BuildRequires: doxygen
BuildRequires: flex
BuildRequires: gettext-devel >= 0.14.1
+BuildRequires: libtool >= 2:2
%{?with_vlock:BuildRequires: pam-devel}
+BuildRequires: pkgconfig
Requires(post,preun): /sbin/chkconfig
+Requires: %{name} = %{version}-%{release}
Requires: open
Requires: rc-scripts >= 0.4.3.0
Requires: sed
@@ -81,14 +87,52 @@ Utility to lock one or more virtual consoles.
%description vlock -l pl.UTF-8
Narzędzie do blokowania jednej lub wielu konsol wirtualnych.
+%package libs
+Summary: libkeymap - library to manage the Linux keymaps
+Summary(pl.UTF-8): libkeymap - biblioteka do zarządzania linuksowymi przypisaniami klawiszy
+Group: Libraries
+
+%description libs
+libkeymap - library to manage the Linux keymaps.
+
+%description libs -l pl.UTF-8
+libkeymap - biblioteka do zarządzania linuksowymi przypisaniami
+klawiszy.
+
+%package devel
+Summary: Header files for libkeymap library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libkeymap
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+Header files for libkeymap library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libkeymap.
+
+%package static
+Summary: Static libkeymap library
+Summary(pl.UTF-8): Statyczna biblioteka libkeymap
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static libkeymap library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libkeymap.
+
%prep
%setup -q -a51 -a52
+%patch3 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%{__gettextize}
+%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
@@ -96,6 +140,7 @@ Narzędzie do blokowania jednej lub wielu konsol wirtualnych.
%configure \
--datadir=%{_ldatadir} \
--localedir=%{_datadir}/locale \
+ --enable-libkeymap \
--enable-nls \
--disable-silent-rules \
%{!?with_vlock:--disable-vlock}
@@ -109,11 +154,18 @@ install -d $RPM_BUILD_ROOT{/bin,/etc/{profile.d,rc.d/init.d,sysconfig,init}}
DESTDIR=$RPM_BUILD_ROOT \
gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
-# some binaries are needed in /bin but rest is not
+# some binaries are needed in /bin but the rest is not
for f in setfont dumpkeys kbd_mode unicode_start unicode_stop; do
mv $RPM_BUILD_ROOT%{_bindir}/$f $RPM_BUILD_ROOT/bin
done
+# move library to /lib* for utils in /bin
+install -d $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libkeymap.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf $(basename $RPM_BUILD_ROOT/%{_lib}/libkeymap.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libkeymap.so
+# no external dependencies; also .pc file exists
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libkeymap.la
+
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/console
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/console
cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/init/console.conf
@@ -138,6 +190,10 @@ bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/gr
%{__rm} $RPM_BUILD_ROOT%{_mandir}/{README.kbd-non-english-man-pages,kbd-keypaps_instead_keytables.patch}*
+# doxygen docs
+%{__rm} -rf docs-doxy
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/kbd/html docs-doxy
+
%find_lang %{name}
%clean
@@ -154,7 +210,7 @@ fi
%files -f %{name}.lang
%defattr(644,root,root,755)
# COPYING contains copyright summary, not GPL text
-%doc AUTHORS COPYING ChangeLog README doc/*.txt
+%doc AUTHORS COPYING CREDITS ChangeLog README docs/doc/kbd.FAQ.txt
%attr(754,root,root) /etc/rc.d/init.d/console
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/console
%config(noreplace) %verify(not md5 mtime size) /etc/init/console.conf
@@ -237,3 +293,20 @@ fi
%attr(755,root,root) %{_bindir}/vlock
%{_mandir}/man1/vlock.1*
%endif
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libkeymap.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libkeymap.so.0
+
+%files devel
+%defattr(644,root,root,755)
+%doc docs-doxy/*
+%attr(755,root,root) %{_libdir}/libkeymap.so
+%{_includedir}/keymap
+%{_includedir}/keymap.h
+%{_pkgconfigdir}/libkeymap.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libkeymap.a
diff --git a/kbd-ngettext.patch b/kbd-ngettext.patch
index c1adbf9..50d399a 100644
--- a/kbd-ngettext.patch
+++ b/kbd-ngettext.patch
@@ -1,28 +1,33 @@
---- kbd-1.15.3/src/loadkeys.y.orig 2011-05-02 01:19:11.000000000 +0200
-+++ kbd-1.15.3/src/loadkeys.y 2011-05-25 22:05:36.323510071 +0200
-@@ -582,17 +582,15 @@
- funcct = deffuncs(fd);
+--- kbd-2.0.0/src/libkeymap/loadkeys.c.orig 2013-08-13 15:46:23.000000000 +0200
++++ kbd-2.0.0/src/libkeymap/loadkeys.c 2013-08-31 20:25:59.227675901 +0200
+@@ -250,9 +250,12 @@
+ if ((keyct = defkeys(ctx, fd, kbd_mode)) < 0 || (funcct = deffuncs(ctx, fd)) < 0)
+ return -1;
- if (verbose) {
-- printf(_("\nChanged %d %s and %d %s.\n"),
-- keyct, (keyct == 1) ? _("key") : _("keys"),
-- funcct, (funcct == 1) ? _("string") : _("strings"));
-+ printf(ngettext("\nChanged %d key", "\nChanged %d keys", keyct), keyct);
-+ printf(ngettext(" and %d string.\n", " and %d strings.\n", funcct), funcct);
- }
+- INFO(ctx, _("\nChanged %d %s and %d %s"),
+- keyct, (keyct == 1) ? _("key") : _("keys"),
+- funcct, (funcct == 1) ? _("string") : _("strings"));
++ {
++ char msgbuf1[128], msgbuf2[128];
++ snprintf(msgbuf1, sizeof(msgbuf1), ngettext("\nChanged %d key", "\nChanged %d keys", keyct), keyct);
++ snprintf(msgbuf2, sizeof(msgbuf2), ngettext(" and %d string.", " and %d strings.", funcct), funcct);
++ INFO(ctx, "%s%s", msgbuf1, msgbuf2);
++ }
- if (accent_table_size > 0 || nocompose) {
- diacct = defdiacs(fd);
+ if (ctx->accent_table->count > 0 || ctx->flags & LK_FLAG_CLEAR_COMPOSE) {
+ diacct = defdiacs(ctx, fd);
+@@ -260,8 +263,7 @@
+ if (diacct < 0)
+ return -1;
- if (verbose) {
-- printf(_("Loaded %d compose %s.\n"),
-- diacct, (diacct == 1) ? _("definition") : _("definitions"));
-+ printf(ngettext("Loaded %d compose definition.\n", "Loaded %d compose definitions.\n", diacct), diacct);
- }
+- INFO(ctx, _("Loaded %d compose %s"),
+- diacct, (diacct == 1) ? _("definition") : _("definitions"));
++ INFO(ctx, ngettext("Loaded %d compose definition", "Loaded %s compose definitions", diacct), diacct);
- } else if (verbose) {
---- kbd-1.15.5/po/pl.po.orig 2012-12-03 07:35:17.000000000 +0100
-+++ kbd-1.15.5/po/pl.po 2012-12-15 22:02:26.542184855 +0100
+ } else {
+ INFO(ctx, _("(No change in compose definitions)"));
+--- kbd-2.0.0/po/pl.po.orig 2013-09-01 07:25:30.719348576 +0200
++++ kbd-2.0.0/po/pl.po 2013-09-01 07:33:38.449328112 +0200
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -31,33 +36,38 @@
#: src/chvt.c:28
#, c-format
-@@ -623,37 +624,39 @@
- msgid "impossible error in do_constant"
- msgstr "niemo�liwy b��d w do_constant"
+@@ -472,47 +473,41 @@
+ msgid "unable to get compose definitions"
+ msgstr "nie uda�o si� pobra� definicji compose"
-# XXX: ngettext should be used for the following five messages
- #: loadkeys.y:596
+-#: src/libkeymap/loadkeys.c:253
++#: src/libkeymap/loadkeys.c:255
#, c-format
msgid ""
"\n"
--"Changed %d %s and %d %s.\n"
+-"Changed %d %s and %d %s"
-msgstr ""
+"Changed %d key"
+msgid_plural ""
"\n"
--"Zmienionych klawiszy: %d%s �a�cuch�w: %d%s\n"
+-"Zmienionych klawiszy: %d%s �a�cuch�w: %d%s"
-
--#: loadkeys.y:597
+-#: src/libkeymap/loadkeys.c:254
-msgid "key"
-msgstr ","
-
--#: loadkeys.y:597
+-#: src/libkeymap/loadkeys.c:254
-msgid "keys"
-msgstr ","
-
--#: loadkeys.y:598
+-#: src/libkeymap/loadkeys.c:255
-msgid "string"
-msgstr "."
+-
+-#: src/libkeymap/loadkeys.c:255
+-msgid "strings"
+-msgstr "."
+"Changed %d keys"
+msgstr[0] ""
+"\n"
@@ -69,27 +79,35 @@
+"\n"
+"Zmieniono %d klawiszy"
--#: loadkeys.y:598
--msgid "strings"
+-# XXX: ngettext should be used for the following three messages
+-#: src/libkeymap/loadkeys.c:263
++#: src/libkeymap/loadkeys.c:256
+ #, c-format
+-msgid "Loaded %d compose %s"
+-msgstr "Wczytanych definicji compose: %d%s"
+-
+-#: src/libkeymap/loadkeys.c:264
+-msgid "definition"
+-msgstr "."
++msgid " and %d string."
++msgid_plural " and %d strings."
++msgstr[0] " i %d �a�cuch."
++msgstr[1] " i %d �a�cuchy."
++msgstr[2] " i %d �a�cuch�w."
+
+-#: src/libkeymap/loadkeys.c:264
+-msgid "definitions"
-msgstr "."
-+#: loadkeys.y:596
++#: src/libkeymap/loadkeys.c:266
+#, c-format
-+msgid " and %d string.\n"
-+msgid_plural " and %d strings.\n"
-+msgstr[0] " i %d �a�cuch.\n"
-+msgstr[1] " i %d �a�cuchy.\n"
-+msgstr[2] " i %d �a�cuch�w.\n"
++msgid "Loaded %d compose definition"
++msgid_plural "Loaded %s compose definitions"
++msgstr[0] "Wczytano %d definicj� compose"
++msgstr[1] "Wczytano %d definicje compose"
++msgstr[2] "Wczytano %d definicji compose"
--# XXX: ngettext should be used for the following three messages
- #: loadkeys.y:605
- #, c-format
--msgid "Loaded %d compose %s.\n"
--msgstr "Wczytanych definicji compose: %d%s\n"
-+msgid "Loaded %d compose definition.\n"
-+msgid_plural "Loaded %d compose definitions.\n"
-+msgstr[0] "Wczytano %d definicj� compose.\n"
-+msgstr[1] "Wczytano %d definicje compose.\n"
-+msgstr[2] "Wczytano %d definicji compose.\n"
+-#: src/libkeymap/loadkeys.c:267
++#: src/libkeymap/loadkeys.c:269
+ msgid "(No change in compose definitions)"
+ msgstr "(Brak zmian w definicjach compose)"
- #: loadkeys.y:606
- msgid "definition"
diff --git a/kbd-pl.po-update.patch b/kbd-pl.po-update.patch
new file mode 100644
index 0000000..2957420
--- /dev/null
+++ b/kbd-pl.po-update.patch
@@ -0,0 +1,383 @@
+--- kbd-2.0.0/po/pl.po.orig 2013-08-13 16:28:54.000000000 +0200
++++ kbd-2.0.0/po/pl.po 2013-09-01 07:23:26.996020434 +0200
+@@ -1,13 +1,13 @@
+ # Polish translations for kbd.
+ # This file is distributed under the same license as the kbd package.
+-# Jakub Bogusz <qboosh at pld-linux.org>, 2002-2012.
++# Jakub Bogusz <qboosh at pld-linux.org>, 2002-2013.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: kbd 1.15.4-rc1\n"
++"Project-Id-Version: kbd 2.0.0\n"
+ "Report-Msgid-Bugs-To: Alexey Gladkov <gladkov.alexey at gmail.com>\n"
+ "POT-Creation-Date: 2013-08-13 18:28+0400\n"
+-"PO-Revision-Date: 2012-11-26 19:34+0100\n"
++"PO-Revision-Date: 2013-09-01 07:07+0200\n"
+ "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
+ "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
+ "Language: pl\n"
+@@ -250,7 +250,7 @@
+ #: src/kbd_mode.c:94
+ #, c-format
+ msgid "The keyboard is in Unicode (UTF-8) mode\n"
+-msgstr "Klawiatura jest w trybie Unikodu (UTF-8)\n"
++msgstr "Klawiatura jest w trybie Unicode (UTF-8)\n"
+
+ #: src/kbd_mode.c:97
+ #, c-format
+@@ -309,19 +309,17 @@
+ #: src/libkeymap/common.c:126 src/libkeymap/kmap.c:49 src/libkeymap/kmap.c:57
+ #: src/libkeymap/kmap.c:195 src/libkeymap/kmap.c:209
+ #: src/libkeymap/loadkeys.c:118
+-#, fuzzy
+ msgid "out of memory"
+-msgstr "%s: brak pami�ci\n"
++msgstr "brak pami�ci"
+
+ #: src/libkeymap/common.c:132
+ #, c-format
+ msgid "unable to initialize array: %s"
+-msgstr ""
++msgstr "nie uda�o si� zainicjowa� tablicy: %s"
+
+ #: src/libkeymap/dump.c:82
+-#, fuzzy
+ msgid "Error writing map to file"
+-msgstr "B��d podczas zapisu mapy do pliku\n"
++msgstr "B��d podczas zapisu mapy do pliku"
+
+ #: src/libkeymap/dump.c:527
+ #, c-format
+@@ -329,39 +327,39 @@
+ msgstr "niemo�liwe: nie meta?\n"
+
+ #: src/libkeymap/kernel.c:31
+-#, fuzzy, c-format
++#, c-format
+ msgid "KDGKBENT: %s: error at index %d in table %d"
+-msgstr "b��d KDGKBENT pod indeksem %d w tabeli %d\n"
++msgstr "KDGKBENT: %s: b��d pod indeksem %d w tabeli %d"
+
+ #: src/libkeymap/kernel.c:57
+ #, c-format
+ msgid "KDGKBSENT: %s: Unable to get function key string"
+-msgstr ""
++msgstr "KDGKBSENT: %s: Nie uda�o si� pobra� �a�cucha klawisza funkcyjnego"
+
+ #: src/libkeymap/kernel.c:87
+ #, c-format
+ msgid "KDGKBDIACR(UC): %s: Unable to get accent table"
+-msgstr ""
++msgstr "KDGKBDIACR(UC): %s: Nie uda�o si� pobra� tabeli akcent�w"
+
+ #: src/libkeymap/kmap.c:72
+-#, fuzzy, c-format
++#, c-format
+ msgid "unable to keymap %d"
+-msgstr "Nie mo�na otworzy� %s"
++msgstr "nie uda�o si� pobra� mapy klawiszy %d"
+
+ #: src/libkeymap/kmap.c:91
+-#, fuzzy, c-format
++#, c-format
+ msgid "unable to get keymap %d"
+-msgstr "zwalnianie mapy klawiszy %d\n"
++msgstr "nie uda�o si� pobra� mapy klawiszy %d"
+
+ #: src/libkeymap/kmap.c:99
+-#, fuzzy, c-format
++#, c-format
+ msgid "unable to unset key %d for table %d"
+-msgstr "nie uda�o si� przypisa� klawisza %d do warto�ci %d\n"
++msgstr "nie uda�o si� usun�� przypisania klawisza %d dla tabeli %d"
+
+ #: src/libkeymap/kmap.c:116
+-#, fuzzy, c-format
++#, c-format
+ msgid "lk_add_key called with bad keycode %d"
+-msgstr "addkey wywo�ano z b��dnym kodem klawisza %d"
++msgstr "lk_add_key wywo�ano z b��dnym kodem klawisza %d"
+
+ #: src/libkeymap/kmap.c:126
+ #, c-format
+@@ -369,44 +367,43 @@
+ msgstr "dodanie mapy %d narusza jawn� lini� mapy klawiszy"
+
+ #: src/libkeymap/kmap.c:142
+-#, fuzzy, c-format
++#, c-format
+ msgid "unable to set key %d for table %d"
+-msgstr "nie uda�o si� przypisa� klawisza %d do warto�ci %d\n"
++msgstr "nie uda�o si� przypisa� klawisza %d dla tabeli %d"
+
+ #: src/libkeymap/kmap.c:171
+-#, fuzzy, c-format
++#, c-format
+ msgid "func %d not allocated"
+-msgstr "z kt�rych %d dynamicznie przydzielono\n"
++msgstr "funkcja %d nie zosta�a przydzielona"
+
+ #: src/libkeymap/kmap.c:311
+-#, fuzzy
+ msgid "impossible error in lk_add_constants"
+-msgstr "niemo�liwy b��d w do_constant"
++msgstr "niemo�liwy b��d w lk_add_constants"
+
+ #: src/libkeymap/ksyms.c:304
+-#, fuzzy, c-format
++#, c-format
+ msgid "assuming iso-8859-1 %s"
+-msgstr "przyjmowanie iso-8859-1 %s\n"
++msgstr "przyj�to %s w iso-8859-1"
+
+ #: src/libkeymap/ksyms.c:310
+-#, fuzzy, c-format
++#, c-format
+ msgid "assuming iso-8859-15 %s"
+-msgstr "przyjmowanie iso-8859-15 %s\n"
++msgstr "przyj�to %s w iso-8859-15"
+
+ #: src/libkeymap/ksyms.c:316
+-#, fuzzy, c-format
++#, c-format
+ msgid "assuming iso-8859-2 %s"
+-msgstr "przyjmowanie iso-8859-2 %s\n"
++msgstr "przyj�to %s w iso-8859-2"
+
+ #: src/libkeymap/ksyms.c:322
+-#, fuzzy, c-format
++#, c-format
+ msgid "assuming iso-8859-3 %s"
+-msgstr "przyjmowanie iso-8859-3 %s\n"
++msgstr "przyj�to %s w iso-8859-3"
+
+ #: src/libkeymap/ksyms.c:328
+-#, fuzzy, c-format
++#, c-format
+ msgid "assuming iso-8859-4 %s"
+-msgstr "przyjmowanie iso-8859-4 %s\n"
++msgstr "przyj�to %s w iso-8859-4"
+
+ #: src/libkeymap/ksyms.c:333
+ #, c-format
+@@ -414,78 +411,76 @@
+ msgstr "nieznany symbol '%s'\n"
+
+ #: src/libkeymap/loadkeys.c:26
+-#, fuzzy, c-format
++#, c-format
+ msgid "KDSKBMODE: %s: could not switch to Unicode mode"
+-msgstr "%s: nie uda�o si� prze��czy� na tryb Unicode\n"
++msgstr "KDSKBMODE: %s: nie uda�o si� prze��czy� na tryb Unicode"
+
+ #: src/libkeymap/loadkeys.c:48
+-#, fuzzy, c-format
++#, c-format
+ msgid "Keymap %d: Permission denied"
+-msgstr "Mapa klawiszy %d: brak uprawnie�\n"
++msgstr "Mapa klawiszy %d: brak uprawnie�"
+
+ #: src/libkeymap/loadkeys.c:56
+-#, fuzzy, c-format
++#, c-format
+ msgid "keycode %d, table %d = %d%s"
+-msgstr "kod klawisza %d, tablica %d = %d%s\n"
++msgstr "kod klawisza %d, tabela %d = %d%s"
+
+ #: src/libkeymap/loadkeys.c:57
+ msgid " FAILED"
+ msgstr " B��D"
+
+ #: src/libkeymap/loadkeys.c:60
+-#, fuzzy, c-format
++#, c-format
+ msgid "failed to bind key %d to value %d"
+-msgstr "nie uda�o si� przypisa� klawisza %d do warto�ci %d\n"
++msgstr "nie uda�o si� przypisa� klawisza %d do warto�ci %d"
+
+ #: src/libkeymap/loadkeys.c:70
+-#, fuzzy, c-format
++#, c-format
+ msgid "deallocate keymap %d"
+-msgstr "zwalnianie mapy klawiszy %d\n"
++msgstr "zwalnianie mapy klawiszy %d"
+
+ #: src/libkeymap/loadkeys.c:74
+-#, fuzzy, c-format
++#, c-format
+ msgid "KDSKBENT: %s: could not deallocate keymap %d"
+-msgstr "%s: nie uda�o si� zwolni� mapy klawiszy %d\n"
++msgstr "KDSKBENT: %s: nie uda�o si� zwolni� mapy klawiszy %d"
+
+ #: src/libkeymap/loadkeys.c:89
+-#, fuzzy, c-format
++#, c-format
+ msgid "KDSKBENT: %s: cannot deallocate or clear keymap"
+-msgstr "%s: nie uda�o si� zwolni� lub wyczy�ci� mapy klawiszy\n"
++msgstr "KDSKBENT: %s: nie uda�o si� zwolni� lub wyczy�ci� mapy klawiszy"
+
+ #: src/libkeymap/loadkeys.c:99
+-#, fuzzy, c-format
++#, c-format
+ msgid "KDSKBMODE: %s: could not return to original keyboard mode"
+-msgstr "%s: nie uda�o si� wr�ci� do pierwotnego trybu klawiatury\n"
++msgstr "KDSKBMODE: %s: nie uda�o si� wr�ci� do pierwotnego trybu klawiatury"
+
+ #: src/libkeymap/loadkeys.c:161
+-#, fuzzy, c-format
++#, c-format
+ msgid "failed to bind string '%s' to function %s"
+-msgstr "nie uda�o si� przypisa� �a�cucha '%s' do funkcji %s\n"
++msgstr "nie uda�o si� przypisa� �a�cucha '%s' do funkcji %s"
+
+ #: src/libkeymap/loadkeys.c:171
+-#, fuzzy, c-format
++#, c-format
+ msgid "failed to clear string %s"
+-msgstr "nie uda�o si� wyczy�ci� �a�cucha %s\n"
++msgstr "nie uda�o si� wyczy�ci� �a�cucha %s"
+
+ #: src/libkeymap/loadkeys.c:190
+-#, fuzzy
+ msgid "too many compose definitions"
+-msgstr "zbyt du�o definicji compose\n"
++msgstr "zbyt du�o definicji compose"
+
+ #: src/libkeymap/loadkeys.c:202 src/libkeymap/loadkeys.c:225
+-#, fuzzy
+ msgid "unable to get compose definitions"
+-msgstr "zbyt du�o definicji compose\n"
++msgstr "nie uda�o si� pobra� definicji compose"
+
+ # XXX: ngettext should be used for the following five messages
+ #: src/libkeymap/loadkeys.c:253
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "\n"
+ "Changed %d %s and %d %s"
+ msgstr ""
+ "\n"
+-"Zmienionych klawiszy: %d%s �a�cuch�w: %d%s\n"
++"Zmienionych klawiszy: %d%s �a�cuch�w: %d%s"
+
+ #: src/libkeymap/loadkeys.c:254
+ msgid "key"
+@@ -505,9 +500,9 @@
+
+ # XXX: ngettext should be used for the following three messages
+ #: src/libkeymap/loadkeys.c:263
+-#, fuzzy, c-format
++#, c-format
+ msgid "Loaded %d compose %s"
+-msgstr "Wczytanych definicji compose: %d%s\n"
++msgstr "Wczytanych definicji compose: %d%s"
+
+ #: src/libkeymap/loadkeys.c:264
+ msgid "definition"
+@@ -518,9 +513,8 @@
+ msgstr "."
+
+ #: src/libkeymap/loadkeys.c:267
+-#, fuzzy
+ msgid "(No change in compose definitions)"
+-msgstr "(Brak zmian w definicjach compose)\n"
++msgstr "(Brak zmian w definicjach compose)"
+
+ #: src/libkeymap/summary.c:93
+ #, c-format
+@@ -533,14 +527,14 @@
+ msgstr "maks. liczba akcji do przypisania klawiszowi: %d\n"
+
+ #: src/libkeymap/summary.c:97
+-#, fuzzy, c-format
++#, c-format
+ msgid "number of keymaps in actual use: %u\n"
+-msgstr "liczba aktualnie u�ywanych map klawiatury: %d\n"
++msgstr "liczba aktualnie u�ywanych map klawiatury: %u\n"
+
+ #: src/libkeymap/summary.c:100
+-#, fuzzy, c-format
++#, c-format
+ msgid "of which %u dynamically allocated\n"
+-msgstr "z kt�rych %d dynamicznie przydzielono\n"
++msgstr "z kt�rych %u przydzielono dynamicznie\n"
+
+ #: src/libkeymap/summary.c:103
+ #, c-format
+@@ -558,9 +552,9 @@
+ msgstr "maksymalna liczba definicji compose: %d\n"
+
+ #: src/libkeymap/summary.c:113
+-#, fuzzy, c-format
++#, c-format
+ msgid "nr of compose definitions in actual use: %u\n"
+-msgstr "liczba aktualnie u�ywanych definicji compose: %d\n"
++msgstr "liczba aktualnie u�ywanych definicji compose: %u\n"
+
+ #: src/libkeymap/summary.c:139
+ #, c-format
+@@ -588,7 +582,7 @@
+ "Rozpoznawane nazwy modyfikator�w i numery ich kolumn:\n"
+
+ #: src/loadkeys.c:35
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "loadkeys version %s\n"
+ "\n"
+@@ -611,7 +605,7 @@
+ msgstr ""
+ "loadkeys wersja %s\n"
+ "\n"
+-"Sk�adnia: loadkeys [opcja...] [plik_mapy...]\n"
++"Sk�adnia: %s [opcja...] [plik_mapy...]\n"
+ "\n"
+ "Poprawne opcje to:\n"
+ "\n"
+@@ -625,7 +619,7 @@
+ " -m --mktable wypisanie \"defkeymap.c\" na standardowe wyj�cie\n"
+ " -q --quiet pomini�cie zwyk�ych komunikat�w\n"
+ " -s --clearstrings wyczyszczenie tabeli �a�cuch�w w j�drze\n"
+-" -u --unicode wymuszenie konwersji do Unikodu\n"
++" -u --unicode wymuszenie konwersji do Unicode\n"
+ " -v --verbose informowanie o zmianach\n"
+
+ #: src/loadkeys.c:154 src/version.h:20
+@@ -694,7 +688,7 @@
+ #, c-format
+ msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n"
+ msgstr ""
+-"%s: B��dny przedzia� Unikodu odpowiadaj�cy przedzia�owi 0x%x-0x%x w foncie\n"
++"%s: B��dny przedzia� Unicode odpowiadaj�cy przedzia�owi 0x%x-0x%x w foncie\n"
+
+ #: src/loadunimap.c:238 src/psfxtable.c:182
+ #, c-format
+@@ -702,7 +696,7 @@
+ "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x"
+ "%x-0x%x\n"
+ msgstr ""
+-"%s: Przedzia� Unikodu U+%x-U+%x nie jest tej samej d�ugo�ci co 0x%x-0x%x w "
++"%s: Przedzia� Unicode U+%x-U+%x nie jest tej samej d�ugo�ci co 0x%x-0x%x w "
+ "foncie\n"
+
+ #: src/loadunimap.c:257 src/psfxtable.c:203
+@@ -1016,7 +1010,7 @@
+ msgid ""
+ "%s: Corresponding to a range of font positions, there should be a Unicode "
+ "range\n"
+-msgstr "%s: przedzia�owi w foncie powinien odpowiada� przedzia� Unikodu\n"
++msgstr "%s: przedzia�owi w foncie powinien odpowiada� przedzia� Unicode\n"
+
+ #: src/psfxtable.c:257
+ #, c-format
+@@ -1269,7 +1263,7 @@
+ #: src/setfont.c:378
+ #, c-format
+ msgid "Loading Unicode mapping table...\n"
+-msgstr "Wczytywanie tablicy odwzorowania Unikodu...\n"
++msgstr "Wczytywanie tablicy odwzorowania Unicode...\n"
+
+ #: src/setfont.c:414 src/setfont.c:501
+ #, c-format
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kbd.git/commitdiff/8d32414e01806feeb2672fc75c17be5941191687
More information about the pld-cvs-commit
mailing list