--- src/ydpdict.c	2013-01-08 00:14:03.000000000 +0100
+++ src/ydpdict.c	2015-04-02 04:17:47.722162971 +0200
@@ -118,71 +118,71 @@
 
 const char *qualifiers[][2] =
 {
-	{ "abbr", N_("abbreviation") },
-	{ "acc", N_("accusative") },
-	{ "adj", N_("adjective") },
-	{ "adv", N_("adverb") },
-	{ "art", N_("article") },
-	{ "attr", N_("attribute") },
-	{ "aux", N_("auxiliary") },
-	{ "comp", N_("comparative degree") },
-	{ "compl.", N_("complement") },
-	{ "conj", N_("conjunction") },
-	{ "cpd", N_("compound") },
-	{ "dat", N_("dative") },
-	{ "def", N_("definite") },
-	{ "decl", N_("declined") },
-	{ "dimin", N_("diminutive") },
-	{ "excl", N_("exclamation") },
-	{ "f", N_("feminine") },
-	{ "fig", N_("figurative") },
-	{ "fml", N_("formal") },
-	{ "fus", N_("fused") },
-	{ "gen", N_("genitive") },
-	{ "imp", N_("imperfective") },
-	{ "imperf", N_("imperfective") },
-	{ "impers", N_("impersonal") },
-	{ "indef", N_("indefinite") },
-	{ "inf", N_("informal") },
-	{ "infin", N_("infinitive") },
-	{ "instr", N_("instrumental") },
-	{ "inv", N_("invariable") },
-	{ "irreg", N_("irregular") },
-	{ "ksi", N_("literary") },
-	{ "liter.", N_("literary") },
-	{ "loc", N_("locative") },
-	{ "m", N_("masculine") },
-	{ "modal", N_("modal") },
-	{ "n", N_("noun") },
-	{ "nom", N_("nominative") },
-	{ "npl", N_("noun plural") },
-	{ "nt", N_("neuter") },
-	{ "num", N_("numeral") },
-	{ "nvir", N_("non-virile gender") },
-	{ "old", N_("old") },
-	{ "part", N_("particle") },
-	{ "pej", N_("pejorative") },
-	{ "perf", N_("perfective") },
-	{ "pl", N_("plural") },
-	{ "polite", N_("polite") },
-	{ "poss.", N_("possesive") },
-	{ "post", N_("postposition") },
-	{ "pot", N_("informal") },
-	{ "pp", N_("past participle") },
-	{ "pref", N_("prefix") },
-	{ "pred", N_("predicate") },
-	{ "prep", N_("preposition") },
-	{ "pron", N_("pronoun") },
-	{ "pt", N_("past simple") },
-	{ "sg", N_("singular") },
-	{ "suff", N_("suffix") },
-	{ "superl", N_("superlative degree") },
-	{ "vb", N_("verb") },
-	{ "vi", N_("intransitive verb") },
-	{ "vir", N_("virile gender") },
-	{ "voc", N_("vocative") },
-	{ "vr", N_("reflexive verb") },
-	{ "vt", N_("transitive verb") },
+	{ "abbr", N_("  abbreviation       (skrót)") },
+	{ "acc", N_("   accusative         (biernik)") },
+	{ "adj", N_("   adjective          (przymiotnik)") },
+	{ "adv", N_("   adverb             (przysłówek)") },
+	{ "art", N_("   article            (przedimek)") },
+	{ "attr", N_("  attribute          (przydawka)") },
+	{ "aux", N_("   auxiliary          (posiłkowy)") },
+	{ "comp", N_("  comparative degree (stopień wyższy)") },
+	{ "compl.", N_("complement         (dopełnienie)") },
+	{ "conj", N_("  conjunction        (spójnik)") },
+	{ "cpd", N_("   compound           (złożony)") },
+	{ "dat", N_("   dative             (celownik)") },
+	{ "def", N_("   definite           (określony)") },
+	{ "decl", N_("  declined           (odmieniany)") },
+	{ "dimin", N_(" diminutive         (zdrobnienie)") },
+	{ "excl", N_("  exclamation        (wykrzyknik)") },
+	{ "f", N_("     feminine           (rodzaj żeński)") },
+	{ "fig", N_("   figurative         (przenośny)") },
+	{ "fml", N_("   formal             (oficjalny)") },
+	{ "fus", N_("   fused              (złożony)") },
+	{ "gen", N_("   genitive           (dopełniacz)") },
+	{ "imp", N_("   imperfective       (niedokonany)") },
+	{ "imperf", N_("imperfective       (niedokonany)") },
+	{ "impers", N_("impersonal         (bezosobowy)") },
+	{ "indef", N_(" indefinite         (nieokreślony)") },
+	{ "inf", N_("   informal           (potoczny)") },
+	{ "infin", N_(" infinitive         (bezokolicznik)") },
+	{ "instr", N_(" instrumental       (narzędnik)") },
+	{ "inv", N_("   invariable         (nieodmienny)") },
+	{ "irreg", N_(" irregular          (nieregularny)") },
+	{ "ksi", N_("   literary           (książkowy)") },
+	{ "liter.", N_("literary           (książkowy)") },
+	{ "loc", N_("   locative           (miejscownik)") },
+	{ "m", N_("     masculine          (rodzaj męski)") },
+	{ "modal", N_(" modal              (modalny)") },
+	{ "n", N_("     noun               (rzeczownik)") },
+	{ "nom", N_("   nominative         (mianownik)") },
+	{ "npl", N_("   noun plural        (rzeczownik mnogi)") },
+	{ "nt", N_("    neuter             (rodzaj nijaki)") },
+	{ "num", N_("   numeral            (liczebnik)") },
+	{ "nvir", N_("  non-virile gender  (rodzaj niemęskoosobowy)") },
+	{ "old", N_("   old                (dawny)") },
+	{ "part", N_("  particle           (partykuła)") },
+	{ "pej", N_("   pejorative         (pejoratywny)") },
+	{ "perf", N_("  perfective         (dokonany)") },
+	{ "pl", N_("    plural             (liczba mnoga)") },
+	{ "polite", N_("polite             (uprzejmy)") },
+	{ "poss.", N_(" possessive         (dzierżawczy)") },
+	{ "post", N_("  postposition       (postpozycja)") },
+	{ "pot", N_("   informal           (potoczny)") },
+	{ "pp", N_("    past participle    (imiesłów bierny)") },
+	{ "pref", N_("  prefix             (przedrostek)") },
+	{ "pred", N_("  predicate          (orzeczenie)") },
+	{ "prep", N_("  preposition        (przyimek)") },
+	{ "pron", N_("  pronoun            (zaimek)") },
+	{ "pt", N_("    past simple        (czas przeszły prosty)") },
+	{ "sg", N_("    singular           (liczba pojedyncza)") },
+	{ "suff", N_("  suffix             (przyrostek)") },
+	{ "superl", N_("superlative degree (stopień najwyższy)") },
+	{ "vb", N_("    verb               (czasownik)") },
+	{ "vi", N_("    intransitive verb  (czsownik nieprzechodni)") },
+	{ "vir", N_("   virile gender      (rodzaj męskoosobowy)") },
+	{ "voc", N_("   vocative           (wołacz)") },
+	{ "vr", N_("    reflexive verb     (czasownik zwrotny)") },
+	{ "vt", N_("    transitive verb    (czasownik przechodni)") },
 };
 
 const char *qualifiers_format = "{\\line{\\cf2 %s} {%s}}";
@@ -986,9 +986,9 @@
 
 			case 27: /* ESC */
 				if (focus == 2) {
-					focus = saved_focus;
+					focus = 0;
 					def_update = 1;
-					def_index = def_saved_index;
+					def_index = 0;
 				} else if (focus == 1) {
 					focus = 0;
 				} else {