Skip to content

Commit

Permalink
v2.6.4
Browse files Browse the repository at this point in the history
libkeymap:
* More fixes to avoid looking for keymaps in the current directory.

build:
* Use `AX_ADD_FORTIFY_SOURCE` to avoid redefining `_FORTIFY_SOURCE`.

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
  • Loading branch information
legionus committed Dec 11, 2023
1 parent 9876986 commit d27e4a3
Show file tree
Hide file tree
Showing 24 changed files with 418 additions and 418 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_INIT([kbd],[2.6.3],[gladkov.alexey@gmail.com],[],[https://kbd-project.org/])
AC_INIT([kbd],[2.6.4],[gladkov.alexey@gmail.com],[],[https://kbd-project.org/])

AC_PREREQ([2.71])

Expand Down
36 changes: 18 additions & 18 deletions po/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kbd 2.6-rc1\n"
"Report-Msgid-Bugs-To: Alexey Gladkov <gladkov.alexey@gmail.com>\n"
"POT-Creation-Date: 2023-09-19 13:23+0200\n"
"POT-Creation-Date: 2023-12-11 13:31+0000\n"
"PO-Revision-Date: 2023-05-08 22:01+02:00\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
Expand Down Expand Up @@ -415,56 +415,56 @@ msgstr "%s z %s\n"
msgid "includes are nested too deeply"
msgstr "vložení jsou zanořena příliš hluboko"

#: src/libkeymap/analyze.l:161 src/libkeymap/analyze.l:263
#: src/libkeymap/analyze.l:357 src/libkeymap/common.c:135
#: src/libkeymap/analyze.l:160 src/libkeymap/analyze.l:262
#: src/libkeymap/analyze.l:356 src/libkeymap/common.c:135
#: src/libkeymap/diacr.c:48 src/libkeymap/diacr.c:67 src/libkeymap/func.c:52
#: src/libkeymap/kmap.c:61 src/libkeymap/kmap.c:69 src/libkeymap/loadkeys.c:135
#: src/screendump.c:76 src/screendump.c:79 src/screendump.c:121
#: src/screendump.c:151
msgid "out of memory"
msgstr "nedostatek paměti"

#: src/libkeymap/analyze.l:259
#: src/libkeymap/analyze.l:258
#, c-format
msgid "switching to %s"
msgstr "přepíná se do %s"

#: src/libkeymap/analyze.l:269
#: src/libkeymap/analyze.l:268
#, c-format
msgid "cannot open include file %s"
msgstr "nelze otevřít vkládaný soubor %s"

#: src/libkeymap/analyze.l:291
#: src/libkeymap/analyze.l:290
#, c-format
msgid "unable to parse number: %s"
msgstr "číslo nelze rozebrat: %s"

#: src/libkeymap/analyze.l:296
#: src/libkeymap/analyze.l:295
#, c-format
msgid "value must be a positive number: %s"
msgstr "hodnota musí být kladné číslo: %s"

#: src/libkeymap/analyze.l:301
#: src/libkeymap/analyze.l:300
#, c-format
msgid "value must be less than %d: %s"
msgstr "hodnota musí být menší než %d: %s"

#: src/libkeymap/analyze.l:369
#: src/libkeymap/analyze.l:368
msgid "expected filename between quotes"
msgstr "název souboru očekáván mezi uvozovkami"

#: src/libkeymap/analyze.l:408
#: src/libkeymap/analyze.l:407
#, c-format
msgid "unicode keysym out of range: %s"
msgstr "unikódový symbol adresy je mimo rozsah: %s"

#: src/libkeymap/analyze.l:468 src/libkeymap/analyze.l:492
#: src/libkeymap/analyze.l:499 src/libkeymap/analyze.l:506
#: src/libkeymap/analyze.l:515
#: src/libkeymap/analyze.l:467 src/libkeymap/analyze.l:491
#: src/libkeymap/analyze.l:498 src/libkeymap/analyze.l:505
#: src/libkeymap/analyze.l:514
msgid "string too long"
msgstr "řetězec je příliš dlouhý"

#: src/libkeymap/analyze.l:484
#: src/libkeymap/analyze.l:483
msgid "octal number too big"
msgstr "osmičkové číslo je příliš veliké"

Expand Down Expand Up @@ -809,11 +809,11 @@ msgstr "%s: Špatný konec rozsahu (0x%x)\n"
#: src/libkfont/loadunimap.c:213
#, c-format
msgid ""
"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x"
"%x-0x%x"
"%s: Unicode range U+%x-U+%x not of the same length as font position range "
"0x%x-0x%x"
msgstr ""
"%s: Rozsah Unicode U+%x-U+%x není stejné délky jako rozsah pozic písma 0x"
"%x-0x%x"
"%s: Rozsah Unicode U+%x-U+%x není stejné délky jako rozsah pozic písma "
"0x%x-0x%x"

#: src/libkfont/loadunimap.c:238
#, c-format
Expand Down
36 changes: 18 additions & 18 deletions po/da.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kbd-1.15.3-rc1\n"
"Report-Msgid-Bugs-To: Alexey Gladkov <gladkov.alexey@gmail.com>\n"
"POT-Creation-Date: 2023-09-19 13:23+0200\n"
"POT-Creation-Date: 2023-12-11 13:31+0000\n"
"PO-Revision-Date: 2011-06-03 22:01+0200\n"
"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
Expand Down Expand Up @@ -418,8 +418,8 @@ msgstr "%s fra %s\n"
msgid "includes are nested too deeply"
msgstr "includes er i for dybe nveauer"

#: src/libkeymap/analyze.l:161 src/libkeymap/analyze.l:263
#: src/libkeymap/analyze.l:357 src/libkeymap/common.c:135
#: src/libkeymap/analyze.l:160 src/libkeymap/analyze.l:262
#: src/libkeymap/analyze.l:356 src/libkeymap/common.c:135
#: src/libkeymap/diacr.c:48 src/libkeymap/diacr.c:67 src/libkeymap/func.c:52
#: src/libkeymap/kmap.c:61 src/libkeymap/kmap.c:69 src/libkeymap/loadkeys.c:135
#: src/screendump.c:76 src/screendump.c:79 src/screendump.c:121
Expand All @@ -428,47 +428,47 @@ msgstr "includes er i for dybe nveauer"
msgid "out of memory"
msgstr "%s: hukommelsen slut\n"

#: src/libkeymap/analyze.l:259
#: src/libkeymap/analyze.l:258
#, fuzzy, c-format
msgid "switching to %s"
msgstr "skifter til %s\n"

#: src/libkeymap/analyze.l:269
#: src/libkeymap/analyze.l:268
#, c-format
msgid "cannot open include file %s"
msgstr "Kan ikke åbne inkluderingsfilen %s"

#: src/libkeymap/analyze.l:291
#: src/libkeymap/analyze.l:290
#, fuzzy, c-format
msgid "unable to parse number: %s"
msgstr "Kan ikke åbne %s"

#: src/libkeymap/analyze.l:296
#: src/libkeymap/analyze.l:295
#, c-format
msgid "value must be a positive number: %s"
msgstr ""

#: src/libkeymap/analyze.l:301
#: src/libkeymap/analyze.l:300
#, c-format
msgid "value must be less than %d: %s"
msgstr ""

#: src/libkeymap/analyze.l:369
#: src/libkeymap/analyze.l:368
msgid "expected filename between quotes"
msgstr "forventede filnavn i anførselstegn"

#: src/libkeymap/analyze.l:408
#: src/libkeymap/analyze.l:407
#, c-format
msgid "unicode keysym out of range: %s"
msgstr "UCS keysym uden for område: %s"

#: src/libkeymap/analyze.l:468 src/libkeymap/analyze.l:492
#: src/libkeymap/analyze.l:499 src/libkeymap/analyze.l:506
#: src/libkeymap/analyze.l:515
#: src/libkeymap/analyze.l:467 src/libkeymap/analyze.l:491
#: src/libkeymap/analyze.l:498 src/libkeymap/analyze.l:505
#: src/libkeymap/analyze.l:514
msgid "string too long"
msgstr "strengen er for lang"

#: src/libkeymap/analyze.l:484
#: src/libkeymap/analyze.l:483
msgid "octal number too big"
msgstr ""

Expand Down Expand Up @@ -810,8 +810,8 @@ msgstr "%s: Fejlagtigt slut p
#: src/libkfont/loadunimap.c:213
#, fuzzy, c-format
msgid ""
"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x"
"%x-0x%x"
"%s: Unicode range U+%x-U+%x not of the same length as font position range "
"0x%x-0x%x"
msgstr ""
"%s: UCS-interval U+%x-U+%x er ikke af samme længde som "
"skrifttypespositionsinterval 0x%x-0x%x\n"
Expand Down Expand Up @@ -2187,8 +2187,8 @@ msgstr "%s: VT 1 er konsollen og kan ikke deallokeres\n"
#~ msgid ""
#~ "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n"
#~ msgstr ""
#~ "%s: Fejlagtigt UCS-interval som modsvarer skrifttypepositionsinterval 0x"
#~ "%x-0x%x\n"
#~ "%s: Fejlagtigt UCS-interval som modsvarer skrifttypepositionsinterval "
#~ "0x%x-0x%x\n"

#~ msgid "%s: %s: Warning: line too long\n"
#~ msgstr "%s: %s: Advarsel: linjen er for lang\n"
Expand Down
32 changes: 16 additions & 16 deletions po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kbd-2.6-rc1\n"
"Report-Msgid-Bugs-To: Alexey Gladkov <gladkov.alexey@gmail.com>\n"
"POT-Creation-Date: 2023-09-19 13:23+0200\n"
"POT-Creation-Date: 2023-12-11 13:31+0000\n"
"PO-Revision-Date: 2023-05-08 18:33+0200\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
Expand Down Expand Up @@ -434,56 +434,56 @@ msgstr "%s von %s\n"
msgid "includes are nested too deeply"
msgstr "Include-Dateien zu tief verschachtelt."

#: src/libkeymap/analyze.l:161 src/libkeymap/analyze.l:263
#: src/libkeymap/analyze.l:357 src/libkeymap/common.c:135
#: src/libkeymap/analyze.l:160 src/libkeymap/analyze.l:262
#: src/libkeymap/analyze.l:356 src/libkeymap/common.c:135
#: src/libkeymap/diacr.c:48 src/libkeymap/diacr.c:67 src/libkeymap/func.c:52
#: src/libkeymap/kmap.c:61 src/libkeymap/kmap.c:69 src/libkeymap/loadkeys.c:135
#: src/screendump.c:76 src/screendump.c:79 src/screendump.c:121
#: src/screendump.c:151
msgid "out of memory"
msgstr "Arbeitsspeicher erschöpft"

#: src/libkeymap/analyze.l:259
#: src/libkeymap/analyze.l:258
#, c-format
msgid "switching to %s"
msgstr "Zu %s wird gewechselt"

#: src/libkeymap/analyze.l:269
#: src/libkeymap/analyze.l:268
#, c-format
msgid "cannot open include file %s"
msgstr "Kann Include-Datei %s nicht öffnen."

#: src/libkeymap/analyze.l:291
#: src/libkeymap/analyze.l:290
#, c-format
msgid "unable to parse number: %s"
msgstr "Zahl kann nicht ausgewertet werden: %s"

#: src/libkeymap/analyze.l:296
#: src/libkeymap/analyze.l:295
#, c-format
msgid "value must be a positive number: %s"
msgstr "Wert muss eine positive Zahl sein: %s"

#: src/libkeymap/analyze.l:301
#: src/libkeymap/analyze.l:300
#, c-format
msgid "value must be less than %d: %s"
msgstr "Wert muss kleiner als %d sein: %s"

#: src/libkeymap/analyze.l:369
#: src/libkeymap/analyze.l:368
msgid "expected filename between quotes"
msgstr "Dateiname zwischen Anführungszeichen erwartet"

#: src/libkeymap/analyze.l:408
#: src/libkeymap/analyze.l:407
#, c-format
msgid "unicode keysym out of range: %s"
msgstr "Unicode-Tastensymbol nicht im zulässigen Bereich: %s"

#: src/libkeymap/analyze.l:468 src/libkeymap/analyze.l:492
#: src/libkeymap/analyze.l:499 src/libkeymap/analyze.l:506
#: src/libkeymap/analyze.l:515
#: src/libkeymap/analyze.l:467 src/libkeymap/analyze.l:491
#: src/libkeymap/analyze.l:498 src/libkeymap/analyze.l:505
#: src/libkeymap/analyze.l:514
msgid "string too long"
msgstr "String zu lang"

#: src/libkeymap/analyze.l:484
#: src/libkeymap/analyze.l:483
msgid "octal number too big"
msgstr "Oktalzahl ist zu groß"

Expand Down Expand Up @@ -830,8 +830,8 @@ msgstr "%s: Ungültiges Bereichsende (0x%x).\n"
#: src/libkfont/loadunimap.c:213
#, c-format
msgid ""
"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x"
"%x-0x%x"
"%s: Unicode range U+%x-U+%x not of the same length as font position range "
"0x%x-0x%x"
msgstr ""
"%s: Der Unicode-Bereich U+%x-U+%x ist nicht gleich lang wie der Font-Bereich "
"0x%x-0x%x"
Expand Down
32 changes: 16 additions & 16 deletions po/el.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kbd-2.6-rc1\n"
"Report-Msgid-Bugs-To: Alexey Gladkov <gladkov.alexey@gmail.com>\n"
"POT-Creation-Date: 2023-09-19 13:23+0200\n"
"POT-Creation-Date: 2023-12-11 13:31+0000\n"
"PO-Revision-Date: 2023-05-09 19:15+0300\n"
"Last-Translator: Lefteris Dimitroulakis <ledimitro@gmail.com>\n"
"Language-Team: Greek <team@lists.gnome.gr>\n"
Expand Down Expand Up @@ -421,56 +421,56 @@ msgstr "%s από %s\n"
msgid "includes are nested too deeply"
msgstr "includes πάρα πολύ βαθιά φωλιασμένες"

#: src/libkeymap/analyze.l:161 src/libkeymap/analyze.l:263
#: src/libkeymap/analyze.l:357 src/libkeymap/common.c:135
#: src/libkeymap/analyze.l:160 src/libkeymap/analyze.l:262
#: src/libkeymap/analyze.l:356 src/libkeymap/common.c:135
#: src/libkeymap/diacr.c:48 src/libkeymap/diacr.c:67 src/libkeymap/func.c:52
#: src/libkeymap/kmap.c:61 src/libkeymap/kmap.c:69 src/libkeymap/loadkeys.c:135
#: src/screendump.c:76 src/screendump.c:79 src/screendump.c:121
#: src/screendump.c:151
msgid "out of memory"
msgstr "εξάντληση μνήμης"

#: src/libkeymap/analyze.l:259
#: src/libkeymap/analyze.l:258
#, c-format
msgid "switching to %s"
msgstr "αλλαγή σε %s"

#: src/libkeymap/analyze.l:269
#: src/libkeymap/analyze.l:268
#, c-format
msgid "cannot open include file %s"
msgstr "αδυνατώ ν' ανοίξω το αρχείο include %s"

#: src/libkeymap/analyze.l:291
#: src/libkeymap/analyze.l:290
#, c-format
msgid "unable to parse number: %s"
msgstr "αδυναμία ανάλυσης του αριθμού: %s"

#: src/libkeymap/analyze.l:296
#: src/libkeymap/analyze.l:295
#, c-format
msgid "value must be a positive number: %s"
msgstr "η τιμή πρέι να είναι ένας θετικός αριθμός: %s"

#: src/libkeymap/analyze.l:301
#: src/libkeymap/analyze.l:300
#, c-format
msgid "value must be less than %d: %s"
msgstr "η τιμή πρέπει να είναι μικρότερη από %d: %s"

#: src/libkeymap/analyze.l:369
#: src/libkeymap/analyze.l:368
msgid "expected filename between quotes"
msgstr "αναμενόταν αρχείο ανάμεσα σε εισαγωγικά"

#: src/libkeymap/analyze.l:408
#: src/libkeymap/analyze.l:407
#, c-format
msgid "unicode keysym out of range: %s"
msgstr "unicode keysym εκτός περιοχής: %s"

#: src/libkeymap/analyze.l:468 src/libkeymap/analyze.l:492
#: src/libkeymap/analyze.l:499 src/libkeymap/analyze.l:506
#: src/libkeymap/analyze.l:515
#: src/libkeymap/analyze.l:467 src/libkeymap/analyze.l:491
#: src/libkeymap/analyze.l:498 src/libkeymap/analyze.l:505
#: src/libkeymap/analyze.l:514
msgid "string too long"
msgstr "συμβολοσειρά πολύ μεγάλη"

#: src/libkeymap/analyze.l:484
#: src/libkeymap/analyze.l:483
msgid "octal number too big"
msgstr "οκταδικός αριθμός πάρα πολύ μεγάλος"

Expand Down Expand Up @@ -810,8 +810,8 @@ msgstr "%s: Εσφαλμένο πέρας περιοχής (0x%x)\n"
#: src/libkfont/loadunimap.c:213
#, c-format
msgid ""
"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x"
"%x-0x%x"
"%s: Unicode range U+%x-U+%x not of the same length as font position range "
"0x%x-0x%x"
msgstr ""
"%s: περιοχή Unicode U+%x-U+%x όχι του ιδίου μήκους με την περιοχή θέσεων 0x "
"%x-0x%x της γραμματοσειράς"
Expand Down
Loading

0 comments on commit d27e4a3

Please sign in to comment.