[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#934826: buster-pu: package console-setup/1.193~deb10u1



Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I'd like to get #924657 fixed in buster. A Perl change triggered a bunch
of brokenness in translations, and I haven't been able to review the fix
before the release. I've done that now, as documented in:
  https://bugs.debian.org/924657#49

Since I've double checked this, 1.193 was uploaded with a few translation
updates and it seems to make sense to include them as well, hence this
proposed 1.193~deb10u1.

Changes from 1.191:
| console-setup (1.193~deb10u1) buster; urgency=medium
| 
|   * Rebuild for buster.
| 
|  -- Cyril Brulebois <kibi@debian.org>  Thu, 15 Aug 2019 16:11:30 > 0200
| 
| console-setup (1.193) unstable; urgency=medium
| 
|   * Team upload
| 
|   [ Updated translations ]
|   * Croatian (hr.po) by gogogogi
|   * Tajik (tg.po) by Victor Ibragimov
| 
|  -- Holger Wansing <hwansing@mailbox.org>  Sun, 04 Aug 2019 12:08:32 > 0200
| 
| console-setup (1.192) unstable; urgency=medium
| 
|   * Remove Christian Perrier from Uploaders, with many thanks for all
|     his contributions over the years! (Closes: #927511)
|   * Merge patch by Iain Lane to fix internationalization issues when
|     switching locales with Perl >= 5.28 (Closes: #924657, LP: #1817453).
| 
|  -- Cyril Brulebois <kibi@debian.org>  Thu, 04 Jul 2019 17:41:47 > 0200

git diff from the tag attached.


Thanks for considering, and thanks for your time.


Cheers,
-- 
Cyril Brulebois (kibi@debian.org)            <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant
diff --git a/Keyboard/kbdnames-maker b/Keyboard/kbdnames-maker
index 9d66731..56d42d8 100755
--- a/Keyboard/kbdnames-maker
+++ b/Keyboard/kbdnames-maker
@@ -39,6 +39,8 @@ for my $mo (</usr/share/locale/*/LC_MESSAGES/xkeyboard-config.mo>) {
     $lang =~ s:/usr/share/locale/(.*)/LC_MESSAGES/xkeyboard-config.mo:$1:;
     $ENV{'LANGUAGE'} = $lang;
     setlocale(LC_ALL,"");
+    bindtextdomain("xkeyboard-config", "/usr/share/locale");
+    textdomain("xkeyboard-config");
 
     $lang =~ s:\@:__:;
     $lang =~ s:__Latn:__latin:; # special fixup for sr
diff --git a/debian/changelog b/debian/changelog
index 2b8cf2d..afd1c0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,24 @@
+console-setup (1.193) unstable; urgency=medium
+
+  * Team upload
+
+  [ Updated translations ]
+  * Croatian (hr.po) by gogogogi
+  * Tajik (tg.po) by Victor Ibragimov
+
+ -- Holger Wansing <hwansing@mailbox.org>  Sun, 04 Aug 2019 12:08:32 +0200
+
+console-setup (1.192) unstable; urgency=medium
+
+  * Remove Christian Perrier from Uploaders, with many thanks for all
+    his contributions over the years! (Closes: #927511)
+  * Merge patch by Iain Lane to fix internationalization issues when
+    switching locales with Perl >= 5.28 (Closes: #924657, LP: #1817453).
+
+ -- Cyril Brulebois <kibi@debian.org>  Thu, 04 Jul 2019 17:41:47 +0200
+
 console-setup (1.191) unstable; urgency=medium
+
   * Team upload
 
   [ Updated translations ]
@@ -8,6 +28,7 @@ console-setup (1.191) unstable; urgency=medium
  -- Holger Wansing <hwansing@mailbox.org>  Sat, 23 Mar 2019 21:13:24 +0100
 
 console-setup (1.190) unstable; urgency=medium
+
   * Team upload
 
   * console-setup(5) manpage: correct section of setfont manpage and remove
@@ -20,6 +41,7 @@ console-setup (1.190) unstable; urgency=medium
  -- Holger Wansing <hwansing@mailbox.org>  Mon, 04 Mar 2019 04:44:51 +0100
 
 console-setup (1.189) unstable; urgency=medium
+
   * Team upload
 
   [ Holger Wansing ]
diff --git a/debian/control b/debian/control
index ceba9df..b8e69f0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: console-setup
 Section: utils
 Priority: optional
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Anton Zinoviev <zinoviev@debian.org>, Christian Perrier <bubulle@debian.org>
+Uploaders: Anton Zinoviev <zinoviev@debian.org>
 Build-Depends-Indep: xkb-data (>= 1.6), locales-all, sharutils
 Build-Depends: perl, debhelper (>= 9), po-debconf, libxml-parser-perl, bdfresize, liblocale-gettext-perl, dh-systemd
 Standards-Version: 3.9.1
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 9c70c7f..99ffd82 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -11,6 +11,7 @@
 # Abdelhak Bougouffa, 2017.
 # najib LAARIBI <supnano@gmail.com>, 2018.
 # ButterflyOfFire <ButterflyOfFire@protonmail.com>, 2018.
+# Osama <osama.ibrahim.89@gmail.com>, 2019.
 #
 # Translations from iso-codes:
 #     Translations taken from ICU SVN on 2007-09-09
@@ -27,7 +28,7 @@ msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: console-setup@packages.debian.org\n"
 "POT-Creation-Date: 2018-03-10 23:15+0100\n"
-"PO-Revision-Date: 2018-10-05 16:21+0000\n"
+"PO-Revision-Date: 2019-06-10 10:55+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language-Team: \n"
 "Language: ar\n"
@@ -169,14 +170,15 @@ msgstr "# Latin2 - وسط أوروبا والرومانية"
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Latin3 and Latin8 - Chichewa; Esperanto; Irish; Maltese and Welsh"
-msgstr "# Latin3 و Latin8 - تشيتشيوا; إسبترنتو; الآيرلندية; المالتيز والولش"
+msgstr ""
+"# Latin3 و Latin8 - تشيتشيوا ؛ الإسبترنتو ؛ الإيرلندية ؛ المالتيز والولش"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Latin7 - Lithuanian; Latvian; Maori and Marshallese"
-msgstr "# Latin7 - الليتوانية; اللاتفية; الماوري والمارشاليز"
+msgstr "# Latin7 - الليتوانية ؛ اللاتفية ؛ الماوري والمارشاليز"
 
 #. Type: select
 #. Choices
@@ -190,28 +192,28 @@ msgstr ". اللاتينية - الفيتنامية"
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Thai"
-msgstr "# التاي"
+msgstr "# التايلندية"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Combined - Latin; Slavic Cyrillic; Hebrew; basic Arabic"
-msgstr ". مركّبة - اللاتينية; السلافية السيريلية; العبرية; العربية الأساسية"
+msgstr ". مركّبة - اللاتينية ؛ السلافية السيريلية ؛ العبرية ؛ العربية الأساسية"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Combined - Latin; Slavic Cyrillic; Greek"
-msgstr ". مركّبة - اللاتينية; السلافية السيريلية; اليونانية"
+msgstr ". مركّبة - اللاتينية ؛ السلافية السيريلية ؛ اليونانية"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Combined - Latin; Slavic and non-Slavic Cyrillic"
-msgstr ". مركّبة - اللاتينية; السيريلية السلافية والغير سلافية"
+msgstr ". مركّبة - اللاتينية ؛ السيريلية السلافية وغير السلافية"
 
 #. Type: select
 #. Choices
@@ -306,7 +308,7 @@ msgid ""
 "Please select the size of the font for the console. For reference, the font "
 "used when the computer boots has size 8x16."
 msgstr ""
-"يرجى إختيار حجم الخط للطرفية. للعلم، الخط المستخدم عند إقلاع الحاسب مقاسه "
+"يرجى اختيار حجم الخط للطرفية. للعلم، الخط المستخدم عند إقلاع الحاسب مقاسه "
 "8×16."
 
 #. Type: select
@@ -426,7 +428,7 @@ msgstr ""
 #. :sl3:
 #: ../keyboard-configuration.templates:8001
 msgid "Keep default keyboard layout (${XKBLAYOUTVARIANT})?"
-msgstr "هل تريد إبقاء مخطط لوحة المفاتيح الإفتراضية (${XKBLAYOUTVARIANT})?"
+msgstr "هل تريد إبقاء مخطط لوحة المفاتيح الافتراضية (${XKBLAYOUTVARIANT})?"
 
 #. Type: boolean
 #. Description
@@ -437,7 +439,7 @@ msgid ""
 "XKBVARIANT=\"${XKBVARIANT}\".  This default value is based on the currently "
 "defined language/region and the settings in /etc/X11/xorg.conf."
 msgstr ""
-"القيمة الإفتراضية لمخطط لوحة المفاتيح هو XKBLAYOUT=\"${XKBLAYOUT}\" و "
+"القيمة الافتراضية لمخطط لوحة المفاتيح هو XKBLAYOUT=\"${XKBLAYOUT}\" و "
 "XKBVARIANT=\"${XKBVARIANT}\".  هذه القيمة محددة وفقاً للغة الدولة/المنطقة "
 "والإعدادات في /etc/X11/xorg.conf."
 
@@ -485,7 +487,7 @@ msgstr ""
 #. :sl3:
 #: ../keyboard-configuration.templates:10001
 msgid "Keep default keyboard options (${XKBOPTIONS})?"
-msgstr "هل تريد إبقاء خيارات لوحة المفاتيح الإفتراضية (${XKBOPTIONS})؟"
+msgstr "هل تريد إبقاء خيارات لوحة المفاتيح الافتراضية (${XKBOPTIONS})؟"
 
 #. Type: boolean
 #. Description
@@ -697,7 +699,7 @@ msgstr "بدول تبديل"
 #. :sl1:
 #: ../keyboard-configuration.templates:11002
 msgid "Method for toggling between national and Latin mode:"
-msgstr "طريقة التبديل بين وضع المحلي واللاتيني:"
+msgstr "طريقة التبديل بين الوضع المحلي واللاتيني:"
 
 #. Type: select
 #. Description
@@ -720,10 +722,10 @@ msgid ""
 "+Shift is also a popular combination; it will however lose its usual "
 "behavior in Emacs and other programs that use it for specific needs."
 msgstr ""
-"زر Alt الأيمن أو Caps Lock عادة تستخدم لأسباب راحة المستخدم (وفي حالةاستخدام "
-"Caps Lock للتبديل، اضغط Shift+Caps Lock للتبديل بين الحروف الصغيرة "
-"والكبيرة). كما يشيع استخدام زري Alt+Shift، إلا أنها قد لا تتوفر فيإيماكس "
-"وبرامج أخرى تستخدمها لأغراض معيّنة."
+"زر Alt الأيمن أو Caps Lock عادة تستخدم لأسباب راحة المستخدم (وفي حالة "
+"استخدام Caps Lock للتبديل، اضغط Shift+Caps Lock للتبديل بين الحروف الصغيرة "
+"والكبيرة). كما يشيع استخدام زرّي Alt+Shift، إلا أنها قد تفقد سلوكها المعتاد "
+"في إيماكس وفي البرامج الأخرى التي تستخدمها لأغراض معيّنة."
 
 #. Type: select
 #. Description
@@ -884,8 +886,8 @@ msgid ""
 "By default the combination Control+Alt+Backspace does nothing.  If you want "
 "it can be used to terminate the X server."
 msgstr ""
-"بطبيعة الحال لا يؤثر استخدام Control+Alt+Backspace بأي شيء. إن كنت تريديمكنك "
-"استخدامه لإيقاف خادم X."
+"بطبيعة الحال لا يؤثر استخدام Control+Alt+Backspace بأي شيء. إن كنت تريد "
+"يمكنك استخدامه لإيقاف خادم X."
 
 # console-keymaps-acorn, American
 #. Type: select
diff --git a/debian/po/hr.po b/debian/po/hr.po
index f509767..c8a35a7 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -23,29 +23,29 @@ msgstr ""
 "Project-Id-Version: Debian-installer 1st-stage master file HR\n"
 "Report-Msgid-Bugs-To: console-setup@packages.debian.org\n"
 "POT-Creation-Date: 2018-03-10 23:15+0100\n"
-"PO-Revision-Date: 2018-09-18 12:44+0200\n"
-"Last-Translator: Valentin Vidic <Valentin.Vidic@CARNet.hr>\n"
+"PO-Revision-Date: 2019-07-04 17:02+0000\n"
+"Last-Translator: gogogogi <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. Type: text
 #. Description
 #. :sl3:
 #: ../console-setup.templates:2001
 msgid "Do not change the boot/kernel font"
-msgstr "Ne mijenjaj boot/kernel font"
+msgstr "Ne mijenjaj slova pokretanja/kernela"
 
 #. Type: text
 #. Description
 #. :sl3:
 #: ../console-setup.templates:3001
 msgid "Let the system select a suitable font"
-msgstr "Prepusti izbor prikladnog fonta sustavu"
+msgstr "Prepusti odabir prikladnih slova sustavu"
 
 #. Type: text
 #. Description
@@ -53,175 +53,177 @@ msgstr "Prepusti izbor prikladnog fonta sustavu"
 #. :sl3:
 #: ../console-setup.templates:4001
 msgid "framebuffer only"
-msgstr "samo 'framebuffer'"
+msgstr "samo okvirni međuspremnik"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Arabic"
-msgstr ". arapski"
+msgstr ". Aapski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Armenian"
-msgstr "# armenski"
+msgstr "# Armenski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Cyrillic - KOI8-R and KOI8-U"
-msgstr "# ćirilica - KOI8-R i KOI8-U"
+msgstr "# Ćirilica - KOI8-R i KOI8-U"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Cyrillic - non-Slavic languages"
-msgstr "# ćirilica - neslavenski jezici"
+msgstr "# Ćirilica - neslavenski jezici"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Cyrillic - non-Slavic languages (for blind users)"
-msgstr ". ćirilica - neslavenski jezici (za slijepe)"
+msgstr ". Ćirilica - neslavenski jezici (za slijepe korisnike)"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Cyrillic - Slavic languages (also Bosnian and Serbian Latin)"
-msgstr "# ćirilica - slavenski jezici (uklj. bosanski i srpski latinični)"
+msgstr "# Ćirilica - slavenski jezici (uklj. bosanska i srpska latinica)"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Cyrillic - Slavic languages (for blind users)"
-msgstr ". ćirilica - slavenski jezici (za slijepe)"
+msgstr ". Ćirilica - slavenski jezici (za slijepe korisnike)"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Ethiopic"
-msgstr ". etiopski"
+msgstr ". Etiopski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Georgian"
-msgstr "# gruzijski"
+msgstr "# Gruzijski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Greek"
-msgstr "# grčki"
+msgstr "# Grčki"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Greek (for blind users)"
-msgstr ". grčki (za slijepe)"
+msgstr ". Grčki - (za slijepe korisnike)"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Hebrew"
-msgstr "# hebrejski"
+msgstr "# Hebrejski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Lao"
-msgstr "# lao"
+msgstr "# Laoski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Latin1 and Latin5 - western Europe and Turkic languages"
-msgstr "# Latin1 i Latin5 - zapadna Europa i turski jezici"
+msgstr "# Latin1 i Latin5 - latinica zapadne Europe i turski jezici"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Latin2 - central Europe and Romanian"
-msgstr "# Latin2 - srednja Europa i rumunjski"
+msgstr "# Latin2 - latinica srednje Europe i rumunjski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Latin3 and Latin8 - Chichewa; Esperanto; Irish; Maltese and Welsh"
-msgstr "# Latin3 i Latin8 - čičeva, esperanto, irski, malteški i velški"
+msgstr ""
+"# Latin3 i Latin8 - latinica čičeva; esperanto; irski; malteški i velški"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Latin7 - Lithuanian; Latvian; Maori and Marshallese"
-msgstr "# Latin7 - litavski, latvijski, maorski i maršalski"
+msgstr "# Latin7 - latinica litavski; latvijski; maorski i maršalski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Latin - Vietnamese"
-msgstr ". Latin - vijetnamski"
+msgstr ". Latin - latinica vijetnamski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "# Thai"
-msgstr "# tai"
+msgstr "# Tajlandski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Combined - Latin; Slavic Cyrillic; Hebrew; basic Arabic"
-msgstr ". kombinirani - latinica, slav. ćirilica, hebrejski, osn. arapski"
+msgstr ""
+". Kombinirani - latinica; slavenska ćirilica; hebrejski; osnovni arapski"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Combined - Latin; Slavic Cyrillic; Greek"
-msgstr ". kombinirani - latinica, slavenska ćirilica, grčki"
+msgstr ". Kombinirani - latinica; slavenska ćirilica; grčki"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Combined - Latin; Slavic and non-Slavic Cyrillic"
-msgstr ". kombinirani - latinica, slavenska i neslavenska ćirilica"
+msgstr ". Kombinirani - latinica; slavenska i neslavenska ćirilica"
 
 #. Type: select
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid "Guess optimal character set"
-msgstr "Pogodi optimalni skup znakova"
+msgstr "Pogodi optimalan skup znakova"
 
 #. Type: select
 #. Description
 #. :sl3:
 #: ../console-setup.templates:5002
 msgid "Character set to support:"
-msgstr "Podržati skup znakova:"
+msgstr "Podržani skup znakova:"
 
 #. Type: select
 #. Description
@@ -229,8 +231,7 @@ msgstr "Podržati skup znakova:"
 #: ../console-setup.templates:5002
 msgid ""
 "Please choose the character set that should be supported by the console font."
-msgstr ""
-"Molim izaberite skup znakova koji treba podržavati konzolna vrsta slova."
+msgstr "Odaberite skup znakova kojeg će podržavati slova konzole."
 
 #. Type: select
 #. Description
@@ -240,8 +241,8 @@ msgid ""
 "If you don't use a framebuffer, the choices that start with \".\" will "
 "reduce the number of available colors on the console."
 msgstr ""
-"Ako ne koristite 'framebuffer', izbori koji počinju sa \".\" će smanjiti "
-"broj dostupnih boja na konzoli."
+"Ako ne koristite 'okvirni međuspremnik', izbori koji počinju sa \".\" će "
+"smanjiti broj dostupnih boja na konzoli."
 
 #. Type: select
 #. Description
@@ -251,7 +252,7 @@ msgstr ""
 #. :sl3:
 #: ../console-setup.templates:6001
 msgid "Font for the console:"
-msgstr "Vrsta slova za konzolu:"
+msgstr "Slova konzole:"
 
 #. Type: select
 #. Description
@@ -267,10 +268,10 @@ msgid ""
 "fatigue, though some symbols have a similar aspect which may be a problem "
 "for programmers."
 msgstr ""
-"\"VGA\" ima tradicionalni izgled i osrednje pokrivanje internacionalnih "
-"pisama. \"Fixed\" ima pojednostavljen izgled i bolje pokrivanje "
-"internacionalnih pisama. \"Terminus\" može pomoći smanjiti zamor očiju, iako "
-"će neki simboli biti slični, što može biti problematično programerima."
+"\"VGA\" ima tradicionalni izgled i osrednje pokrivanje međunarodnih pisama. "
+"\"Fixed\" ima pojednostavljeni izgled i bolje pokrivanje međunarodnih "
+"pisama. \"Terminus\" može pomoći smanjiti zamor očiju, iako će neki simboli "
+"biti slični, što može biti problematično programerima."
 
 #. Type: select
 #. Description
@@ -283,8 +284,9 @@ msgid ""
 "If you prefer a bold version of the Terminus font, choose either "
 "TerminusBold (if you use a framebuffer) or TerminusBoldVGA (otherwise)."
 msgstr ""
-"Ako preferirate podebljanu inačicu fonta Terminus, izaberite ili "
-"TerminusBold (ako koristite framebuffer) ili TerminusBoldVGA (inače)."
+"Ako preferirate podebljanu inačicu Terminus slova, odaberite ili "
+"TerminusBold (ako koristite okvirni međuspremnik) ili TerminusBoldVGA (u "
+"suprotnome)."
 
 #. Type: select
 #. Description
@@ -304,8 +306,8 @@ msgid ""
 "Please select the size of the font for the console. For reference, the font "
 "used when the computer boots has size 8x16."
 msgstr ""
-"Molim izaberite veličinu slova za konzolu. Slova koja se prikazuju kada se "
-"računalo podiže imaju veličinu 8x16."
+"Odaberite veličinu slova konzole. Na primjer, slova koja se koriste pri "
+"pokretanju računala imaju veličinu 8x16."
 
 #. Type: select
 #. Description
@@ -316,16 +318,16 @@ msgid ""
 "used when the computer boots has size 8x16.  Some font sizes require the kbd "
 "console package (not console-tools) plus framebuffer."
 msgstr ""
-"Molim izaberite veličinu slova za konzolu. Slova koja se prikazuju kada se "
-"računalo podiže imaju veličinu 8x16. Neke veličine slova zahtijevaju kbd "
-"console paket (ne console-tools) i 'framebuffer'."
+"Odaberite veličinu slova konzole.  Na primjer, slova koja se koriste pri "
+"pokretanju računala imaju veličinu 8x16.  Pojedine veličine slova "
+"zahtijevaju kbd paket konzole (ne consloe-tools) i okvirni međuspremnik."
 
 #. Type: select
 #. Description
 #. :sl3:
 #: ../console-setup.templates:9001
 msgid "Encoding to use on the console:"
-msgstr "Koristiti kodiranje znakova na konzoli:"
+msgstr "Kôdiranje znakova za korištenje na konzoli:"
 
 #. Type: text
 #. Description
@@ -333,7 +335,7 @@ msgstr "Koristiti kodiranje znakova na konzoli:"
 #. :sl1:
 #: ../keyboard-configuration.templates:2001
 msgid "Configure the keyboard"
-msgstr "Podesi tipkovnicu"
+msgstr "Podešavanje tipkovnice"
 
 #. Type: text
 #. Description
@@ -354,14 +356,14 @@ msgstr "Model tipkovnice:"
 #. :sl2:
 #: ../keyboard-configuration.templates:4001
 msgid "Please select the model of the keyboard of this machine."
-msgstr "Molim izaberite vrstu tipkovnice na ovom računalu."
+msgstr "Odaberite model tipkovnice za ovo računalo."
 
 #. Type: select
 #. Description
 #. :sl1:
 #: ../keyboard-configuration.templates:5001
 msgid "Country of origin for the keyboard:"
-msgstr "Država porijekla tipkovnice:"
+msgstr "Zemlja podrijetla tipkovnice:"
 
 #. Type: select
 #. Description
@@ -372,8 +374,8 @@ msgid ""
 "multiple common layouts. Please select the country of origin for the "
 "keyboard of this computer."
 msgstr ""
-"Raspored tipkovnice ovisi o državi, a neke države imaju više uobičajenih "
-"rasporeda. Molim izaberite državu porijekla za tipkovnicu ovog računala."
+"Raspored tipkovnice ovisi o državi, neke države imaju više zajedničkih "
+"rasporeda. Odaberite državu podrijetla za tipkovnicu ovog računala."
 
 #. Type: select
 #. Description
@@ -387,14 +389,14 @@ msgstr "Raspored tipkovnice:"
 #. :sl1:
 #: ../keyboard-configuration.templates:6001
 msgid "Please select the layout matching the keyboard for this machine."
-msgstr "Molim provjerite odgovarajući raspored tipkovnice za ovo računalo."
+msgstr "Odaberite odgovarajući raspored tipkovnice za ovo računalo."
 
 #. Type: boolean
 #. Description
 #. :sl3:
 #: ../keyboard-configuration.templates:7001
 msgid "Keep the current keyboard layout in the configuration file?"
-msgstr "Zadrži trenutni raspored tipkovnice u datoteci s postavkama?"
+msgstr "Zadrži trenutni raspored tipkovnice u datoteci podešavanja?"
 
 #. Type: boolean
 #. Description
@@ -404,8 +406,8 @@ msgid ""
 "The current keyboard layout in the configuration file /etc/default/keyboard "
 "is defined as XKBLAYOUT=\"${XKBLAYOUT}\" and XKBVARIANT=\"${XKBVARIANT}\"."
 msgstr ""
-"Trenutni raspored tipkovnice u datoteci s postavkama /etc/default/keyboard "
-"je određen kao XKBLAYOUT=\"${XKBLAYOUT}\" i XKBVARIANT=\"${XKBVARIANT}\"."
+"Trenutni raspored tipkovnice u datoteci podešavanja /etc/default/keyboard je "
+"određen kao XKBLAYOUT=\"${XKBLAYOUT}\" i XKBVARIANT=\"${XKBVARIANT}\"."
 
 #. Type: boolean
 #. Description
@@ -416,16 +418,16 @@ msgid ""
 "questions about the keyboard layout will be asked and the current "
 "configuration will be preserved."
 msgstr ""
-"Molim izaberite želite li ovo zadržati. Ukoliko izaberete ovu mogućnost, "
-"neće biti postavljenih pitanja oko rasporeda tipkovnice te će trenutne "
-"postavke biti sačuvane."
+"Odaberite želite li ovaj raspored zadržati. Ukoliko odaberete ovu mogućnost, "
+"više neće biti postavljenih pitanja oko rasporeda tipkovnice, te će trenutne "
+"postavke biti očuvane."
 
 #. Type: boolean
 #. Description
 #. :sl3:
 #: ../keyboard-configuration.templates:8001
 msgid "Keep default keyboard layout (${XKBLAYOUTVARIANT})?"
-msgstr "Zadržati zadani raspored tipkovnice (${XKBLAYOUTVARIANT})?"
+msgstr "Zadrži zadani (${XKBLAYOUTVARIANT}) raspored tipkovnice?"
 
 #. Type: boolean
 #. Description
@@ -437,8 +439,8 @@ msgid ""
 "defined language/region and the settings in /etc/X11/xorg.conf."
 msgstr ""
 "Zadana vrijednost za raspored tipkovnice je XKBLAYOUT=\"${XKBLAYOUT}\" i "
-"XKBVARIANT=\"${XKBVARIANT}\". Ova zadana vrijednost je temeljena na trenutno "
-"određenom jeziku/regiji i postavkama u /etc/X11/xorg.conf."
+"XKBVARIANT=\"${XKBVARIANT}\".  Ova zadana vrijednost je temeljena na "
+"trenutno određenom jeziku/regiji i postavkama u /etc/X11/xorg.conf."
 
 #. Type: boolean
 #. Description
@@ -448,15 +450,15 @@ msgid ""
 "Please choose whether you want to keep it. If you choose this option, no "
 "questions about the keyboard layout will be asked."
 msgstr ""
-"Molim izaberite želite li ovo zadržati. Ukoliko izaberete ovu mogućnost, "
-"neće biti postavljenih pitanja oko rasporeda tipkovnice."
+"Odaberite želite li ovo zadržati. Ukoliko odaberete ovu mogućnost, neće više "
+"biti postavljenih pitanja oko rasporeda tipkovnice."
 
 #. Type: boolean
 #. Description
 #. :sl3:
 #: ../keyboard-configuration.templates:9001
 msgid "Keep current keyboard options in the configuration file?"
-msgstr "Zadržati trenutne postavke tipkovnce u datoteci s postavkama?"
+msgstr "Zadržati trenutne mogućnosti tipkovnice u datoteci podešavanja?"
 
 #. Type: boolean
 #. Description
@@ -466,7 +468,7 @@ msgid ""
 "The current keyboard options in the configuration file /etc/default/keyboard "
 "are defined as XKBOPTIONS=\"${XKBOPTIONS}\"."
 msgstr ""
-"Trenutne postavke tipkovnice u datoteci s postavkama /etc/default/keyboard "
+"Trenutne mogućnosti tipkovnice u datoteci podešavanja /etc/default/keyboard "
 "su određene kao XKBOPTIONS=\"${XKBOPTIONS}\"."
 
 #. Type: boolean
@@ -477,15 +479,15 @@ msgid ""
 "If you choose to keep these options, no questions about the keyboard options "
 "will be asked."
 msgstr ""
-"Ukoliko zadržite ove postavke, neće više biti postavljenih pitanja vezanih "
-"uz postavke tipkovnice."
+"Ukoliko zadržite ove mogućnosti, neće više biti postavljenih pitanja oko "
+"mogućnosti tipkovnice."
 
 #. Type: boolean
 #. Description
 #. :sl3:
 #: ../keyboard-configuration.templates:10001
 msgid "Keep default keyboard options (${XKBOPTIONS})?"
-msgstr "Zadrži zadane postavke tipkovnice (${XKBOPTIONS})?"
+msgstr "Zadrži zadane mogućnosti tipkovnice (${XKBOPTIONS})?"
 
 #. Type: boolean
 #. Description
@@ -496,8 +498,8 @@ msgid ""
 "\"${XKBOPTIONS}\".  It is based on the currently defined language/region and "
 "the settings in /etc/X11/xorg.conf."
 msgstr ""
-"Zadana vrijednost postavki rasporeda tipkovnice je XKBOPTIONS="
-"\"${XKBOPTIONS}\". Temeljena je na trenutno određenom jeziku/regiji i "
+"Zadana vrijednost mogućnosti rasporeda tipkovnice je XKBOPTIONS="
+"\"${XKBOPTIONS}\".  Temeljena je na trenutno određenom jeziku/regiji i "
 "postavkama u /etc/X11/xorg.conf."
 
 #. Type: boolean
@@ -508,8 +510,8 @@ msgid ""
 "If you choose to keep it, no questions about the keyboard options will be "
 "asked."
 msgstr ""
-"Ukoliko zadržite ovo, neće više biti postavljenih pitanja vezanih uz "
-"postavke tipkovnice."
+"Ukoliko zadržite ovo, neće više biti postavljenih pitanja oko mogućnosti "
+"tipkovnice."
 
 #. Type: select
 #. Choices
@@ -595,7 +597,7 @@ msgstr "Desna Logo tipka"
 #: ../keyboard-configuration.templates:13001
 #: ../keyboard-configuration.templates:14001
 msgid "Menu key"
-msgstr "Tipka izbornika"
+msgstr "Tipka Izbornika"
 
 #. Type: select
 #. Choices
@@ -699,7 +701,7 @@ msgstr "Bez promjene"
 #. :sl1:
 #: ../keyboard-configuration.templates:11002
 msgid "Method for toggling between national and Latin mode:"
-msgstr "Metoda za izmjenu između nacionalnog i latinskog načina:"
+msgstr "Način promjene između nacionalnog i latinskog načina:"
 
 #. Type: select
 #. Description
@@ -709,7 +711,7 @@ msgid ""
 "You will need a way to toggle the keyboard between the national layout and "
 "the standard Latin layout."
 msgstr ""
-"Trebat ćete način za izmjenu između nacionalnog i standardnog latinskog "
+"Trebati ćete način za promjenu između nacionalnog i standardnog latinskog "
 "rasporeda."
 
 #. Type: select
@@ -722,25 +724,25 @@ msgid ""
 "+Shift is also a popular combination; it will however lose its usual "
 "behavior in Emacs and other programs that use it for specific needs."
 msgstr ""
-"Tipke desni Alt ili Caps Lock često su izabrane zbog ergonomskih razloga (u "
+"Tipke desni Alt ili Caps Lock često su odabrane iz ergonomskih razloga (u "
 "potonjem slučaju, koristite Shift+Caps Lock za uobičajeno uključivanje i "
-"isključivanje unosa velikih slova). Alt+Shift je također popularna "
-"kombinacija, no može izgubiti svoje uobičajeno ponašanje u Emacsu i ostalim "
-"programima posebne namjene"
+"isključivanje upisa velikih slova). Alt+Shift je također popularna "
+"kombinacija; međutim, može izgubiti svoje uobičajeno ponašanje u Emacsu i "
+"ostalim programima posebne namjene."
 
 #. Type: select
 #. Description
 #. :sl1:
 #: ../keyboard-configuration.templates:11002
 msgid "Not all listed keys are present on all keyboards."
-msgstr "Nekih tipki s popisa nema na svim tipkovnicama."
+msgstr "Nisu sve tipke s popisa prisutne na svim tipkovnicama."
 
 #. Type: select
 #. Choices
 #. :sl2:
 #: ../keyboard-configuration.templates:12001
 msgid "No temporary switch"
-msgstr "Nema privremene sklopke"
+msgstr "Nema privremene zamjene"
 
 #. Type: select
 #. Choices
@@ -758,7 +760,7 @@ msgstr "Obje Logo tipke"
 #. :sl2:
 #: ../keyboard-configuration.templates:12002
 msgid "Method for temporarily toggling between national and Latin input:"
-msgstr "Metoda za privremenu izmjenu između nacionalnog i latinskog unosa:"
+msgstr "Način za privremenu promjenu između nacionalnog i latinskog unosa:"
 
 #. Type: select
 #. Description
@@ -771,7 +773,7 @@ msgid ""
 "That key may also be used to input national letters when the keyboard is in "
 "Latin mode."
 msgstr ""
-"Kad je tipkovnica u nacionalnom načinu rada i pojedinac želi unijeti "
+"Kada je tipkovnica u nacionalnom načinu rada i pojedinac želi unijeti "
 "nekoliko latinskih znakova, bilo bi prikladnije da se privremeno prebaci na "
 "latinski način. Tipkovnica ostaje u tom načinu dok god je tipka pritisnuta. "
 "Ta se tipka može također koristiti za unos nacionalnih znakova kad je "
@@ -782,14 +784,14 @@ msgstr ""
 #. :sl2:
 #: ../keyboard-configuration.templates:12002
 msgid "You can disable this feature by choosing \"No temporary switch\"."
-msgstr "Možete onemogućiti ovu opciju birajući \"Nema privremene sklopke\"."
+msgstr "Možete onemogućiti ovu mogućnost odabirom \"Nema privremene zamjene\"."
 
 #. Type: select
 #. Choices
 #. :sl2:
 #: ../keyboard-configuration.templates:13001
 msgid "The default for the keyboard layout"
-msgstr "Izbor zadane tipkovnice"
+msgstr "Zadani raspored tipkovnice"
 
 #. Type: select
 #. Choices
@@ -803,7 +805,7 @@ msgstr "Nema AltGr tipke"
 #. :sl2:
 #: ../keyboard-configuration.templates:13001
 msgid "Keypad Enter key"
-msgstr "Enter tipka na numeričkom dijelu"
+msgstr "Enter tipka na brojčanom dijelu"
 
 #. Type: select
 #. Choices
@@ -817,7 +819,7 @@ msgstr "Obje tipke Alt"
 #. :sl2:
 #: ../keyboard-configuration.templates:13002
 msgid "Key to function as AltGr:"
-msgstr "Tipka koju želite da radi kao AltGr:"
+msgstr "Tipka koja će raditi kao AltGr:"
 
 #. Type: select
 #. Description
@@ -829,24 +831,24 @@ msgid ""
 "layout, such as foreign currency symbols and accented letters. These are "
 "often printed as an extra symbol on keys."
 msgstr ""
-"Kod nekih rasporeda tipkovnice, AltGr je tipka izmjene koja se koristi za "
-"unos nekih znakova, prvenstveno onih koji nisu uobičajeni za jezik rasporeda "
-"tipkovnice, kao što su simboli za stranu valutu i akcentirana slova. Obično "
-"su ispisani kao dodatni simboli na tipkama."
+"Kod pojedinih rasporeda tipkovnice, AltGr je tipka promjene koja se koristi "
+"za upis nekih znakova, prvenstveno onih koji nisu uobičajeni za jezik "
+"rasporeda tipkovnice, kao što su simboli za stranu valutu i naglašena slova. "
+"Obično su ispisani kao dodatni simboli na tipkama."
 
 #. Type: select
 #. Choices
 #. :sl2:
 #: ../keyboard-configuration.templates:14001
 msgid "No compose key"
-msgstr "Nema tipku compose"
+msgstr "Nema tipke sastavljanja"
 
 #. Type: select
 #. Description
 #. :sl2:
 #: ../keyboard-configuration.templates:14002
 msgid "Compose key:"
-msgstr "Tipka Compose:"
+msgstr "Tipka sastavljanja:"
 
 #. Type: select
 #. Description
@@ -857,9 +859,9 @@ msgid ""
 "the next few keystrokes as a combination in order to produce a character not "
 "found on the keyboard."
 msgstr ""
-"Tipka Compose (poznata kao i Multi_key) čini da računalo interpretira idućih "
-"nekoliko pritisaka na tipke kao kombinaciju koja služi za stvaranje znaka "
-"koji se ne nalazi na tipkovnici."
+"Tipka sastavljanja (poznata kao i Multi_key) čini da računalo interpretira "
+"sljedećih nekoliko pritisaka na tipke kao kombinaciju koja služi za "
+"stvaranje znaka koji se ne nalazi na tipkovnici."
 
 #. Type: select
 #. Description
@@ -870,9 +872,9 @@ msgid ""
 "Unicode mode, regardless of what you choose here, you can always also use "
 "the Control+period combination as a Compose key."
 msgstr ""
-"U tekstualnoj konzoli u Unicode načinu rada tipka Compose ne radi. Ako niste "
-"u Unicode načinu rada, što god ovdje ovdje izaberete, uvijek možete "
-"koristiti i kombinaciju Control+točka za tipku Compose."
+"U tekstovnoj konzoli u Unikôdnom načinu rada tipka sastavljanja ne radi. Ako "
+"niste u Unikôdnom načinu rada, štogod ovdje odabrali, uvijek možete "
+"koristiti i kombinaciju Control+točka za tipku sastavljanja."
 
 #. Type: boolean
 #. Description
@@ -880,7 +882,8 @@ msgstr ""
 #: ../keyboard-configuration.templates:15001
 msgid "Use Control+Alt+Backspace to terminate the X server?"
 msgstr ""
-"Želite li koristiti Control+Alt+Backspace za prekidanje izvođenja X servera?"
+"Želite li koristiti Control+Alt+Backspace za prekidanje izvođenja X "
+"poslužitelja?"
 
 #. Type: boolean
 #. Description
@@ -890,140 +893,140 @@ msgid ""
 "By default the combination Control+Alt+Backspace does nothing.  If you want "
 "it can be used to terminate the X server."
 msgstr ""
-"Kombinacija Control+Alt+Backspace prema zadanim postavkama ne čini ništa. "
-"Ako želite, može se koristiti za prekidanje izvođenja X servera."
+"Kombinacija Control+Alt+Backspace prema zadanim postavkama ne čini ništa.  "
+"Ako želite, može se koristiti za prekidanje izvođenja X poslužitelja."
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "American English"
-msgstr "američka engleska"
+msgstr "Američka engleska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Albanian"
-msgstr "albanska"
+msgstr "Albanska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Arabic"
-msgstr "arapska"
+msgstr "Arapska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Asturian"
-msgstr "asturijska"
+msgstr "Asturska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Bangladesh"
-msgstr "bangladeška"
+msgstr "Bangladeška"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Belarusian"
-msgstr "bjeloruska"
+msgstr "Bjeloruska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Bengali"
-msgstr "bengalska"
+msgstr "Bengalska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Belgian"
-msgstr "belgijska"
+msgstr "Belgijska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Bosnian"
-msgstr "bosanska"
+msgstr "Bosanska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Brazilian"
-msgstr "brazilska"
+msgstr "Brazilska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "British English"
-msgstr "britanska engleska"
+msgstr "Britanska engleska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Bulgarian (BDS layout)"
-msgstr "bugarska (BDS raspored)"
+msgstr "Bugarska (BDS raspored)"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Bulgarian (phonetic layout)"
-msgstr "bugarska (fonetski raspored)"
+msgstr "Bugarska (fonetski raspored)"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Burmese"
-msgstr "burmanska"
+msgstr "Burmanska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Canadian French"
-msgstr "kanadska francuska"
+msgstr "Kanadska francuska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Canadian Multilingual"
-msgstr "kanadska višejezična"
+msgstr "Kanadska višejezična"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Catalan"
-msgstr "katalonska"
+msgstr "Katalonska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Chinese"
-msgstr "kineska"
+msgstr "Kineska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Croatian"
-msgstr "hrvatska"
+msgstr "Hrvatska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Czech"
-msgstr "češka"
+msgstr "Češka"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Danish"
-msgstr "danska"
+msgstr "Danska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Dutch"
-msgstr "nizozemska"
+msgstr "Nizozemska"
 
 # ?
 #. Type: select
@@ -1037,7 +1040,7 @@ msgstr "Dvorak"
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Dzongkha"
-msgstr "Dzongkha"
+msgstr "Džongkhaška"
 
 # ?
 #. Type: select
@@ -1050,363 +1053,363 @@ msgstr "Esperanto"
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Estonian"
-msgstr "estonska"
+msgstr "Estonska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Ethiopian"
-msgstr "etiopska"
+msgstr "Etiopska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Finnish"
-msgstr "finska"
+msgstr "Finska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "French"
-msgstr "francuska"
+msgstr "Francuska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Georgian"
-msgstr "gruzijska"
+msgstr "Gruzijska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "German"
-msgstr "njemačka"
+msgstr "Njemačka"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Greek"
-msgstr "grčka"
+msgstr "Grčka"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Gujarati"
-msgstr "Gujarati"
+msgstr "Gudžaratska"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Gurmukhi"
-msgstr "Gurmukhi"
+msgstr "Gurmukhijska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Hebrew"
-msgstr "hebrejska"
+msgstr "Hebrejska"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Hindi"
-msgstr "Hindi"
+msgstr "Hindska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Hungarian"
-msgstr "mađarska"
+msgstr "Mađarska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Icelandic"
-msgstr "islandska"
+msgstr "Islandska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Irish"
-msgstr "irska"
+msgstr "Irska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Italian"
-msgstr "talijanska"
+msgstr "Talijanska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Japanese"
-msgstr "japanska"
+msgstr "Japanska"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Kannada"
-msgstr "Kannada"
+msgstr "Kanadska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Kazakh"
-msgstr "kazaška"
+msgstr "Kazaška"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Khmer"
-msgstr "kmerska"
+msgstr "Kmerska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Kirghiz"
-msgstr "kirgiška"
+msgstr "Kirgiška"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Korean"
-msgstr "korejska"
+msgstr "Korejska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Kurdish (F layout)"
-msgstr "kurdska (F raspored)"
+msgstr "Kurdska (F raspored)"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Kurdish (Q layout)"
-msgstr "kurdska (Q raspored)"
+msgstr "Kurdska (Q raspored)"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Lao"
-msgstr "Lao"
+msgstr "Laoska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Latin American"
-msgstr "latinoamerička"
+msgstr "Latinoamerička"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Latvian"
-msgstr "latvijska"
+msgstr "Letonska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Lithuanian"
-msgstr "litavska"
+msgstr "Litavska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Macedonian"
-msgstr "makedonska"
+msgstr "Makedonska"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Malayalam"
-msgstr "Malayalam"
+msgstr "Malajalamska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Nepali"
-msgstr "nepalska"
+msgstr "Nepalska"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Northern Sami"
-msgstr "Northern Sami"
+msgstr "Sjeverno samska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Norwegian"
-msgstr "norveška"
+msgstr "Norveška"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Persian"
-msgstr "perzijska"
+msgstr "Perzijska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Philippines"
-msgstr "filipinska"
+msgstr "Filipinska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Polish"
-msgstr "poljska"
+msgstr "Poljska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Portuguese"
-msgstr "portugalska"
+msgstr "Portugalska"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Punjabi"
-msgstr "Punjabi"
+msgstr "Pandžapska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Romanian"
-msgstr "rumunjska"
+msgstr "Rumunjska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Russian"
-msgstr "ruska"
+msgstr "Ruska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Serbian (Cyrillic)"
-msgstr "srpska (ćirilična)"
+msgstr "Srpska (ćirilična)"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Sindhi"
-msgstr "Sindhi"
+msgstr "Sindska"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Sinhala"
-msgstr "Sinhala"
+msgstr "Singaleška"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Slovak"
-msgstr "slovačka"
+msgstr "Slovačka"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Slovenian"
-msgstr "slovenska"
+msgstr "Slovenska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Spanish"
-msgstr "španjolska"
+msgstr "Španjolska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Swedish"
-msgstr "švedska"
+msgstr "Švedska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Swiss French"
-msgstr "švicarsko-francuska"
+msgstr "Švicarsko-francuska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Swiss German"
-msgstr "švicarsko-njemačka"
+msgstr "Švicarsko-njemačka"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Tajik"
-msgstr "tadžikistanska"
+msgstr "Tadžikistanska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Tamil"
-msgstr "tamilska"
+msgstr "Tamilska"
 
 # ?
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Telugu"
-msgstr "Telugu"
+msgstr "Teluška"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Thai"
-msgstr "tajlandska"
+msgstr "Tajlandska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Tibetan"
-msgstr "tibetska"
+msgstr "Tibetska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Turkish (F layout)"
-msgstr "turska (F raspored)"
+msgstr "Turska (F raspored)"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Turkish (Q layout)"
-msgstr "turska (Q raspored)"
+msgstr "Turska (Q raspored)"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Ukrainian"
-msgstr "ukrajinska"
+msgstr "Ukrajinska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Uyghur"
-msgstr "ujgurska"
+msgstr "Ujgurska"
 
 #. Type: select
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Vietnamese"
-msgstr "vijetnamska"
+msgstr "Vijetnamska"
 
 #. Type: select
 #. Description
 #: ../keyboard-configuration.templates:16002
 msgid "Keymap to use:"
-msgstr "Tipkovnička mapa:"
+msgstr "Raspored tipkovnice:"
diff --git a/debian/po/tg.po b/debian/po/tg.po
index 5b25f94..66671b2 100644
--- a/debian/po/tg.po
+++ b/debian/po/tg.po
@@ -9,14 +9,14 @@
 #
 # Debian Installer translators, please read the D-I i18n documentation
 # in doc/i18n/i18n.txt
-# Victor Ibragimov <victor.ibragimov@gmail.com>, 2013, 2014, 2015, 2016, 2017, 2018
+# Victor Ibragimov <victor.ibragimov@gmail.com>, 2013, 2014, 2018, 2019
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: console-setup@packages.debian.org\n"
 "POT-Creation-Date: 2018-03-10 23:15+0100\n"
-"PO-Revision-Date: 2018-03-05 11:00+0500\n"
+"PO-Revision-Date: 2019-08-02 22:04+0500\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: Tajik <victor.ibragimov@gmail.com>\n"
 "Language: tg\n"
@@ -79,10 +79,8 @@ msgstr "# Кириллӣ - забонҳои ғайриславянӣ"
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
-#, fuzzy
-#| msgid "# Cyrillic - non-Slavic languages"
 msgid ". Cyrillic - non-Slavic languages (for blind users)"
-msgstr "# Кириллӣ - забонҳои ғайриславянӣ"
+msgstr ". Кириллӣ - забонҳои ғайриславянӣ (барои корбарони нобино)"
 
 #. Type: select
 #. Choices
@@ -95,10 +93,8 @@ msgstr "# Кириллӣ - забонҳои славянӣ (инчунин бо
 #. Choices
 #. :sl3:
 #: ../console-setup.templates:5001
-#, fuzzy
-#| msgid "# Cyrillic - Slavic languages (also Bosnian and Serbian Latin)"
 msgid ". Cyrillic - Slavic languages (for blind users)"
-msgstr "# Кириллӣ - забонҳои славянӣ (инчунин босниягӣ ва лотинии сербӣ)"
+msgstr ". Кириллӣ - забонҳои славянӣ (барои корбарони нобино)"
 
 #. Type: select
 #. Choices
@@ -126,7 +122,7 @@ msgstr "# Юнонӣ"
 #. :sl3:
 #: ../console-setup.templates:5001
 msgid ". Greek (for blind users)"
-msgstr ""
+msgstr ". Юнонӣ (барои корбарони нобино)"
 
 #. Type: select
 #. Choices
@@ -980,7 +976,7 @@ msgstr "Булғорӣ (тарҳбандии БДС)"
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Bulgarian (phonetic layout)"
-msgstr "Булғорӣ (тарҳбандии фонетикӣ)"
+msgstr "Булғорӣ (тарҳбандии овоӣ)"
 
 #. Type: select
 #. Choices
@@ -1010,7 +1006,7 @@ msgstr "Каталонӣ"
 #. Choices
 #: ../keyboard-configuration.templates:16001
 msgid "Chinese"
-msgstr "Чинӣ"
+msgstr "Хитоӣ"
 
 #. Type: select
 #. Choices

Reply to: