Add progress text and tidy up localization files

60 files changed, 1856 insertions, 3125 deletions

diff --git a/download.nsi b/download.nsi
index 65ebe32..28e2af4 100644
--- a/download.nsi
+++ b/download.nsi
@@ -31,8 +31,8 @@ ${STDMACROS_DefIfNotDef} IDC_SHOWDETAILS 1027
 !define WININET_PROGRESSBAR_CONTROL ${IDC_PROGRESS1}
 !define WININET_PROXY $proxy
 !define WININET_STATUSTEXT_CONTROL ${IDC_STATIC1}
-!define WININET_TEXT_CONNECTING $(nsisdl2)
-!define WININET_TEXT_PROGRESS "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+!define WININET_TEXT_CONNECTING $(connecting)
+!define WININET_TEXT_PROGRESS $(progress)
 !define WININET_TIMEOUT 10000
 !define WININET_USER_AGENT "Mozilla/4.0 (compatible; Win32; ${_PRODUCT_NAME})"
 
diff --git a/l10n/Makefile b/l10n/Makefile
index f7a343c..ac8734b 100644
--- a/l10n/Makefile
+++ b/l10n/Makefile
@@ -2,13 +2,14 @@
 # For others, a PO file may be added and kept until NSIS is translated
 # Languages not yet supported by NSIS: ast bn dz kk ml ta te ug vi
 
+VPATH ?= .
 MKDIR_P := mkdir -p
 TEMPLATES := templates
 PO := po
 
 LINGUAS= ar be bg bs ca cs da de el en eo es eu fa fi fr ga gl he hr hu is it ja ko lt nb nl pl pt pt_BR ro ru sk sl sq sr sr@latin sv th tr uk zh_CN zh_TW
 
-all: $(TEMPLATES)/all.nsh $(TEMPLATES)/dialog.nsh po/messages.pot
+all: $(TEMPLATES)/all.nsh $(TEMPLATES)/dialog.nsh $(VPATH)/$(PO)/messages.pot
 
 $(TEMPLATES):
 	$(MKDIR_P) $@
@@ -28,7 +29,7 @@ win32-loader: win32-loader.c
 $(TEMPLATES)/en.nsh: win32-loader.sh win32-loader | $(TEMPLATES)
 	LANGUAGE=C $(realpath $<) > $@
 
-locale/%/LC_MESSAGES/win32-loader.mo: po/%.po $(PO)/messages.pot | $(TEMPLATES)
+locale/%/LC_MESSAGES/win32-loader.mo: $(PO)/%.po $(VPATH)/$(PO)/messages.pot | $(TEMPLATES)
 	$(MKDIR_P) locale/$*/LC_MESSAGES
 	msgmerge -U $< $(dir $<)messages.pot
 	msgfmt -c --statistics -o $@ $<
diff --git a/l10n/po/ar.po b/l10n/po/ar.po
index 77a3957..1205487 100644
--- a/l10n/po/ar.po
+++ b/l10n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader_l10n_po\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-07-15 05:42+0300\n"
 "Last-Translator: \n"
 "Language-Team: Arabic <kde-i18n-doc@kde.org>\n"
@@ -252,55 +252,36 @@ msgid "Text install"
 msgstr "التثبيت النصّي"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "تنزيل %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "إجراء الاتصال ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "ثانية"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "دقيقة"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "ساعة"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "ث"
-
+#. Former values:
+#. (%d %s%s متبقية)"
+#. "%dك.ب (%d%%) of %dك.ب بسرعة %d.%01dك.ب/ث"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dك.ب (%d%%) of %dك.ب بسرعة %d.%01dك.ب/ث"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s متبقية)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "اختر نسخة برنامج تثبيت دبيان التي تريد استخدامها:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "الإصدار المستقرّ. يقوم بتثبيت نسخة \"stable\" من دبيان."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -313,7 +294,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -321,43 +302,43 @@ msgstr ""
 "من المُستحسن أن تتحقّق من المشاكل المعلومة قبل استخدام البُنية اليوميّة. هل تودّ "
 "القيام بذلك الآن؟"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr "سأستخدم المُعطيات التالية. لا تُغيّر أي منها ما لم تكن تعلم ما تقوم به."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "إعدادات البروكسي (مضيف:منفذ):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "موضع boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "عنوان URL الأساسي لصُور netboot (linux و initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "خطأ"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "خطأ: فشل نسخ $0 إلى $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "التحقق من توقيع GPG على $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "لا يمكن الوثوق بالملف المنزل $0! سيتم إلغاء العملية."
 
@@ -365,7 +346,7 @@ msgstr "لا يمكن الوثوق بالملف المنزل $0! سيتم إلغ
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "لا يتطابق تدقيق المجموع في $0/$2. وجدت النتيجة $1 مع أن المفروض هو $4. جاري "
@@ -374,43 +355,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "حساب تدقيق مجموع $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "جاري توليد $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "جاري إضافة معلومات preseeding إلى $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "خطأ: تعذّر تشغيل $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "تعطيل ضغط NTFS في ملفات bootstrap"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "التسجيل في NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "التسجيل في BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "خطأ: فشلت قراءة مُخرجات bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "خطأ: $0 غير موجود. هل نسخة ويندوز هذه هي فعلاً $windows_version؟"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "تنبيه مهم جداً:\\n\\n"
 
@@ -420,7 +401,7 @@ msgstr "تنبيه مهم جداً:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -430,7 +411,7 @@ msgstr ""
 "بإعادة تشغيل ويندوز إلى وضع DOS، وتحميل الجزء التالي من عملية التثبيت "
 "تلقائياً.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -439,7 +420,7 @@ msgstr ""
 "يجب أن تقوم بإعادة التشغيل كي تستمر بعملية التثبيت. أثناء الإقلاع التالي، "
 "سوف تُسأل عما إذا كتب تريد تشغيل ويندوز أو إتمام عملية التثبيت.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -455,15 +436,6 @@ msgstr ""
 "(وإن اخترت إبقاء ويندوز على حاسبك)، يمكنك إزالة برنامج التحميل عبر إضافة/"
 "إزالة البرامج من لوحة التحكّم."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "هل تريد إعادة التشغيل الآن؟"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "بية سطح المكتب:"
-
-#~ msgid "None"
-#~ msgstr "لاشيء"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian Installer"
diff --git a/l10n/po/ast.po b/l10n/po/ast.po
index edb57bc..eb27659 100644
--- a/l10n/po/ast.po
+++ b/l10n/po/ast.po
@@ -289,6 +289,9 @@ msgstr "hora"
 msgid "s"
 msgstr "s"
 
+#. Former values:
+#. "%dkB (%d%%) de %dkB a %d.%01dkB/s"
+#. " (falten %d %s%s)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -468,12 +471,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "¿Quier reaniciar agora?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Entornu d'escritoriu:"
-
-#~ msgid "None"
-#~ msgstr "Dengún"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Instalador de Debian"
diff --git a/l10n/po/be.po b/l10n/po/be.po
index 897b1ea..f8b6f15 100644
--- a/l10n/po/be.po
+++ b/l10n/po/be.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: be\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-03-10 19:24+0300\n"
 "Last-Translator: Viktar Siarheichyk <viсs@eq.by>\n"
 "Language-Team: Belarusian (Official spelling) <debian-l10n-belarusian@lists."
@@ -260,55 +260,36 @@ msgid "Text install"
 msgstr "Ўсталяванне ў тэкставым рэжыме"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Загрузка %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Злучэнне ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "секунд"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "хвілін"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "гадзін"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) з %dkB на %d.%01dkB/s"
+#. " (%d %s%s застаецца)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) з %dkB на %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s застаецца)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Абярыце, якую версію праграмы ўсталявання Debian трэба выкарыстаць:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Стабільны выпуск.  Будзе ўсталяваны Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -321,7 +302,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -329,7 +310,7 @@ msgstr ""
 "Раім праглядзець спіс вядомых праблем да таго, як выкарыстоўваць штодзённы "
 "выпуск. Ці хочаце гэта зрабіць зараз?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -337,37 +318,37 @@ msgstr ""
 "Наступныя параметры будуць ужытыя. НЕ ЧАПАЙЦЕ ніводнага параметра, калі не "
 "ўсведамляеце наступстваў дзеяння."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Наладкі проксі (сервер:порт):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Знаходжанне boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Базавы URL для адбіткаў netboot (linux ды initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Памылка"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Памылка: не скапіявана $0 у $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Праверка GPG подпісу $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Загружанаму файлу $0 нельга давяраць! Спыняемся."
 
@@ -375,7 +356,7 @@ msgstr "Загружанаму файлу $0 нельга давяраць! Сп
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Неадпаведнасць кантрольнай сумы $0/$2. Атрымалі $1 замест чаканага $4. "
@@ -384,43 +365,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Вылічэнне  кантрольнае сумы $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Стварэнне $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Даданне звестак у $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Памылка: немагчыма запусціць $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Адключэнне сціску NTFS у файлах загрузкі (bootstrap)"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Запіс у NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Запіс у BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Памылка: немагчыма апрацаваць вывад bcedit.exe"
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Памылка: не знойдзена $0. Ці гэта сапраўды Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ВЕЛЬМІ ВАЖНАЯ ЗАЎВАГА:\\n\\n"
 
@@ -430,7 +411,7 @@ msgstr "ВЕЛЬМІ ВАЖНАЯ ЗАЎВАГА:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -440,7 +421,7 @@ msgstr ""
 "праграма перазапусціць Windows у рэжыме DOS і аўтаматычна загрузіць "
 "наступную частку працэсу ўсталявання.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -450,7 +431,7 @@ msgstr ""
 "загрузкі Вы будзеце мець магчымасць выбару: запусціць Windows або працягнуць "
 "ўсталяванне.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -468,12 +449,6 @@ msgstr ""
 "будзе выдаліць гэты загрузчык праз меню \"Дадаць/Выдаліць праграмы\" у "
 "кантрольнай панэлі Windows."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Ці хочаце Вы перазагрузіцца зараз?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Працоўнае асяроддзе:"
-
-#~ msgid "None"
-#~ msgstr "Няма"
diff --git a/l10n/po/bg.po b/l10n/po/bg.po
index 6e136cc..d336743 100644
--- a/l10n/po/bg.po
+++ b/l10n/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installer for Win32 ALL\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-23 21:33+0200\n"
 "Last-Translator: Damyan Ivanov <dam+gnome@ktnx.net>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -264,55 +264,36 @@ msgid "Text install"
 msgstr "Инсталация в текстов режим"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Сваляне на %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Свързване..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "секунди"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "минути"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "часа"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dкб·(%d%%)·от·%dкб·при·%d.%01dкБ/сек"
+#. " (остават %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dкб·(%d%%)·от·%dкб·при·%d.%01dкБ/сек"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (остават %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Изберете версия на инсталатора на Дебиан:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Стабилна. Това ще инсталира \"Debian stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -325,7 +306,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -333,7 +314,7 @@ msgstr ""
 "Препоръчително е преди използване на дневно издание да проверите за "
 "евентуални проблеми с него. Желаете ли това да стане сега?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -341,37 +322,37 @@ msgstr ""
 "Ще бъдат използвани следните параметри. Не променяйте нищо, ако не знаете "
 "точно какво правите."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Настройки на прокси (хост:порт):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Местонахождение на boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Базов адрес за netboot-образи (linux и initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Грешка"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Грешка: неуспех при копиране на $0 в $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Проверка на сигнатурата на файла $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Изтегленият файл е повреден! Прекъсване."
 
@@ -379,7 +360,7 @@ msgstr "Изтегленият файл е повреден! Прекъсван�
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Грешка в контролната сума на $0/$2. Получи се $1, а се очаква $4. Прекъсване."
@@ -387,45 +368,45 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Пресмятане на контролната сума на файла $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Генериране на $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Добавяне на предварителни настройки към $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Грешка: неуспех при изпълнение на $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr ""
 "Забраняване на компресията на NTFS за файловете за първоначално зареждане"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Регистриране в NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Регистриране в BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Грешка: неуспех при разчитане на изхода от bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Грешка: не е намерен $0. Дали това наистина е Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "МНОГО ВАЖНО:\\n\\n"
 
@@ -435,7 +416,7 @@ msgstr "МНОГО ВАЖНО:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -445,7 +426,7 @@ msgstr ""
 "потвърждение, Windows ще бъде рестартиран в ДОС-режим и автоматично ще "
 "зареди следващата стъпка от инсталацията.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -455,7 +436,7 @@ msgstr ""
 "зареждане ще бъдете запитани дали желаете да се зареди Widows или да "
 "продължи инсталирането.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -473,18 +454,6 @@ msgstr ""
 "Уиндоус), можете да деинсталирате програмата за зареждане на инсталатора от "
 "Add/Remove Programs в Control Panel."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Желаете ли да рестартирате сега?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Графична работна среда:"
-
-#~ msgid "None"
-#~ msgstr "Без"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Инсталатор на Дебиан"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Предварителни настройки на инсталатора (preseed):"
diff --git a/l10n/po/bn.po b/l10n/po/bn.po
index 54ae92c..4dda925 100644
--- a/l10n/po/bn.po
+++ b/l10n/po/bn.po
@@ -287,6 +287,9 @@ msgstr "ঘন্টা"
 msgid "s"
 msgstr "s"
 
+#. Former values:
+#. "%d.%01dkB/s-তে %dkB-র %dkB (%d%%)"
+#. " (%d %s%s অবশিষ্ট আছে)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -465,12 +468,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "আপনি কি এখন পুনরায় বুট করতে চান?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "ডেস্কটপ এনভায়রনমেন্ট:"
-
-#~ msgid "None"
-#~ msgstr "কোনটি না"
-
-#~ msgid "Debian Installer"
-#~ msgstr "ডেবিয়ান ইন্সটলার"
diff --git a/l10n/po/bs.po b/l10n/po/bs.po
index 9acdd7a..0b1cb95 100644
--- a/l10n/po/bs.po
+++ b/l10n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-06-10 02:08+0100\n"
 "Last-Translator: Armin Besirovic <armin@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -255,55 +255,36 @@ msgid "Text install"
 msgstr "Tekstualna instalacija"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Skidam %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Konektovanje ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekunda"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuta"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "sat"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) od %dkB pri %d.%01dkB/s"
+#. " (%d %s%s preostalo)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) od %dkB pri %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s preostalo)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Odaberite verziju Debian-Installera za upotrebu:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabilno izdanje.  Ovo će instalirati Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -316,7 +297,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -324,7 +305,7 @@ msgstr ""
 "Preporučeno je da provjerite za poznate probleme prije korištenja dnevnog "
 "izdanja.  Želite li to uraditi sada?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -332,37 +313,37 @@ msgstr ""
 "Sljedeći parametri će biti korišteni.  NEMOJTE mijenjati niti jedan osim ako "
 "znate šta radite."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxy postavke (host:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Lokacija boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Osnovni URL za netboot slike (linux i initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Greška"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Greška: neuspjeh pri kopiranju $0 na $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Provjeravam GPG potpis na $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Skinuta $0 datoteka nije pouzdana! Prekidam."
 
@@ -370,50 +351,50 @@ msgstr "Skinuta $0 datoteka nije pouzdana! Prekidam."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "Checksum razlika za $0/$2. Nađeno $1 umjesto $4. Prekidam."
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Računam checksum za $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Generisanje $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Dodajem preseeding informacije u $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Greška: neuspjeh pri pokretanju $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Onemogućavanje NTFS kompresije u bootstrap datotekama"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrovanje u NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrovanje u BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Greška: neuspjeh pri parsiranje bcdedit.exe izlaza."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Greška: $0 nije nađeno.  Je li ovo zaista Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "VEOMA VAŽNA NAPOMENA:\\n\\n"
 
@@ -423,7 +404,7 @@ msgstr "VEOMA VAŽNA NAPOMENA:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -433,7 +414,7 @@ msgstr ""
 "restartati Windows u DOS režim i automatski učitati sljedeći dio "
 "instalacijskog procesa.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -443,7 +424,7 @@ msgstr ""
 "sljedećeg pokretanja biti ćete upitani da li želite pokrenuti Windows ili "
 "nastaviti sa instalacijskim procesom.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -461,12 +442,6 @@ msgstr ""
 "sačuvate Windows na vašem disku) možete obrisati ovaj loader kroz Windowsov "
 "Add/Remove Programs dijalog u Control Panelu."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Želite li restartati sada?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Grafičko okruženje:"
-
-#~ msgid "None"
-#~ msgstr "Nijedan"
diff --git a/l10n/po/ca.po b/l10n/po/ca.po
index a879a0e..b3582e0 100644
--- a/l10n/po/ca.po
+++ b/l10n/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.6.90\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-28 20:07+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -261,55 +261,36 @@ msgid "Text install"
 msgstr "Instal·lació en text"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Abaixant %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Connectant ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "s"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "m"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "h"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) de %dkB a %d.%01dkB/s"
+#. " (%d %s%s restant)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) de %dkB a %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s restant)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Seleccioneu la versió de l'instal·lador de Debian a emprar:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Llançament estable.  Això instal·larà Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -322,7 +303,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -330,7 +311,7 @@ msgstr ""
 "Es recomana que comproveu els problemes coneguts (en anglès) abans d'emprar "
 "una compilació diaria.  Voleu fer-ho ara?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -338,37 +319,37 @@ msgstr ""
 "S'empraran els paràmetres següents.  NO en canvieu cap a no ser que sapigueu "
 "el que esteu fent."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Servidor intermediari (servidor:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Ubicació de boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL base per a les imatges \"netboot\" (linux i initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Error"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Error: no s'ha pogut copiar $0 a $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "S'està comprovant la signatura GPG de $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "No es pot confiar en el fitxer $0 abaixat! S'està avortant."
 
@@ -376,7 +357,7 @@ msgstr "No es pot confiar en el fitxer $0 abaixat! S'està avortant."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "La suma de comprovació no concorda per a $0/$2. S'ha obtingut $1 quan "
@@ -385,43 +366,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "S'està calculant la suma de comprovació de $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "S'està generant $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "S'està afegint informació de preseeding a $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Error: no s'ha pogut executar $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "S'està desactivant la compressió NTFS als fitxers d'arrencada"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "S'està registrant amb NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "S'està registrant amb BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Error: no s'ha pogut processar l'eixida de bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Error: no s'ha trobat $0.  Això és realment Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "AVÍS MOLT IMPORTANT:\\n\\n"
 
@@ -431,7 +412,7 @@ msgstr "AVÍS MOLT IMPORTANT:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -441,7 +422,7 @@ msgstr ""
 "confirmeu, aquest programa reiniciarà Windows en mode DOS, i automàticament "
 "carregarà la següent part del procés d'instal·lació.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -451,7 +432,7 @@ msgstr ""
 "el proper inici, se us demanarà si voleu iniciar Windows o bé continuar amb "
 "el procés d'instal·lació.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -470,12 +451,6 @@ msgstr ""
 "carregador a través del menú «Afegeix/Suprimeix programes» al Tauler de "
 "Control."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Voleu reiniciar ara?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Seleccioneu un entorn d'escriptori:"
-
-#~ msgid "None"
-#~ msgstr "Cap"
diff --git a/l10n/po/cs.po b/l10n/po/cs.po
index 5c1276f..1ad7509 100644
--- a/l10n/po/cs.po
+++ b/l10n/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-10-09 18:52+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -254,55 +254,36 @@ msgid "Text install"
 msgstr "Textová instalace"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Stahuje se %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Připojování ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "s"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "m"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "h"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) z %dkB, %d.%01dkB/s"
+#. " (zbývá %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) z %dkB, %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (zbývá %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Vyberte verzi instalačního systému Debianu, která se má použít:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabilní vydání. Toto nainstaluje Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -315,7 +296,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -323,7 +304,7 @@ msgstr ""
 "Před použitím denního sestavení se doporučuje zkontrolovat známé problémy. "
 "Chcete je zkontrolovat nyní?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -331,37 +312,37 @@ msgstr ""
 "Použijí se následující parametry. Pokud nevíte co děláte, žádný z parametrů "
 "NEMĚŇTE."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Nastavení proxy (počítač:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Umístění boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Základní URL pro netboot obrazy (linux a initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Chyba"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Chyba: nepodařilo se zkopírovat $0 do $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Ověřuje se GPG podpis $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Staženému souboru $0 se nedá věřit! Přerušuji."
 
@@ -369,7 +350,7 @@ msgstr "Staženému souboru $0 se nedá věřit! Přerušuji."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Kontrolní součet $0/$2 nesouhlasí. Vypočteno $1 místo očekávaného $4. "
@@ -378,43 +359,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Počítá se kontrolní součet $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Generuje se $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Do $0 se přidávají informace o přednastavení"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Chyba: nepodařilo se spustit $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Zakazuje se NTFS komprese zaváděcích souborů"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Probíhá registrace do NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Probíhá registrace do BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Chyba: nepodařilo se zpracovat výstup programu bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Chyba: $0 nebyl nalezen. Je toto opravdu Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "DŮLEŽITÁ POZNÁMKA:\\n\\n"
 
@@ -424,7 +405,7 @@ msgstr "DŮLEŽITÁ POZNÁMKA:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -433,7 +414,7 @@ msgstr ""
 "Nyní se spustí druhá část instalace. Po potvrzení se Windows restartují do "
 "DOSu a automaticky spustí druhou část instalace.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -443,7 +424,7 @@ msgstr ""
 "příštího startu budete dotázáni, zda chcete spustit Windows nebo pokračovat "
 "v instalaci.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -461,18 +442,6 @@ msgstr ""
 "po dokončení instalace odstranit tento zavaděč pomocí dialogu Přidat nebo "
 "odebrat programy v Ovládacích panelech."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Chcete nyní restartovat?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Desktopové prostředí:"
-
-#~ msgid "None"
-#~ msgstr "Žádné"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Instalace Debianu"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Řádka s přednastavením debconfu:"
diff --git a/l10n/po/cy.po b/l10n/po/cy.po
index 2263e86..a0803e5 100644
--- a/l10n/po/cy.po
+++ b/l10n/po/cy.po
@@ -290,6 +290,9 @@ msgstr "awr"
 msgid "s"
 msgstr " "
 
+#. Former values:
+#. "%dkB (%d%%) o %dkB ar %d.%01dkB/s"
+#. " (%d %s%s ar ôl)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -471,9 +474,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "Hoffech chi ailgychwyn nawr?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Amgylchedd penbwrdd:"
-
-#~ msgid "None"
-#~ msgstr "Dim"
diff --git a/l10n/po/da.po b/l10n/po/da.po
index cc8c6f9..07690c0 100644
--- a/l10n/po/da.po
+++ b/l10n/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-03-03 12:42+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -260,55 +260,36 @@ msgid "Text install"
 msgstr "Tekstinstallation"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Henter %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Forbinder ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekunder"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minutter"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "timer"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) af %dkB med %d.%01dkB/s"
+#. " (%d %s%s tilbage)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) af %dkB med %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s tilbage)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Vælg hvilken version af Debian-Installer der skal bruges:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabil udgave. Dette vil installere Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -321,7 +302,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -329,7 +310,7 @@ msgstr ""
 "Det anbefales, at du tjekker for kendte uhensigtighedsmæssigheder før brug "
 "af en daglig kompilering (kun på engelsk). Ønsker du at gøre det nu?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -337,37 +318,37 @@ msgstr ""
 "De følgende parametre vil blive brugt. Ændr IKKE nogen af disse med mindre "
 "du ved hvad du laver."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxyindstillinger (vært:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Placering af boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Base-URL for netbootbilleder (linux og initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Fejl"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Fejl: Kunne ikke kopiere $0 til $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Kontrollerer GPG-signatur på $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Den hentede $0-fil er ikke troværdig! Afbryder."
 
@@ -375,51 +356,51 @@ msgstr "Den hentede $0-fil er ikke troværdig! Afbryder."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "Uens kontrolsummer for $0/$2. Fik $1 men forventede $4. Afbryder."
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Beregner kontrolsum for $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Opretter $0"
 
 # engelsk fejl, hvad er det for et ord preseeding (måske preceding)
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Tilføjer forudgående information til $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Fejl: Kunne ikke køre $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Deaktiverer NTFS-komprimering i bootstrapfiler"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrerer i NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrerer i BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Fejl: Kunne ikke fortolke uddata fra bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Fejl: $0 blev ikke fundet. Er dette virkelig Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "MEGET VIGTIG BEMÆRKNING:\\n\\n"
 
@@ -429,7 +410,7 @@ msgstr "MEGET VIGTIG BEMÆRKNING:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -439,7 +420,7 @@ msgstr ""
 "bekræftelse, vil dette program genstarte Windows i DOS-tilstand, og "
 "automatisk indlæse den næste del af installationsprocessen.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -449,7 +430,7 @@ msgstr ""
 "næste genstart vil du blive spurgt, hvorvidt du ønsker at starte Windows "
 "eller fortsætte med installationsprocessen.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -467,12 +448,6 @@ msgstr ""
 "valgt at beholde Windows på din harddisk), kan du afinstallere denne "
 "indlæser via Windowsdialogen Tilføj/Fjern programmer i kontrolpanelet."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Ønsker du at genstarte nu?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Skrivebordsmiljø:"
-
-#~ msgid "None"
-#~ msgstr "Ingen"
diff --git a/l10n/po/de.po b/l10n/po/de.po
index 48893cc..bf4e4ec 100644
--- a/l10n/po/de.po
+++ b/l10n/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.6.90\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-03-07 20:49+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -264,56 +264,37 @@ msgid "Text install"
 msgstr "Installation im Textmodus"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "%s wird heruntergeladen"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Verbindungsaufbau ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "Sekunde"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "Minute"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "Stunde"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "n"
-
+#. Former values:
+#. "%d kB (%d%%) von %d kB bei %d.%01d kB/s"
+#. " (%d %s%s verbleibend)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%d kB (%d%%) von %d kB bei %d.%01d kB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s verbleibend)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr ""
 "Wählen Sie die Version des Debian-Installers, die verwendet werden soll:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabile Veröffentlichung. Damit wird Debian »Stable« installiert."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -327,7 +308,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -336,7 +317,7 @@ msgstr ""
 "bevor Sie einen täglichen Build verwenden. Allerdings ist diese Seite nur "
 "auf Englisch verfügbar (»Known issues«). Möchten Sie dies jetzt tun?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -344,38 +325,38 @@ msgstr ""
 "Die folgenden Parameter werden benutzt. Ändern Sie NICHTS, falls Sie nicht "
 "wissen, was Sie tun."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxy-Einstellungen (Rechner:Port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Speicherort von boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr ""
 "Basis-URL für die Netzinstallations-(netboot-)Images (linux und initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Fehler"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Fehler: Kopieren von $0 nach $1 fehlgeschlagen."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Überprüfen der GPG-Signatur von $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Der heruntergeladenen Datei $0 kann nicht vertraut werden! Abbruch."
 
@@ -383,7 +364,7 @@ msgstr "Der heruntergeladenen Datei $0 kann nicht vertraut werden! Abbruch."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Prüfsummen für $0/$2 stimmen nicht überein. $1 erhalten, hingegen wurde $4 "
@@ -392,43 +373,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Berechnen der Prüfsumme für $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "$0 wird erzeugt"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Voreinstellungsinformationen werden zu $0 hinzugefügt"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Fehler: $0 kann nicht ausgeführt werden."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "NTFS-Komprimierung in den bootstrap-Dateien wird deaktiviert."
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrierung in NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrierung in BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Fehler: Ausgabe von bcdedit.exe konnte nicht ausgewertet werden."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Fehler: $0 nicht gefunden. Ist dies wirklich Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "SEHR WICHTIGER HINWEIS:\\n\\n"
 
@@ -438,7 +419,7 @@ msgstr "SEHR WICHTIGER HINWEIS:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -448,7 +429,7 @@ msgstr ""
 "Bestätigung wird dieses Programm Windows im DOS-Modus neu starten und "
 "automatisch den nächsten Schritt des Installationsprozesses laden.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -458,7 +439,7 @@ msgstr ""
 "nächsten Start wird Ihnen die Auswahl geboten, ob Sie Windows starten oder "
 "mit dem Installationsprozess fortfahren möchten.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -477,12 +458,6 @@ msgstr ""
 "haben), können Sie dieses Ladeprogramm mit dem »Programme Ändern/Entfernen«-"
 "Dialog in der Windows-Systemsteuerung deinstallieren."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Möchten Sie jetzt das System neu starten?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Grafische Arbeitsoberfläche:"
-
-#~ msgid "None"
-#~ msgstr "Keine"
diff --git a/l10n/po/dz.po b/l10n/po/dz.po
index a6d9e56..dff31f4 100644
--- a/l10n/po/dz.po
+++ b/l10n/po/dz.po
@@ -287,6 +287,9 @@ msgstr "ཆུ་ཚོད་"
 msgid "s"
 msgstr "ཨེསི་"
 
+#. Former values:
+#. "%dkB (%d%%) of %dkB at %d.%01dkB/s"
+#. "(%d %s%s ལྷག་ལུས་)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -466,15 +469,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "ཁྱོད་ཀྱིས་ ད་ལྟོ་ར་ ལོག་བུཊི་འབད་ནི་ཨིན་ན་?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "ཌེཀསི་ཊོཔ་མཐའ་འཁོར་:"
-
-#~ msgid "None"
-#~ msgstr "ཅི་མེད་"
-
-#~ msgid "Debian Installer"
-#~ msgstr "ཌི་བི་ཡཱན་ གཞི་བཙུགས་པ་"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Debconf སྔ་གོང་གཞི་བཙུགས་གྲལ་ཐིག་:"
diff --git a/l10n/po/el.po b/l10n/po/el.po
index c682b80..127b0d0 100644
--- a/l10n/po/el.po
+++ b/l10n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-25 13:05+0000\n"
 "Last-Translator: Vasileiou Thomas <thomas-v@wildmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -267,58 +267,39 @@ msgid "Text install"
 msgstr "Εγκατάσταση κειμένου"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Λήψη %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Σύνδεση ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "second"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minute"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "hour"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) από %dkB με %d.%01dkB/s"
+#. " (απομένουν %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) από %dkB με %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (απομένουν %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr ""
 "Επιλέξτε την έκδοση του Debian-Installer που θέλετε να χρησιμοποιήσετε:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr ""
 "Σταθερή έκδοση.  Αυτή θα εγκαταστήσει την \"σταθερή\" (\"stable\") διανομή "
 "του Debian."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -332,7 +313,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -340,7 +321,7 @@ msgstr ""
 "Συνιστάται να ελέγξετε για όποια γνωστά προβλήματα πριν χρησιμοποιήσετε μια "
 "έκδοση ημέρας. Θα θέλατε να το κάνετε τώρα;"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -348,37 +329,37 @@ msgstr ""
 "Θα χρησιμοποιηθούν οι ακόλουθες παραμέτροι. ΜΗΝ αλλάξετε οποιαδήποτε από "
 "αυτές αν δεν γνωρίζετε ακριβώς τι κάνετε."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Ρυθμίσεις proxy (host:port)"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Τοποθεσία του boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Βασικό URL για εικόνες netboot (linux και initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Σφάλμα: αποτυχία αντιγραφής του $0 στο $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Έλεγχος της υπογραφής GPG του $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr ""
 "Το αρχείο $0 που κατέβηκε δεν είναι αξιόπιστο! Τερματισμός της εγκατάστασης."
@@ -387,7 +368,7 @@ msgstr ""
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Ασυμφωνία checksum μεταξύ $0/$2. Έλαβα $1 ενώ περίμενα $4. Τερματισμός της "
@@ -396,45 +377,45 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Υπολογισμός του checksum για το $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Δημιουργία $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Παράθεση πληροφορίας προρυθμίσεων (preseeding) στο $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Σφάλμα: αδύνατη η εκτέλεση του $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Απενεργοποίηση συμπίεσης NTFS στα αρχεία bootstrap"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Εγγραφή στο NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Εγγραφή στο BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Σφάλμα: αποτυχία σύνθεσης (parsing) της εξόδου του bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Σφάλμα: Δεν βρέθηκε το $0. Πρόκειται πράγματι για την έκδοση "
 "$windows_version των Windows;"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ΠΟΛΥ ΣΗΜΑΝΤΙΚΗ ΠΑΡΑΤΗΡΗΣΗ:\\n\\n"
 
@@ -444,7 +425,7 @@ msgstr "ΠΟΛΥ ΣΗΜΑΝΤΙΚΗ ΠΑΡΑΤΗΡΗΣΗ:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -455,7 +436,7 @@ msgstr ""
 "κατάσταση DOS και θα φορτώσει αυτόματα το επόμενο μέρος της διαδικασίας "
 "εγκατάστασης.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -465,7 +446,7 @@ msgstr ""
 "Στη διάρκεια της επόμενης εκκίνησης θα ερωτηθείτε κατά πόσον θέλετε να "
 "εκκινήσετε τα Windows ή να συνεχίσετε με τη διαδικασία εγκατάστασης.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -485,12 +466,6 @@ msgstr ""
 "σας), μπορείτε να απεγκαταστήσετε τον φορτωτή εγκατάστασης μέσω του "
 "παραθύρου Add/Remove Programs των Windows στον Πίνακα Ελέγχου."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Θέλετε να επανεκκινήσετε το σύστημα τώρα;"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Περιβάλλον γραφείου:"
-
-#~ msgid "None"
-#~ msgstr "Κανένα"
diff --git a/l10n/po/eo.po b/l10n/po/eo.po
index 41586df..40b2b9c 100644
--- a/l10n/po/eo.po
+++ b/l10n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32_loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-26 17:34-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
@@ -258,56 +258,37 @@ msgid "Text install"
 msgstr "Teksta instalado"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Elshutado de %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Konektado ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekundo"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuto"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "horo"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "j"
-
+#. Former values:
+#. "%dkB (%d%%) de %dkB je %d.%01dkB/s"
+#. " (%d %s%s restas)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) de %dkB je %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s restas)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Elektu la version de Debian-Instalilo por uzi:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr ""
 "Stabila eldono. Tio chi instalos Debian kun nivelo \"stabila\" (stable)."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -320,7 +301,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -328,7 +309,7 @@ msgstr ""
 "Oni rekomendas ke vi kontrolu konatajn problemojn antau ol uzi chiutagan "
 "kompiladon. Chu vi deziras fari tion nun? (nur angle)"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -336,37 +317,37 @@ msgstr ""
 "La jenaj parametroj estos uzataj. NE shanghu iun ajn el ili krom se vi bone "
 "scias kion vi faras."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Prokurilaj agordoj (gastiganto:pordo)"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Loko de 'boot.ini':"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Baza URL por disk-kopiajhoj 'netboot' ('linux' kaj 'initrd.gz'):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Eraro"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Eraro: malsukceso por kopii $0 al $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Kontrolado de subskribo GPG che $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "La elshutita dosiero $0 ne estas fidinda! Ni chesigas."
 
@@ -374,7 +355,7 @@ msgstr "La elshutita dosiero $0 ne estas fidinda! Ni chesigas."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Kontrolsuma malkongruo por $0/$2. Ni havis $1 dum ni atendis $4. Ni chesigas."
@@ -382,44 +363,44 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Komputado de kontrolsumo por $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Kreado de $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Postmetado de \"antausema\" (preseeding) informaro al $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Eraro: ne eblas lanchi $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Malebligado de kompaktigo NTFS en ekshargaj dosieroj"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrado de NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrado en BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Eraro: malsukceso por analizi la eligon de 'bcdedit.exe'."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Eraro: $0 ne trovita. Chu fakte tio chi estas Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "TRE GRAVA RIMARKIGO:\\n\\n"
 
@@ -429,7 +410,7 @@ msgstr "TRE GRAVA RIMARKIGO:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -439,7 +420,7 @@ msgstr ""
 "konfirmo, tiu chi programo reshargos je Windows per reghimo DOS, kaj "
 "automate lanchos la venontan parton de la instal-procezo.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -449,7 +430,7 @@ msgstr ""
 "ekshargo, vi estos pridemandata chu vi volas lanchi Windows au daurigi la "
 "instal-procezon.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -468,12 +449,6 @@ msgstr ""
 "dialogo de Windows 'Aldoni/Forigi Programojn', en la Stir-Panelo (Control "
 "Panel)."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Chu vi volas reshargi nun?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Labortabla medio:"
-
-#~ msgid "None"
-#~ msgstr "Nenio"
diff --git a/l10n/po/es.po b/l10n/po/es.po
index 69a9738..35ed6a8 100644
--- a/l10n/po/es.po
+++ b/l10n/po/es.po
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-01-04 01:36+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -295,55 +295,36 @@ msgid "Text install"
 msgstr "Instalador de texto"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Descargando %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Conectando..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "segundo"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuto"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "hora"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) de %dkB a %d.%01dkB/s"
+#. " (faltan %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) de %dkB a %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (faltan %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Seleccione la versión del instalador de Debian a utilizar:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Publicación estable. Esta opción instalará Debian «estable»."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -356,7 +337,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -364,7 +345,7 @@ msgstr ""
 "Se recomienda que consulte los problemas conocidos antes de utilizar la "
 "compilación diaria. ¿Desea hacerlo ahora?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -372,37 +353,37 @@ msgstr ""
 "Se utilizarán los parámetros mostrados a configuración. NO cambie ninguno de "
 "estos valores a no ser que sepa lo que está haciendo."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Configuración de proxy (sistema:puerto):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Ubicación de «boot.ini»:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL base para las imágenes de arranque por red (linux e initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Error"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Error: no se ha podido copiar $0 a $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Comprobando la firma GPG de $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "¡No se puede confiar en el archivo descargado $0! Interrumpiendo."
 
@@ -410,7 +391,7 @@ msgstr "¡No se puede confiar en el archivo descargado $0! Interrumpiendo."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Fallo en la suma de control de $0/$2. Se obtuvo $1 cuando se esperaba $4. "
@@ -419,44 +400,44 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Calculando la suma de control para $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Generando $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Añadiendo información de preconfiguración a $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Error: no se ha podido ejecutar $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Deshabilitando la compresión NTFS en los ficheros de arranque"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrando en NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrando en BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Error: no se ha podido tratar la salida de «bcdedit.exe»."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Error: no se encontró $0. ¿Es esta la versión $windows_version de Windows?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "AVISO MUY IMPORTANTE\\n\\n"
 
@@ -466,7 +447,7 @@ msgstr "AVISO MUY IMPORTANTE\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -476,7 +457,7 @@ msgstr ""
 "reiniciará en modo DOS de Windows y cargará automáticamente la siguiente "
 "parte del proceso de instalación después de su confirmación.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -486,7 +467,7 @@ msgstr ""
 "preguntará en su siguiente arranque si quiere arrancar Windows o continuar "
 "con el proceso de instalación.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -505,18 +486,6 @@ msgstr ""
 "podrá desinstalar el cargador de este instalador a través de la opción de "
 "Windows «Añadir/Eliminar programas» en el Panel de Control."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "¿Desea reiniciar ahora?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Entorno de escritorio:"
-
-#~ msgid "None"
-#~ msgstr "Ninguno"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Instalador de Debian"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Línea de preconfiguración de debconf:"
diff --git a/l10n/po/eu.po b/l10n/po/eu.po
index 1bb0dac..0355dd7 100644
--- a/l10n/po/eu.po
+++ b/l10n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2009-01-05 09:55+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -267,56 +267,37 @@ msgid "Text install"
 msgstr "Testu instalatzailea"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "%s deskargatzen"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Konektatzen..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "segundo"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minutu"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "ordu"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) %dkB-etik %d.%01dkB/s-ra"
+#. " (%d %s%s falta da)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) %dkB-etik %d.%01dkB/s-ra"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s falta da)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Hautatu Debian-Instalatzailearen zein bertsio erabiliko den:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr ""
 "Bertsio egonkorra.  Honek Debian egonkorra (\"stable\") instalatuko du."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -330,7 +311,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -338,7 +319,7 @@ msgstr ""
 "Gomendagarria da arazo ezagunen berri jakitea eguneko eraikina erabili "
 "aurretik.  Hori orain egin nahi duzu?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 #, fuzzy
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
@@ -347,37 +328,37 @@ msgstr ""
 "Debian-instalatzaile kargatzaileak hurrengo parametroez konfiguratuko da. EZ "
 "egin aldaketarik ezarpen hauetan zer egiten ari zaren ziur ez bazaude."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxy ezarpenak (ostalaria:ataka):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "boot.ini fitxategiaren kokalekua:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "netboot irudiarentzat URL oinarria (linux eta initrd.gz)"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Errorea"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Errorea: huts $0 $1 -ra kopiatzean."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr ""
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr ""
 
@@ -385,52 +366,52 @@ msgstr ""
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr ""
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "$0 sortzen"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Aurre-erabakitako informazioa $0-ra gehitzen"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Errorea: ezin da $0 abiarazi."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "NTFS konpresioa ezgaitzen bootstrap fitxategietan"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 #, fuzzy
 msgid "Registering in NTLDR"
 msgstr "Debian-instalatzaile kargatzailea NTLDR-en erregistratzen"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 #, fuzzy
 msgid "Registering in BootMgr"
 msgstr "Debian-instalatzaile kargatzailea BootMgr-en erregistratzen"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Errorea: huts bcdedit.exe irteera analizatzerakoan."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Errorea: $0 ez da aurkitu. Benetan hau Windows $windows_version da?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "OHAR OSO GARRANTZITSUA:\\n\\n"
 
@@ -440,7 +421,7 @@ msgstr "OHAR OSO GARRANTZITSUA:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 #, fuzzy
 msgid ""
 "The second stage of this install process will now be started.  After your "
@@ -451,7 +432,7 @@ msgstr ""
 "ondoren Windows DOS moduan abiarazi eta automatikoki Debian instalatzailea "
 "kargatuko du programa honek.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 #, fuzzy
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
@@ -463,7 +444,7 @@ msgstr ""
 "galdetuko zaizu. Debian Instalatzailea hautatu instalazio prozesuarekin "
 "aurrera jarraitzeko.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -482,19 +463,6 @@ msgstr ""
 "Windows mantentzea erabaki baduzu), Debian Instalatzaile kargatzailea "
 "Windows-eko Kontrol Paneleko Programak gehitu edo kentzeko morroiaren bidez."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Orain berrabiarazi nahi al duzu?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Mahaigain ingurunea:"
-
-#~ msgid "None"
-#~ msgstr "Batez"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian instalatzailea"
-
-#~ msgid "Error: boot.ini not found.  Is this really Windows $windows_version?"
-#~ msgstr ""
-#~ "Errorea: boot.ini ez da aurkitu.  Hau benetan Windows $windows_version da?"
diff --git a/l10n/po/fa.po b/l10n/po/fa.po
index 9943fe3..f23f5ee 100644
--- a/l10n/po/fa.po
+++ b/l10n/po/fa.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fa\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-09-29 00:00+0000\n"
 "Last-Translator: Hamid <hamid.r1988@gmail.com>\n"
 "Language-Team: debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
@@ -251,55 +251,36 @@ msgid "Text install"
 msgstr "نصب متنی"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "دریافت %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "در حال اتصال ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "ثانیه"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "دقیقه"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "ساعت"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) of %dkB at %d.%01dkB/s"
+#. " (%d %s%s باقیمانده)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) of %dkB at %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s باقیمانده)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "انتخاب کنید کدام نسخه از نصاب دبیان استفاده شود:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "نسخه پایدار. دبیان \"پایدار\" نصب خواهد شد."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -312,7 +293,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -320,7 +301,7 @@ msgstr ""
 "پیشنهاد می‌شود قبل از استفاده از نسخهٔ روزانه، با مسائلی که ممکن است اتفاق "
 "بیفتد آشنا باشید. مایلید اینکار را الان انجام دهید ؟"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -328,38 +309,38 @@ msgstr ""
 "پارامترهای زیر استفاده خواهد شد. لطفا هیچکدام از آنها را تغییر ندهید، مگر "
 "اینکه از کار خود مطمئن باشید."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "تنظیمات پراکسی (host:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "محل فایل boot.ini:"
 
 # بخاطر بهم‌ریختگی متن فارسی netboot را نت‌بوت نوشتم.
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "مسیر پایه برای ایمیج‌های نت‌بوت (linux و initrd.gz)"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "خطا"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "خطا: انتقال $0 به $1 شکست خورد."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "بررسی امضای GPG بر روی $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "دریافت فایل $0 مطمئن نیست! عملیات قطع شد."
 
@@ -367,7 +348,7 @@ msgstr "دریافت فایل $0 مطمئن نیست! عملیات قطع شد."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "در کد تشخصی خطا برای $0/$2 ناهمگونی دیده شده. وقتی انتظار برای $4 بود، $1 "
@@ -376,43 +357,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "محاسبهٔ کد تشخصی خطا برای $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "ایجاد $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "در حال اضافه کردن اطلاعات بدست آمده به $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "خطا: امکان اجرای $0 وجود ندارد."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "غیرفعال کردن ویژگی فشرده‌سازی NTFS در فایل‌های bootstrap"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "در حال ثبت در NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "در حال ثبت در BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "خطا: آنالیز خروجی bcdedit.exe با شکست مواجه شد."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "خطا: $0 پیدا نشد. آیا ویندوز فعلی نسخهٔ $windows_version است ؟"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "** توصیه خیلی مهم** :\\n\\n"
 
@@ -422,7 +403,7 @@ msgstr "** توصیه خیلی مهم** :\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -432,7 +413,7 @@ msgstr ""
 "را در مد DOS ریستارت می‌کند و بصورت اتوماتیک مرحله بعدی نصب را بارگزاری خواهد "
 "کرد.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -441,7 +422,7 @@ msgstr ""
 "نیاز است برای ادامهٔ نصب سیستم را ریبوت کنید. در هنگام بوت شدن بعدی سیستم، از "
 "شما سوال خواهد شد که مایل به اجرای ویندوز هستید یا مراحل نصب ادامه پیدا کند."
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -459,12 +440,6 @@ msgstr ""
 "دیسک باقی بماند)، شما می‌توانید این لودر را از قسمت Add/Remove Programs "
 "ویندوز حذف نمائید."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "آیا مایل هستید اکنون سیستم از نو راه اندازی شود؟"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "محیط میزکار:"
-
-#~ msgid "None"
-#~ msgstr "هیچ"
diff --git a/l10n/po/fi.po b/l10n/po/fi.po
index 2f1ba68..27848f4 100644
--- a/l10n/po/fi.po
+++ b/l10n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-22 00:18+0200\n"
 "Last-Translator: Tommi Vainikainen <tvainika@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -255,56 +255,36 @@ msgid "Text install"
 msgstr "Tekstiasennus"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Ladataan kohdetta %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Yhdistetään..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekunti"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuutti"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "tunti"
-
-# Taitaa toimia tässä taivutuksessa näinkin vaikka on ihan kamala
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "a"
-
+#. Former values:
+#. "%d kt (%d %%) / %d kt nopeudella %d,%01d kt/s"
+#. " (%d %s%s jäljellä)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%d kt (%d %%) / %d kt nopeudella %d,%01d kt/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s jäljellä)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Valitse mitä versiota Debian-asentimesta haluat käyttää:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Vakaa julkaisu: Tämä asentaa version Debian \"vakaa\" (stable)."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -317,7 +297,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -325,7 +305,7 @@ msgstr ""
 "On suositeltavaa tarkistaa tunnettuja virhetapauksia (vain englanniksi) "
 "ennen päivittäisen käännöksen käyttöä. Haluatko tehdä näin nyt?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -333,37 +313,37 @@ msgstr ""
 "Käytetään seuraavia parametreja. ÄLÄ vaihda mitään näistä ellet tiedä mitä "
 "olet tekemässä."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Välipalvelinasetukset (nimi:portti):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Tiedoston boot.ini sijainti:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Urlin perusosa netboot-vedoksille (linux ja initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Virhe"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Virhe: tiedoston $0 kopiointi hakemistoon $1 epäonnistui."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Tarkistetaan GPG-allekirjoitusta tiedostolle $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Ladattuun tiedostoon $0 ei voi luottaa! Keskeytetään."
 
@@ -371,7 +351,7 @@ msgstr "Ladattuun tiedostoon $0 ei voi luottaa! Keskeytetään."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Tarkistussumma ei täsmää kohteelle $0/$2. Laskettiin $1 mutta\n"
@@ -380,43 +360,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Lasketaan tarkistussummaa tiedostolle $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Luodaan $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Lisätään esivalintatiedot kohteeseen $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Virhe: Komentoa $0 ei voi suorittaa."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Poistetaan NTFS-pakkaus käynnistystiedostoilta"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Rekisteröidään NTLDR:ään"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Rekisteröidään BootMgr:ään"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Virhe: bcdedit.exe:n tulosteen jäsennys epäonnistui"
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Virhe: $0 ei löydy. Onko tämä varmasti Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ERITTÄIN TÄRKEÄ HUOMAUTUS:\\n\\n"
 
@@ -426,7 +406,7 @@ msgstr "ERITTÄIN TÄRKEÄ HUOMAUTUS:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -436,7 +416,7 @@ msgstr ""
 "tämä ohjelma uudelleenkäynnistää Windowsin DOS-tilassa, ja lataa "
 "automaattisesti asennusprosessin seuraavan vaiheen.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -446,7 +426,7 @@ msgstr ""
 "uudelleenkäynnistyksessä sinulta kysytään haluatko käynnistää Windowsin "
 "vaiko jatkaa asennusprosessia.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -464,18 +444,6 @@ msgstr ""
 "pitää Windowsin levyllä), voit poistaa lataimen Windowsissa Ohjauspaneelin "
 "(Control Panel) kohdasta Lisää tai poista sovelluksia (Add/Remove Programs)."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Haluatko uudelleenkäynnistää nyt?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Työpöytäympäristö:"
-
-#~ msgid "None"
-#~ msgstr "Ei mitään"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian-asennin"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Debconf-esiasetusrivi:"
diff --git a/l10n/po/fr.po b/l10n/po/fr.po
index a4663c3..58f54ed 100644
--- a/l10n/po/fr.po
+++ b/l10n/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-09-28 06:02+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -260,55 +260,36 @@ msgid "Text install"
 msgstr "Installation en mode texte"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Téléchargement de %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Connexion..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "seconde"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minute"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "heure"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%d ko (%d%%) sur %d ko à %d.%01d ko/s"
+#. " (%d %s%s restant)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%d ko (%d%%) sur %d ko à %d.%01d ko/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s restant)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Version de l'installateur Debian à utiliser :"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Version stable : installera la branche « stable » de Debian"
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -321,7 +302,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -329,7 +310,7 @@ msgstr ""
 "Il est recommandé de vérifier les problèmes connus avant d'installer la "
 "version du jour. Voulez-vous effectuer ce contrôle maintenant ?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -337,37 +318,37 @@ msgstr ""
 "Les paramètres suivants vont être utilisés. Vous ne devriez pas les modifier "
 "à moins d'avoir la certitude que cela est nécessaire."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Réglage du mandataire (« proxy ») (hôte:port) :"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Emplacement du fichier « boot.ini » :"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL de base pour les images netboot (linux et initrd.gz) :"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Erreur"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Erreur : échec de la copie de $0 sur $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Vérification de la signature GPG sur $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Le fichier $0 n'est pas digne de confiance ! Abandon."
 
@@ -375,7 +356,7 @@ msgstr "Le fichier $0 n'est pas digne de confiance ! Abandon."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Erreur de somme de contrôle pour $0/$2. $1 a été obtenu alors que $4 était "
@@ -384,45 +365,45 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Calcul de la somme de contrôle pour $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Création de $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Ajout des information de préconfiguration à $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Erreur : impossible d'exécuter $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Désactivation de la compression NTFS sur les fichiers d'amorçage"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Enregistrement dans NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Enregistrement dans BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Erreur : impossible d'analyser la sortie de bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Erreur: $0 n'existe pas. Ce système est-il vraiment Windows "
 "$windows_version ?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "NOTE TRÈS IMPORTANTE :\\n\\n"
 
@@ -432,7 +413,7 @@ msgstr "NOTE TRÈS IMPORTANTE :\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -442,7 +423,7 @@ msgstr ""
 "Après confirmation, ce programme va redémarrer Windows en mode DOS et lancer "
 "automatiquement l'étape suivante du processus d'installation.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -452,7 +433,7 @@ msgstr ""
 "prochain démarrage, vous pourrez choisir de démarrer Windows ou de "
 "poursuivre le processus d'installation.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -471,15 +452,6 @@ msgstr ""
 "le chargeur du programme d'installation en utilisant « Ajout/suppression de "
 "programmes » du Panneau de Configuration."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Voulez-vous redémarrer maintenant ?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Environnement de bureau :"
-
-#~ msgid "None"
-#~ msgstr "Aucun"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Programme d'installation de Debian"
diff --git a/l10n/po/ga.po b/l10n/po/ga.po
index 09821a8..08eb4a4 100644
--- a/l10n/po/ga.po
+++ b/l10n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-22 14:30-0600\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -258,57 +258,36 @@ msgid "Text install"
 msgstr "Suiteáil téacs"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "%s á íosluchtú"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Ag ceangal..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "soicind"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "nóiméad"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "uair"
-
-# " " space here is correct for Irish - kps
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) as %dkB ag %d.%01dkB/s"
+#. " (%d %s%sfágtha)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) as %dkB ag %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
-# no space before fágtha is correct for Irish, see two strings prev.
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%sfágtha)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Roghnaigh an leagan de Shuiteálaí Debian le húsáid:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Leagan cobhsaí.  Suiteálfaidh sé seo \"Debian stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -321,7 +300,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -329,7 +308,7 @@ msgstr ""
 "Moltar duit aon fhadhbanna ar eolas a lorg sula mbainfidh tú úsáid as an "
 "leagan laethúil. An bhfuil fonn ort é seo a dhéanamh anois?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -337,37 +316,37 @@ msgstr ""
 "Úsáidfear na paraiméadair seo a leanas.  NÁ hathraigh iad seo mura bhfuil "
 "eolas mór agat ar an scéal."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Socruithe seachfhreastalaí (óstríomhaire:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Suíomh boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL bunaidh le haghaidh íomhánna netboot (linux agus initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Earráid"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Earráid: theip ar chóipeáil $0 go $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Síniú GPG ar $0 á dhearbhú."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Níl muinín againn as an gcomhad íosluchtaithe $0! Á Thobscor."
 
@@ -375,7 +354,7 @@ msgstr "Níl muinín againn as an gcomhad íosluchtaithe $0! Á Thobscor."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Suim sheiceála mhícheart ar $0/$2. Fuarthas $1 cé go rabhthas ag súil le $4. "
@@ -384,44 +363,44 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Suim sheiceála á áireamh le haghaidh $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "$0 á ghiniúint"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Faisnéis réamhshíolaithe á hiarcheangal le $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Earráid: ní féidir $0 a rith."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Comhbhrú NTFS á dhíchumasú sna comhaid tosaithe"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Ag clárú le NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Ag clárú le BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Earráid: níorbh fhéidir aschur bcdedit.exe a pharsáil."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Earráid: $0 gan aimsiú.  An bhfuil Windows $windows_version agat i ndáiríre?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "FÓGRA AN-TÁBHACHTACH:\\n\\n"
 
@@ -431,7 +410,7 @@ msgstr "FÓGRA AN-TÁBHACHTACH:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -441,7 +420,7 @@ msgstr ""
 "dheimhniú, atosóidh an ríomhchlár seo Windows i mód DOS, agus luchtóidh sé "
 "an chéad chéim eile sa phróiseas suiteála go huathoibríoch.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -451,7 +430,7 @@ msgstr ""
 "suiteála.  Le linn an chéad tosú eile, fiafrófar díot an bhfuil fonn ort "
 "Windows a thosú nó dul ar aghaidh leis an bpróiseas suiteála.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -469,12 +448,6 @@ msgstr ""
 "dhiosca), is féidir leat an luchtóir seo a dhíshuiteáil tríd an dialóg "
 "Windows \"Add/Remove Programs\" sa Phainéal Rialúcháin."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "An bhfuil fonn ort an ríomhaire a atosú anois?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Timpeallacht deisce:"
-
-#~ msgid "None"
-#~ msgstr "Faic"
diff --git a/l10n/po/gl.po b/l10n/po/gl.po
index d449182..8334830 100644
--- a/l10n/po/gl.po
+++ b/l10n/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader_l10n_po_gl\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-03-08 17:11+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -264,55 +264,36 @@ msgid "Text install"
 msgstr "Instalación en modo texto"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Descargando %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Conectando..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "segundo"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuto"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "hora"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%d kB (%d%%) de %d kB a %d.%01d kB/s"
+#. " (restan %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%d kB (%d%%) de %d kB a %d.%01d kB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (restan %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Escolla a versión de Debian-Installer a empregar:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Versión estábel. Con isto instalarse Debian «stable»."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -325,7 +306,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -333,7 +314,7 @@ msgstr ""
 "Recoméndase que revise a lista de problemas coñecidos antes de empregar a "
 "compilación diaria. Desexa facelo agora?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -341,37 +322,37 @@ msgstr ""
 "Empregaranse os seguintes parámetros. Non cambie ningún deles a non ser que "
 "saiba o que fai."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Configuración do proxy (servidor:porto):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Localización de boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL base para as imaxes de netboot (linux e initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Erro"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Erro: non foi posíbel copiar $0 a $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Comprobando a sinatura GPG en $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "O ficheiro $0 descargado non é de confianza! Interrompendo."
 
@@ -379,7 +360,7 @@ msgstr "O ficheiro $0 descargado non é de confianza! Interrompendo."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Suma de verificación errónea para $0/$2. Ten $1 cando se agarda $4. "
@@ -388,44 +369,44 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Calculando a suma de verificación para $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Xerando $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Engadindo a información de preconfiguración a $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Erro: non foi posíbel executar $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Desactivando a compresión NTFS nos ficheiros de inicio"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrando en NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrando en BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Erro: non foi posíbel analizar a saída de bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Erro: non se atopou boot.ini. É isto realmente Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "AVISO MOI IMPORTANTE:\\n\\n"
 
@@ -435,7 +416,7 @@ msgstr "AVISO MOI IMPORTANTE:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -445,7 +426,7 @@ msgstr ""
 "que dea o seu consentimento, este programa reiniciará Windows en modo DOS, e "
 "cargará automaticamente a seguinte parte do proceso de instalación.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -455,7 +436,7 @@ msgstr ""
 "preguntaraselle se quere iniciar Windows ou continuar co proceso de "
 "instalación.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -474,15 +455,6 @@ msgstr ""
 "cargador mediante o diálogo «Engadir e retirar programas» no Panel de "
 "control de Windows."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Desexa reiniciar agora?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Contorno de escritorio:"
-
-#~ msgid "None"
-#~ msgstr "Ningún"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Instalador de Debian"
diff --git a/l10n/po/he.po b/l10n/po/he.po
index 3474aba..4523e4a 100644
--- a/l10n/po/he.po
+++ b/l10n/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-01-20 23:55+0200\n"
 "Last-Translator: Lior Kaplan <kaplan@debian.org>\n"
 "Language-Team: Hebrew <>\n"
@@ -253,55 +253,36 @@ msgid "Text install"
 msgstr "התקנה טקסוטאלית"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "מוריד את %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "מתחבר ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "שניות"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "דקות"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "שעות"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) מתוך %dkB במהירות %d.%01dkB/s"
+#. " (%d %s%s נשארו)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) מתוך %dkB במהירות %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s נשארו)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "בחר באיזה גירסה של תוכנית ההתקנה של דביאן להשתמש:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "גירסה יציבה. זה יתקין דביאן \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -313,7 +294,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -321,44 +302,44 @@ msgstr ""
 "מומלץ לבדוק על נושאים ידועים לפני שמשתמשים בבניה יומית. האם תרצה לעשות זאת "
 "כעת?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr ""
 "הפרמטרים הבאים יהיו בשימוש. אל תשנה אותם אלא אם הנך בטוח במה שאתה עושה."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "הגדרות פרוקסי (host:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "מיקום של הקובץ boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "כתובת בסיס עבור תמונות התקנת רשת (קבצי linux ו-initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "שגיאה"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "שגיאה: העתקה של $0 ל-$1 נכשלה."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "בודק חתימות GPG על $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "הקובץ $0 שהורד אינו אמין! מבטל."
 
@@ -366,50 +347,50 @@ msgstr "הקובץ $0 שהורד אינו אמין! מבטל."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "אי התאמה בסכום הבקרה של $0/$2. התקבל $1 כאשר אמור להתקבל $4. מבטל."
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "מחשב את סכום הבקרה עבור $2."
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "יוצר את $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "מוסיף את תשובות מוזנות מראש ל-$0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "שגיאה: לא יכול להריץ את $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "מבטל את דחיסת NTFS בקבצי האתחול"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "נרשם ב-NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "נרשם ב-BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "שגיאה: נכשל לנתח את הפלט של bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "שגיאה: $0 לא נמצא. האם יש לך חלונות מגירסה $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "הודעה חשובה מאוד:\\n\\n"
 
@@ -419,7 +400,7 @@ msgstr "הודעה חשובה מאוד:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -428,7 +409,7 @@ msgstr ""
 "השלב השני של תהליך התקנה זה יתחיל עכשיו. לאחר אישורך, תוכנה זאת תפעיל מחדש "
 "את חלונות במצב דוס, ותעלה אוטומטית את תוכנת ההתקנה.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -437,7 +418,7 @@ msgstr ""
 "אתה צריך להפעיל מחדש את המחשב על מנת להמשיך עם תהליך ההתקנה. במהלך האתחול "
 "הבא, תשאל האם להפעיל את חלונות או להמשיך את תוכנית ההתקנה.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -453,15 +434,6 @@ msgstr ""
 "בחרת להשאיר את חלונות), תוכל להסיר את תוכנה זאת בעזרה ממשק ניהול התוכנות של "
 "חלונות בלוח הבקרה."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "לאתחל את המחשב עכשיו?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "סביבה גרפית:"
-
-#~ msgid "None"
-#~ msgstr "ללא"
-
-#~ msgid "Debian Installer"
-#~ msgstr "תוכנית ההתקנה של דביאן"
diff --git a/l10n/po/hr.po b/l10n/po/hr.po
index b41594c..3c966ec 100644
--- a/l10n/po/hr.po
+++ b/l10n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-03-22 02:45+0100\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Hrvatski <lokalizacija@linux.hr>\n"
@@ -258,55 +258,36 @@ msgid "Text install"
 msgstr "Tekstualna instalacija"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Prenosim %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Spajanje ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekundi"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuta"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "sati"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) od %dkB pri %d.%01dkB/s"
+#. " (preostaje %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) od %dkB pri %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (preostaje %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Odaberite inačicu Debian-Instalera:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabilno izdanje. Ovo će instalirati Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -319,7 +300,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -328,7 +309,7 @@ msgstr ""
 "verzije. Želite li to sada napraviti? Informacije o poznatim problemima su "
 "na engleskom jeziku."
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -336,37 +317,37 @@ msgstr ""
 "Primijenit će se sljedeći parametri. Ako ne znate što radite, NEMOJTE "
 "mijenjati nijedan od njih."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxy postavke (host:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Lokacija boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Osnovni URL za netboot snimke (linux i initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Greška"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Greška: neuspjelo kopiranje $0 u $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Provjerava se GPG potpis datoteke $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr ""
 "Preuzetoj datoteci $0 ne može se vjerovati! Instalacija će se prekinuti."
@@ -375,7 +356,7 @@ msgstr ""
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Provjera kontrolne sume neuspješna za $0/$2. Očekivani rezultat je $4, a "
@@ -384,43 +365,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Računa se kontrolna suma datoteke $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Stvara se $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Dodaje se \"preseeding\" informacija u $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Greška: nemoguće pokrenuti $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Onemogućuje se NTFS kompresija u bootstrap datotekama"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registracija u NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registracija u BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Greška: neuspjelo očitavanje izlaza bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Greška: $0 nije pronađen. Je li ovo doista Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "VRLO BITNO UPOZORENJE:\\n\\n"
 
@@ -430,7 +411,7 @@ msgstr "VRLO BITNO UPOZORENJE:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -440,7 +421,7 @@ msgstr ""
 "ovaj program će ponovo pokrenuti Windows u DOS modu, i automatski učitati "
 "sljedeći dio instalacijskog procesa.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -450,7 +431,7 @@ msgstr ""
 "procesom. Tijekom sljedećeg pokretanja sustava, bit ćete upitani želite li "
 "pokrenuti Windows ili nastaviti s postupkom instalacije.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -469,15 +450,6 @@ msgstr ""
 "učitavanje instalera koristeći Windows Add/Remove Programs okvir u Control "
 "Panelu / Kontrolnoj ploči."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Želite li sada ponovo pokrenuti sustav?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Desktop okruženje:"
-
-#~ msgid "None"
-#~ msgstr "Nijedno"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian Instaler"
diff --git a/l10n/po/hu.po b/l10n/po/hu.po
index da09a6b..94bad6b 100644
--- a/l10n/po/hu.po
+++ b/l10n/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-22 08:37+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.d.o>\n"
@@ -248,55 +248,36 @@ msgid "Text install"
 msgstr "Szöveges telepítés"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "%s letöltése"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Kapcsolódás"
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "másodperc"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "perc"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "óra"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%)/%dkB %d.%01dkB/mp-vel"
+#. " (%d %s%s van hátra)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%)/%dkB %d.%01dkB/mp-vel"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s van hátra)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Jelöld ki a Debian-Telepítő használandó változatát:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabil kiadás. Ez telepíti a Debian jelenlegi stabil változatát."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -309,7 +290,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -317,44 +298,44 @@ msgstr ""
 "Ajánljuk, ellenőrizd az ismert hibákat a napi kép használata előtt. "
 "Megteszed most?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr ""
 "Az alábbi paramétereket használjuk. NE módosítsd, ha nem tudod, mit teszel."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxi beállítások (gép:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "A boot.ini helye:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Alap URL a netboot képekhez (linux és initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Hiba"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Hiba: nem tudtam $0-t ide másolni: $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "GPG aláírás ellenőrzése ezen: $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "A letöltött $0 fájl nem megbízható! Leállok."
 
@@ -362,50 +343,50 @@ msgstr "A letöltött $0 fájl nem megbízható! Leállok."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "Eltérő ellenőrzőösszeg ehhez: $0/$2. $1 jött $4 helyett. Leállok."
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Ellenőrzőösszeg kiszámítása ehhez: $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "$0 generálása"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Előíró adatok fűzése a $0 mögé"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Hiba: $0 futtatása sikertelen"
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "NTFS tömörítés kikapcsolása a bootstrap fájlokban"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Bejegyzés az NTLDR-be"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Bejegyzés s a BootMgr-be"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Hiba: a bcdedit.exe kimenet értelmezhetetlen"
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Hiba: nincs $0. Ez tényleg Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "NAGYON FONTOS MEGJEGYZÉS:\\n\\n"
 
@@ -415,7 +396,7 @@ msgstr "NAGYON FONTOS MEGJEGYZÉS:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -424,7 +405,7 @@ msgstr ""
 "Most indul a telepítő folyamat 2. része. Jóváhagyásod által a Windows DOS "
 "módban indul és automatikusan betölti a Telepítő következő részét.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -434,7 +415,7 @@ msgstr ""
 "során mind a Windows újraindítása mind a telepítés folytatása lehetővé válik."
 "\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -452,18 +433,6 @@ msgstr ""
 "eltávolítása pontjával eltávolíthatod ezt a Debian-Telepítő betöltő "
 "programot."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Újraindítod a gépet most?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Asztali környezet:"
-
-#~ msgid "None"
-#~ msgstr "Nincs"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian Telepítő"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Debconf előíró sor:"
diff --git a/l10n/po/id.po b/l10n/po/id.po
index ba8889a..50a4c81 100644
--- a/l10n/po/id.po
+++ b/l10n/po/id.po
@@ -301,6 +301,9 @@ msgstr "jam"
 msgid "s"
 msgstr "s"
 
+#. Former values:
+#. "%dkB (%d%%) dari %dkB pada %d.%01dkB/s"
+#. " (%d %s%s tersisa)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -484,9 +487,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "Apakah anda ingin menyalakan ulang sekarang?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Lingkungan Desktop:"
-
-#~ msgid "None"
-#~ msgstr "Kosong"
diff --git a/l10n/po/is.po b/l10n/po/is.po
index de55cbf..c13dddd 100644
--- a/l10n/po/is.po
+++ b/l10n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader_l10n_po_is\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-12-27 18:47+0000\n"
 "Last-Translator: Sveinn í Felli <sveinki@nett.is>\n"
 "Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
@@ -262,56 +262,37 @@ msgid "Text install"
 msgstr "Textauppsetning"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Næ í %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Tengist ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekúndur"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "mínútur"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "klukkustundir"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) af %dkB með %d.%01dkB/s"
+#. " (%d %s%s eftir)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) af %dkB með %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s eftir)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Veldu hvaða útgáfu af Debian-uppsetningarforritinu eigi að nota:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr ""
 "Stöðug útgáfa.  Þetta mun setja upp stöðugu Debian \"stable\" útgáfuna."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -325,7 +306,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -333,7 +314,7 @@ msgstr ""
 "Mælt er með því að þú athugir með þekkt vandamál áður en daglega útgáfan er "
 "notuð. Viltu gera það núna?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -341,37 +322,37 @@ msgstr ""
 "Eftirfarandi viðföng verða notuð. EKKI BREYTA neinum þeirra nema að þú vitir "
 "hvað þú ert að gera."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Stillingar milliþjóns (hýsivél:gátt):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Staðsetning boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Grunnslóð (URL) netboot ræsidiskmynda (linux og initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Villa"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Villa: mistókst að afrita $0 í $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Athuga GPG undirritun á $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Skránni $0 sem náð var í er ekki hægt að treysta! Hætti."
 
@@ -379,50 +360,50 @@ msgstr "Skránni $0 sem náð var í er ekki hægt að treysta! Hætti."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "Mismunur á gátsummum $0/$2. Fékk $1 en bjóst við $4. Hætti."
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Reikna út gátsummu fyrir $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Bý til $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Bæti forskráningarupplýsingum (preseeding info) við $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Villa: tókst ekki að keyra $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Geri NTFS þjöppun í bootstrap skrám óvirka"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Skrifa inn í NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Skrifa inn í BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Villa: tókst ekki að þátta úttak bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Villa: $0 fannst kki.  Er þetta í alvörunni Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "MJÖG ÁRÍÐANDI ATHUGASEMD:\\n\\n"
 
@@ -432,7 +413,7 @@ msgstr "MJÖG ÁRÍÐANDI ATHUGASEMD:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -442,7 +423,7 @@ msgstr ""
 "staðfest, þá mun þetta forrit endurræsa Windows í DOS-ham og hlaða "
 "sjálfkrafa inn næsta stigi uppsetningarinnar.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -452,7 +433,7 @@ msgstr ""
 "næstu ræsingu verður þú spurð(ur) hvort þú viljir ræsa Windows eða halda "
 "áfram með uppsetningarferlið.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -470,12 +451,6 @@ msgstr ""
 "halda Windows á disknum), þá geturðu hent út þessum hleðsluhugbúnaði með því "
 "að fara í Add/Remove Programs gluggann í Control Panel í Windows."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Viltu endurræsa núna?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Skjáborðsumhverfi:"
-
-#~ msgid "None"
-#~ msgstr "Ekkert"
diff --git a/l10n/po/it.po b/l10n/po/it.po
index 54ae001..13b93b1 100644
--- a/l10n/po/it.po
+++ b/l10n/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-12-30 09:43+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -261,55 +261,36 @@ msgid "Text install"
 msgstr "Installazione testuale"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Scaricamento di %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Connessione..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "secondi"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuti"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "ore"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) su %dkB a %d.%01dkB/s"
+#. " (%d %s%s rimanenti)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) su %dkB a %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s rimanenti)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Scegliere la versione di Debian-Installer da usare:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Versione stabile. Installerà Debian «stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -322,14 +303,14 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
 msgstr ""
 "Verificare i problemi noti prima di usare un «daily build». Consultarli ora?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -337,37 +318,37 @@ msgstr ""
 "Verranno usati i seguenti parametri. Non modificarne alcuno se non si sa "
 "quello che si sta facendo."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Impostazioni del proxy (host:porta):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Posizione di boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL base delle immagini di netboot (linux e initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Errore"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Errore: copia da $0 a $1 non riuscita."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Controllo firma GPG su $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Il file scaricato $0 non può essere verificato. Arresto."
 
@@ -375,51 +356,51 @@ msgstr "Il file scaricato $0 non può essere verificato. Arresto."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "Checksum non corrispondente per $0/$2. Trovato $1, atteso $4. Arresto."
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Calcolo checksum per $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Generazione di $0 in corso"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Aggiunta delle informazione di preseeding a $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Errore: impossibile eseguire $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Rimozione della compressione NTFS dei file di avvio"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrazione in NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrazione in BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Errore: analisi dell'output di bcdedit.exe non riuscita."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Errore: $0 non trovato. La versione di Windows è veramente $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "NOTA MOLTO IMPORTANTE:\\n\\n"
 
@@ -429,7 +410,7 @@ msgstr "NOTA MOLTO IMPORTANTE:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -439,7 +420,7 @@ msgstr ""
 "la conferma, questo programma avvierà Windows in modalità DOS e caricherà "
 "automaticamente la parte successiva del processo d'installazione.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -449,7 +430,7 @@ msgstr ""
 "Durante il prossimo avvio verrà chiesto se lanciare Windows o continuare con "
 "l'installazione.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -467,12 +448,6 @@ msgstr ""
 "tenere Windows sul disco), sarà possibile rimuovere questo loader usando "
 "\"Aggiungi/Rimuovi programmi\" dal pannello di controllo di Windows."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Riavviare ora?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Ambiente desktop:"
-
-#~ msgid "None"
-#~ msgstr "Nessuno"
diff --git a/l10n/po/ja.po b/l10n/po/ja.po
index 3c83413..e7af6d6 100644
--- a/l10n/po/ja.po
+++ b/l10n/po/ja.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.6.14\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-05-30 08:54+0900\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -259,55 +259,36 @@ msgid "Text install"
 msgstr "テキストインストーラ"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "%s をダウンロード中"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "接続しています..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "秒"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "分"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "時間"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "秒"
-
+#. Former values:
+#. "%3$dkB 中 %1$dkB (%2$d%%) at %4$d.%5$01dkB/秒"
+#. " (残り時間 %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%3$dkB 中 %1$dkB (%2$d%%) at %4$d.%5$01dkB/秒"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (残り時間 %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "どのバージョンの Debian インストーラを使うか選んでください:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "安定版リリース。Debian「安定版 (stable)」 をインストールします。"
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -320,7 +301,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -328,7 +309,7 @@ msgstr ""
 "デイリービルドを使う前に既知の問題をチェックすることをお勧めします。今ここで"
 "チェックをしますか?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -336,37 +317,37 @@ msgstr ""
 "以下のパラメータを使用します。何をしているか分からなければ、以下を「変更して"
 "はいけません」"
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "プロキシの設定 (ホスト名:ポート番号):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "boot.ini ファイルの位置:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "netboot イメージ (Linux と initrd.gz) のベース URL:"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "エラー"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "エラー: $0 を $1 にコピーするのに失敗しました。"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "$0 の GPG 署名をチェックしています。"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "ダウンロードした $0 ファイルは、信用することができません! 終了します。"
 
@@ -374,7 +355,7 @@ msgstr "ダウンロードした $0 ファイルは、信用することがで�
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "$0/$2 のチェックサムが一致しません。$4 の筈のところ、$1 になりました。終了し"
@@ -383,44 +364,44 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "$2 のチェックサムを計算中"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "$0 を生成"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "$0 に preseed 情報を追加"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "エラー: $0 を実行できません。"
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "起動用ファイルの NTFS 圧縮を無効にする"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "NTLDR に登録する"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "BootMgr に登録する"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "エラー: bcdedit.exe による出力の解析に失敗しました。"
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "エラー: $0 が見つかりません。これは本当に Windows $windows_version ですか?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "大変重要なお知らせ:\\n\\n"
 
@@ -430,7 +411,7 @@ msgstr "大変重要なお知らせ:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -439,7 +420,7 @@ msgstr ""
 "インストール作業を次の段階に進めます。確認後、このプログラムは Windows を "
 "DOS モードで再起動し、インストールの次の段階を自動的に読み込みます。\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -448,7 +429,7 @@ msgstr ""
 "インストール作業を続けるには再起動をする必要があります。次回の起動時に、"
 "Windows を起動するか、それともンストーラ作業を続けるかを尋ねられます。\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -465,12 +446,6 @@ msgstr ""
 "た (そして Windows をディスクに残しておくことにした) 場合、このツールはコント"
 "ロールパネルの「プログラムの追加と削除」画面からアンインストールできます。"
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "今すぐ再起動しますか?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "デスクトップ環境:"
-
-#~ msgid "None"
-#~ msgstr "なし"
diff --git a/l10n/po/kk.po b/l10n/po/kk.po
index e5bf71b..b4e768c 100644
--- a/l10n/po/kk.po
+++ b/l10n/po/kk.po
@@ -282,6 +282,9 @@ msgstr "сағат"
 msgid "s"
 msgstr " с"
 
+#. Former values:
+#. "%dкБ (%d%%) - %dкБ; жылдамдығы %d,%01dкБ/с"
+#. " (%d %s%s қалды)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -463,12 +466,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "Қайта жүктеуді қазір орындауды қалайсыз ба?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Жұмыс үстелінің ортасы:"
-
-#~ msgid "None"
-#~ msgstr "Жоқ"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian Орнату"
diff --git a/l10n/po/km.po b/l10n/po/km.po
index fe7cbe2..eb0e9f6 100644
--- a/l10n/po/km.po
+++ b/l10n/po/km.po
@@ -276,6 +276,9 @@ msgstr "ម៉ោង"
 msgid "s"
 msgstr "វិ."
 
+#. Former values:
+#. "%dkB (%d%%) នៃ %dkB នៅ %d.%01dkB/s"
+#. " (នៅ​សល់ %d %s%s​)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -449,9 +452,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "តើ​អ្នក​ចង់​ចាប់ផ្ដើម​ឡើងវិញ​ឥឡូវ​ដែរឬទេ ?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "បរិស្ថាន​ផ្ទៃតុ ៖"
-
-#~ msgid "None"
-#~ msgstr "គ្មាន"
diff --git a/l10n/po/ko.po b/l10n/po/ko.po
index b59159b..0b21943 100644
--- a/l10n/po/ko.po
+++ b/l10n/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2014-04-23 05:47+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -252,55 +252,36 @@ msgid "Text install"
 msgstr "텍스트 설치"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "%s 내려받는 중"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "연결하는 중..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "초"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "분"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "시간"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%3$d kB 중 %1$d kB (%2$d%%). 속도 %4$d.%05$1dkB/s"
+#. " (%d %s%s 남았음)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%3$d kB 중 %1$d kB (%2$d%%). 속도 %4$d.%05$1dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s 남았음)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "사용하려는 데비안 설치 프로그램 버전을 선택하십시오:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "안정 릴리스. 데비안 \"stable\"를 설치합니다."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -312,7 +293,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -320,44 +301,44 @@ msgstr ""
 "일일 빌드를 사용하시기 전에 알려진 문제점이 있는지 확인하실 것을 권장합니다. "
 "지금 확인해보시겠습니까?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr ""
 "다음 매개변수를 사용합니다. 잘 모르겠다면 이 매개변수를 바꾸지 마십시오."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "프록시 설정 (호스트:포트번호):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "boot.ini의 위치:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "네트워크 부팅 이미지의 기본 URL(linux와 initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "오류"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "오류: $0을(를) $1(으)로 복사하는데 실패했습니다."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "$0 파일의 GPG 서명을 확인합니다."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "다운로드한 $0 파일은 신뢰할 수 없습니다! 중지합니다."
 
@@ -365,7 +346,7 @@ msgstr "다운로드한 $0 파일은 신뢰할 수 없습니다! 중지합니다
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "$0/$2 파일에 체크섬이 일치하지 않습니다. $4여야 하지만 $1입니다. 중지합니다."
@@ -373,45 +354,45 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "$2 파일의 체크섬을 계산합니다"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "$0 만드는 중"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "선시드 정보를 $0에 추가하는 중"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "오류: $0 실행하지 못합니다."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "부트스트랩 파일의 NTFS 압축을 사용하지 않도록 하는 중"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "NTLDR에 등록하는 중"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "BootMgr에 등록하는 중"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "오류: bcdedit.exe의 출력결과를 처리하는데 실패했습니다."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "오류: $0 파일을 찾을 수 없습니다. 정말 윈도우 $windows_version 버전이 맞습니"
 "까?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "매우 중요한 주의사항:\\n\\n"
 
@@ -421,7 +402,7 @@ msgstr "매우 중요한 주의사항:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -430,7 +411,7 @@ msgstr ""
 "설치 과정의 두번째 단계를 시작합니다. 확인을 하면 윈도우를 DOS 모드에서 다시 "
 "시작하고, 다음 설치 단계를 자동으로 읽어들입니다.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -439,7 +420,7 @@ msgstr ""
 "설치를 계속하려면 다시 시작해야 합니다. 다음 부팅할 때 윈도우를 시작할지, 설"
 "치를 계속할지 질문을 받게 됩니다."
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -456,12 +437,6 @@ msgstr ""
 "다면), 제어판의 프로그램 추가/제거 대화상자에서 이 로더 프로그램을 제거해도 "
 "됩니다."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "지금 다시 시작하시겠습니까?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "데스크탑 환경:"
-
-#~ msgid "None"
-#~ msgstr "없음"
diff --git a/l10n/po/lt.po b/l10n/po/lt.po
index 66b62cb..a0fc868 100644
--- a/l10n/po/lt.po
+++ b/l10n/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader_po_lt\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-06-02 21:10+0300\n"
 "Last-Translator: Rimas Kudelis <rq@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -259,55 +259,36 @@ msgid "Text install"
 msgstr "Tekstinis diegimas"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Parsiunčiama %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Jungiamasi..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sek."
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "min."
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "val."
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%d kB (%d%%) iš %d kB, %d.%01d kB/s"
+#. " (liko %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%d kB (%d%%) iš %d kB, %d.%01d kB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (liko %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Pasirinkite naudotiną „Debian“ įdiegiklio variantą:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabili laida. Įdiegs „Debian stable“."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -320,7 +301,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -328,7 +309,7 @@ msgstr ""
 "Prieš naudojant kasdienį „Debian“ įdiegiklio darinį, rekomenduojama "
 "peržvelgti žinomas problemas. Ar norėtumėte dabar tai atlikti?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -336,37 +317,37 @@ msgstr ""
 "Bus naudojami šie parametrai. NEKEISKITE nė vieno iš jų, nebent tikrai "
 "žinote, ką darote."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Įgaliotojo serverio adresas (kompiuteris:prievadas):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "„boot.ini“ failo vieta:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "„Netboot“ atvaizdžių („linux“ ir „initrd.gz“) bazinis URL:"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Klaida"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Klaida: nepavyko nukopijuoti $0 į $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Tikrinamas failo „$0“ autentiškumas."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Parsiųstas failas „$0“ nepatikimas! Darbas nutraukiamas."
 
@@ -374,7 +355,7 @@ msgstr "Parsiųstas failas „$0“ nepatikimas! Darbas nutraukiamas."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Failo „$0/$2“ kontrolinė suma netinkama. Gautoji – $1, tikėtasi – $4. Darbas "
@@ -383,43 +364,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Skaičiuojama failo „$2“ kontrolinė suma"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Generuojama $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Prie „$0“ pridedama „preseeding“ informacija"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Klaida: nepavyko paleisti „$0“"
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Išjungiamas NTFS suspaudimas „bootstrap“ failams"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registruojamasi NTLDR paleidyklėje"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registruojamasi „BootMgr“ paleidyklėje"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Klaida: nepavyko išanalizuoti „bcdedit.exe“ išvesties."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Klaida: „$0“ nerastas. Ar čia tikrai „Windows $windows_version“?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "LABAI SVARBUS PRANEŠIMAS:\\n\\n"
 
@@ -429,7 +410,7 @@ msgstr "LABAI SVARBUS PRANEŠIMAS:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -439,7 +420,7 @@ msgstr ""
 "sistema bus perleista DOS veiksena ir automatiškai prasidės tolesnė įdiegimo "
 "dalis.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -449,7 +430,7 @@ msgstr ""
 "Kompiuteriui kraunantis, Jūsų bus paklausta, ar paleisti „Windows“, ar tęsti "
 "įdiegimo procesą.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -466,15 +447,6 @@ msgstr ""
 "įdiegimą, galite šį įkėliklį pašalinti, pasinaudodami „Windows“ Valdymo "
 "pulto elementu „Pridėti ir šalinti programas“ („Add/Remove Programs)."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Ar norite perleisti kompiuterį dabar?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Darbo aplinka:"
-
-#~ msgid "None"
-#~ msgstr "Jokios"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian diegiklis"
diff --git a/l10n/po/lv.po b/l10n/po/lv.po
index cdd605f..8e60815 100644
--- a/l10n/po/lv.po
+++ b/l10n/po/lv.po
@@ -286,6 +286,9 @@ msgstr "stunda"
 msgid "s"
 msgstr "s"
 
+#. Former values:
+#. "%dkB (%d%%) no %dkB ar %d.%01dkB/s"
+#. " (%d %s%s atlicis)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -464,9 +467,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "Vai vēlaties pārstartēt tagad?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Darbvirsmas vide:"
-
-#~ msgid "None"
-#~ msgstr "Neviena"
diff --git a/l10n/po/messages.pot b/l10n/po/messages.pot
index a911c64..edcd685 100644
--- a/l10n/po/messages.pot
+++ b/l10n/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -221,55 +221,33 @@ msgid "Text install"
 msgstr ""
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr ""
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr ""
 
-#: win32-loader.c:122
-msgid "second"
-msgstr ""
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr ""
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr ""
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr ""
-
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
 msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr ""
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr ""
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr ""
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -279,49 +257,49 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
 msgstr ""
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr ""
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr ""
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr ""
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr ""
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr ""
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr ""
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr ""
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr ""
 
@@ -329,50 +307,50 @@ msgstr ""
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr ""
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr ""
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr ""
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr ""
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr ""
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr ""
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr ""
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr ""
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -382,21 +360,21 @@ msgstr ""
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automatically load the next part of the install process.\\n\\n"
 msgstr ""
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
 "continue with the install process.\\n\\n"
 msgstr ""
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -407,6 +385,6 @@ msgid ""
 "the Windows Add/Remove Programs dialog in Control Panel."
 msgstr ""
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr ""
diff --git a/l10n/po/ml.po b/l10n/po/ml.po
index 4e906f2..6b4dd78 100644
--- a/l10n/po/ml.po
+++ b/l10n/po/ml.po
@@ -252,6 +252,9 @@ msgstr ""
 msgid "s"
 msgstr ""
 
+#. Former values:
+#. ""
+#. ""
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
diff --git a/l10n/po/nb.po b/l10n/po/nb.po
index 447056c..24c3787 100644
--- a/l10n/po/nb.po
+++ b/l10n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-11-27 20:59+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -258,55 +258,36 @@ msgid "Text install"
 msgstr "Tekst installasjon"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Laster ned %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Opprette forbindelse .."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekund"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minutt"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "time"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "er"
-
+#. Former values:
+#. "%dkB (%d%%) av %dkB ved %d.%01dkB/s"
+#. " (%d %s%s gjenstår)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) av %dkB ved %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s gjenstår)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Velg hvilken versjon av Debian installasjonsprogrammet du vil bruke:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabil utgave. Dette vil installere Debian «stable»."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -319,7 +300,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -327,7 +308,7 @@ msgstr ""
 "Det er anbefalt at du sjekker for kjente feil før du bruker en daglig "
 "utgave. Vil du gjøre det nå?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -335,37 +316,37 @@ msgstr ""
 "Følgende parametre vil bli brukt. Du må IKKE endre noen av disse uten at du "
 "er helt sikker på hva du gjør."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxyinnstillinger (tjener:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Plassering av boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Basis URL-en for nettoppstartsfiler (linux og initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Feil"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Feil: Klarte ikke kopiere $0 til $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Kontrollerer GPG-signatur for $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Kan ikke stole på den nedlastede filen $0! Avbryter."
 
@@ -373,50 +354,50 @@ msgstr "Kan ikke stole på den nedlastede filen $0! Avbryter."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "Feil kontrollsum for $0/$2. Fikk $1 men forventet $4. Avbryter."
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Beregner kontrollsum for $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Genererer $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Legger til informasjon om preseeding til $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Feil: Klarte ikke kjøre $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Slår av NTFS-komprimering i oppstartsfiler"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrerer i NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrerer i BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Feil: Klarte ikke tolke resultat fra bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Feil: Fant ikke $0. Er dette virkelig Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "VELDIG VIKTIG MELDING:\\n\\n"
 
@@ -426,7 +407,7 @@ msgstr "VELDIG VIKTIG MELDING:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -436,7 +417,7 @@ msgstr ""
 "så vil dette programmet starte opp igjen Windows i DOS-modus og automatisk "
 "laste inn neste del av installasjonsprosessen.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -446,7 +427,7 @@ msgstr ""
 "start, vil du bli spurt om du vil start Windows eller fortsette med "
 "installasjonensprosessen.\\n\\n."
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -465,18 +446,6 @@ msgstr ""
 "innlasteren gjennom Windows sin «Legg til/fjern programvare»-dialog i "
 "kontrollpanelet."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Vil du starte på nytt nå?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Skrivebordsmiljø:"
-
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian installasjonsprogram"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Førinnstillingslinje for Debconf:"
diff --git a/l10n/po/nl.po b/l10n/po/nl.po
index c862659..18c32bc 100644
--- a/l10n/po/nl.po
+++ b/l10n/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.7.4.2\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-09-29 13:25+0200\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -258,55 +258,36 @@ msgid "Text install"
 msgstr "Tekstuele installatie"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Bezig met ophalen van %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Verbinding wordt opgezet..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "seconde"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuut"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "uur"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) van %dkB tegen %d.%01dkB/s"
+#. " (nog %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) van %dkB tegen %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (nog %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Selecteer de te gebruiken versie van het Debian Installatiesysteem:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabiele release. Installeert Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -319,7 +300,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -327,7 +308,7 @@ msgstr ""
 "Het is aan te bevelen om, voordat u een dagelijkse bouw gebruikt, te "
 "controleren of er bekende problemen zijn. Wilt u dit nu doen?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -335,37 +316,37 @@ msgstr ""
 "De volgende parameters zullen worden gebruikt. Wijzig deze NIET, tenzij u "
 "weet waar u mee bezig bent."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxy-instelling (systeemnaam:poort):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Locatie van boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Basis-URL voor netboot-images (linux en initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Fout"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Fout: kopiëren van $0 naar $1 is mislukt."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "GPG-ondertekening van $0 wordt gecontroleerd."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr ""
 "Het opgehaalde bestand $0 kan niet worden vertrouwd! Installatie wordt "
@@ -375,7 +356,7 @@ msgstr ""
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Foutief controlegetal voor $0/$2. $1 gevonden in plaats van $4. Installatie "
@@ -384,43 +365,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Controlegetal voor $2 wordt berekend"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "$0 wordt gegenereerd"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Gegevens voor voorconfiguratie wordt toegevoegd aan $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Fout: kan $0 niet uitvoeren."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "NTFS compressie in bootstrapbestanden wordt uitgeschakeld"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registreren in NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registreren in BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Fout: kan de uitvoer van bcdedit.exe niet ontleden."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Fout: $0 niet gevonden. Is dit echt Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ZEER BELANGRIJKE MELDING:\\n\\n"
 
@@ -430,7 +411,7 @@ msgstr "ZEER BELANGRIJKE MELDING:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -440,7 +421,7 @@ msgstr ""
 "dialoog bevestigt, zal dit programma Windows opnieuw opstarten in DOS-modus "
 "en automatisch de tweede fase van het installatieproces laden.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -450,7 +431,7 @@ msgstr ""
 "vervolgen. Tijdens het opstartproces zal u worden gevraagd of u Windows wilt "
 "starten of het installatieproces wilt vervolgen.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -469,12 +450,6 @@ msgstr ""
 "behouden), kunt u deze lader verwijderen via de optie 'Programma's toevoegen/"
 "verwijderen' in het Configuratiescherm."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Wilt u uw systeem nu herstarten?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Desktopomgeving:"
-
-#~ msgid "None"
-#~ msgstr "Geen"
diff --git a/l10n/po/pl.po b/l10n/po/pl.po
index 91e71aa..7532d4e 100644
--- a/l10n/po/pl.po
+++ b/l10n/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.6.6\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-01-25 00:03+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -268,55 +268,36 @@ msgid "Text install"
 msgstr "Instalacja w trybie tekstowym"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Pobieranie %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Łączenie ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekund"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minut"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "godzin"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "(y)"
-
+#. Former values:
+#. "%dkB (%d%%) z %dkB przy %d.%01dkB/s"
+#. " (pozostało: %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) z %dkB przy %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (pozostało: %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Wybór używanej wersji instalatora Debiana:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Edycja stabilna. Ta opcja zainstaluje wydanie \"stabilne\" Debiana."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -330,7 +311,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -338,7 +319,7 @@ msgstr ""
 "Zalecane jest sprawdzenie znanych problemów przed użyciem codziennego obrazu "
 "(strona jest dostępna tylko w języku angielskim). Czy zrobić to teraz?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -346,37 +327,37 @@ msgstr ""
 "Zostaną użyte następujące parametry. NIE należy ich zmieniać, chyba że "
 "dokładnie wiadomo co się robi!"
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Ustawienia serwera pośredniczącego (adres:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Położenie boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Bazowy URL obrazów netboot (pliki \"linux\" i \"initrd.gz\"):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Błąd"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Błąd: nie udało się skopiować $0 do $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Sprawdzanie podpisu GPG wydania $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Pobrany plik $0 nie jest zaufany! Przerywanie."
 
@@ -384,7 +365,7 @@ msgstr "Pobrany plik $0 nie jest zaufany! Przerywanie."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Suma kontrolna $0/$2 nie zgadza się. Wyliczono $1, podczas gdy prawidłowa to "
@@ -393,44 +374,44 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Obliczanie sumy kontrolnej pliku $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Generowanie $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Dodawanie informacji o ustawieniach (preseed) do $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Błąd: nie udało się uruchomić $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Wyłączenie kompresji NTFS w plikach uruchomieniowych"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Rejestrowanie w NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Rejestrowanie w BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Błąd: nie udało się przetworzyć wyjścia programu bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Błąd: nie znaleziono $0. Czy to na pewno jest Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "BARDZO WAŻNA UWAGA:\\n\\n"
 
@@ -440,7 +421,7 @@ msgstr "BARDZO WAŻNA UWAGA:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -450,7 +431,7 @@ msgstr ""
 "program instalacyjny zrestartuje Windows w tryb MS-DOS, po czym "
 "automatycznie rozpocznie się następna część procesu instalacji.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -460,7 +441,7 @@ msgstr ""
 "Podczas następnego startu komputera będzie można wybrać pomiędzy "
 "uruchomieniem Windows, a kontynuowaniem procesu instalacji.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -478,15 +459,6 @@ msgstr ""
 "ten program ładujący, z użyciem okna \"Dodaj/usuń programy\" w Panelu "
 "sterowania."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Czy uruchomić teraz komputer ponownie?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Środowisko graficzne:"
-
-#~ msgid "None"
-#~ msgstr "Brak"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Instalator Debiana"
diff --git a/l10n/po/pt.po b/l10n/po/pt.po
index 9e49c94..a32177d 100644
--- a/l10n/po/pt.po
+++ b/l10n/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-09-28 20:37+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -262,55 +262,36 @@ msgid "Text install"
 msgstr "Instalação em modo de texto"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "A fazer o download de %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "A ligar..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "segundo"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuto"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "hora"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) de %dkB a %d.%01dkB/s"
+#. " (faltam %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) de %dkB a %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (faltam %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Escolha a versão do Instalador de Debian a utilizar:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Lançamento Estável.  Isto irá instalar Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -323,7 +304,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -331,7 +312,7 @@ msgstr ""
 "É recomendado que verifique se existem problemas conhecidos antes de "
 "utilizar uma compilação diária.  Deseja fazê-lo agora?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -339,37 +320,37 @@ msgstr ""
 "Serão utilizados os seguintes parâmetros.  NÃO altere nenhum destes a menos "
 "que saiba o que está a fazer."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Configurações do proxy (máquina:porto):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Localização do boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL base para as imagens netboot (linux e initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Erro"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Erro: falhou copiar $0 para $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Verificar a assinatura GPG em $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr ""
 "O ficheiro $0 a que foi feito download não pode ser confiado! A abortar."
@@ -378,7 +359,7 @@ msgstr ""
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "A verificação de controlo difere para $0/$2. Obteve $1 quando esperava $4. A "
@@ -387,43 +368,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "A calcular a verificação de controlo para $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "A gerar $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "A acrescentar informação de 'preseeding' a $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Erro: não foi possível correr $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "A desactivar a compressão NTFS em ficheiros de arranque"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "A registar no NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "A registar no BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Erro: falhou a interpretação da saída de bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Erro: $0 não encontrado.  Isto é realmente o Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "AVISO MUITO IMPORTANTE:\\n\\n"
 
@@ -433,7 +414,7 @@ msgstr "AVISO MUITO IMPORTANTE:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -443,7 +424,7 @@ msgstr ""
 "sua confirmação, este programa irá reiniciar o Windows no modo DOS, e "
 "carregar automaticamente a próxima etapa do processo de instalação.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -453,7 +434,7 @@ msgstr ""
 "instalação.  Durante o próximo arranque, ser-lhe-á perguntado se deseja "
 "iniciar o Windows ou continuar com o processo de instalação.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -472,18 +453,6 @@ msgstr ""
 "pode desinstalar este carregador através da caixa de diálogo Adicionar/"
 "Remover Programas no Painel de Controlo do Windows."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Deseja reiniciar agora?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Ambiente de desktop:"
-
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Instalador Debian"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Linha de preseed do Debconf:"
diff --git a/l10n/po/pt_BR.po b/l10n/po/pt_BR.po
index 6281867..9ed367e 100644
--- a/l10n/po/pt_BR.po
+++ b/l10n/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader (20080210)\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-06-23 22:56-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -256,55 +256,36 @@ msgid "Text install"
 msgstr "Instalação texto"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Baixando %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Conectando ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "segundo"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuto"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "hora"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) de %dkB a %d,%01dkB/s"
+#. " (%d %s%s faltando)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) de %dkB a %d,%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s faltando)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Selecione qual versão do Instalador Debian usar:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Versão estável. Será instalado o Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -318,7 +299,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -326,7 +307,7 @@ msgstr ""
 "É recomendado que você verifique problemas conhecidos antes de usar uma "
 "imagem construída diariamente. Você gostaria de fazer isso agora?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -334,37 +315,37 @@ msgstr ""
 "Os seguintes parâmetros serão usados. NÃO mude nenhum deles a menos que você "
 "saiba o que está fazendo."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Configurações de proxy (máquina:porta):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Localização do boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL base para imagens \"netboot\" (linux e initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Erro"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Erro: falhou ao copiar $0 para $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Verificando assinatura GPG em $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "O arquivo $0 baixado não é confiável! Abortando."
 
@@ -372,7 +353,7 @@ msgstr "O arquivo $0 baixado não é confiável! Abortando."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Soma de verificação falhou para $0/$2. Obtido $1 quando o esperado era $4. "
@@ -381,43 +362,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Computando soma de verificação para $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Gerando $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Anexando informação de pré-configuração a $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Erro: incapaz de executar $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Desabilitando compressão NTFS nos arquivos de \"bootstrap\""
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrando no NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrando no BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Erro: falhou ao analisar a saída do bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Erro: $0 não encontrado. Este é realmente o Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "NOTÍCIA MUITA IMPORTANTE:\\n\\n"
 
@@ -427,7 +408,7 @@ msgstr "NOTÍCIA MUITA IMPORTANTE:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -437,7 +418,7 @@ msgstr ""
 "confirmação, este programa reinicializará o Windows no modo DOS, e "
 "automaticamente carregará a próxima parte do processo de instalação.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -447,7 +428,7 @@ msgstr ""
 "Durante a próxima inicialização, você será questionado se quer iniciar o "
 "Windows ou continuar com o processo de instalação.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -466,18 +447,6 @@ msgstr ""
 "carregador através da opção Adicionar/Remover Programas no Painel de "
 "Controle."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Você gostaria de reinicializar agora?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Ambiente de área de trabalho:"
-
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Instalador Debian"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Linha de pré-configuração (\"preseed\") debconf:"
diff --git a/l10n/po/ro.po b/l10n/po/ro.po
index 7645f93..8ed8461 100644
--- a/l10n/po/ro.po
+++ b/l10n/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2010-05-26 11:43+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -265,56 +265,37 @@ msgid "Text install"
 msgstr "Instalare text"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Se descarcă %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Conectare ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "s"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "min"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "h"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dko (%d%%) of %dko la %d.%01dko/s"
+#. "(%d %s%s rămaşi)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dko (%d%%) of %dko la %d.%01dko/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr "(%d %s%s rămaşi)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr ""
 "Selectaţi ce versiune a Programului de instalare Debian doriţi să folosiţi:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Versiunea stabilă. Aceasta va instala Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -327,7 +308,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -335,7 +316,7 @@ msgstr ""
 "Se recomandă să verificaţi lista de probleme cunoscute înainte de a folosi "
 "versiunea compilată zilnic. Doriţi să faceţi acum acest lucru?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -343,37 +324,37 @@ msgstr ""
 "Următorii parametri vor fi folosiţi. NU schimbaţi nimic, decât dacă aveţi "
 "certitudinea că faceţi ceea ce trebuie."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Configuraţia proxy (calculator:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Locul în care se află boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL-ul de bază pentru imaginea netboot (linux şi initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Eroare"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Eroare: eşec la copierea lui $0 în $1"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr ""
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr ""
 
@@ -381,50 +362,50 @@ msgstr ""
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr ""
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Se generează $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Se ataşează informaţiile de anteconfigurare la $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Eroare: nu se poate porni $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Se dezactivează compresia NTFS în fişierele de pornire"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Se înregistrează în NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Se înregistrează în BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Eroare: eşec la analizarea rezultatului lui bcedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Eroare: $0 nu a fost găsit. Acesta este un Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "NOTĂ FOARTE IMPORTANTĂ:\\n\\n"
 
@@ -434,7 +415,7 @@ msgstr "NOTĂ FOARTE IMPORTANTĂ:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -444,7 +425,7 @@ msgstr ""
 "confirmare, acest program va reporni Windows-ul în modul DOS, şi va încărca "
 "automat următoarea parte a procesului de instalare.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -454,7 +435,7 @@ msgstr ""
 "următoarei reporniri vi se va cere să alegeţi între a porni Windows sau a "
 "continua cu procesul de instalare.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -473,15 +454,6 @@ msgstr ""
 "dialogul Adaugă/Şterge programe din Panoul de control (Control Panel) "
 "Windows."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Doriţi să reporniţi acum?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Mediul desktop:"
-
-#~ msgid "None"
-#~ msgstr "Nici unul"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Programul de instalare Debian "
diff --git a/l10n/po/ru.po b/l10n/po/ru.po
index c593b75..1e03873 100644
--- a/l10n/po/ru.po
+++ b/l10n/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.7.0\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-10-21 10:17+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -261,55 +261,36 @@ msgid "Text install"
 msgstr "Установка в текстовом режиме"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Загрузка %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Подключение ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "с"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "м"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "ч"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dКб (%d%%) из %dКб на %d.%01dКб/с"
+#. " (%d %s%s осталось)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dКб (%d%%) из %dКб на %d.%01dКб/с"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s осталось)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Выберите версию программы установки Debian:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Стабильная версия. Она установит стабильную \"stable\" версию Debian."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -322,7 +303,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -330,7 +311,7 @@ msgstr ""
 "Рекомендуется посмотреть список известных проблем, перед тем как "
 "использовать ежедневную версию. Хотите сделать это прямо сейчас?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -338,37 +319,37 @@ msgstr ""
 "Будут использованы следующие параметры. НЕ изменяйте их, если не знаете, для "
 "чего они предназначены."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Настройки прокси-сервера (узел:порт):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Путь к boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Базовый URL для образов сетевой установки (linux и initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Ошибка"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Ошибка: не удалось скопировать $0 в $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Проверяется подпись GPG для $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Содержимому скачанного файла $0 нельзя доверять! Останов."
 
@@ -376,7 +357,7 @@ msgstr "Содержимому скачанного файла $0 нельзя �
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Не совпадает контрольная сумма для $0/$2. Получена $1, но ожидалась $4. "
@@ -385,43 +366,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Вычисляется контрольная сумма для $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Генерируется $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Добавляется информация автоустановки в $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Ошибка: не удалось запустить $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Выключение сжатия NTFS для файлов начальной загрузки"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Регистрация в NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Регистрация в BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Ошибка: не удалось понять результат от bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Ошибка: $0 не найден. У вас действительно Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ОЧЕНЬ ВАЖНО ЗАМЕЧАНИЕ:\\n\\n"
 
@@ -431,7 +412,7 @@ msgstr "ОЧЕНЬ ВАЖНО ЗАМЕЧАНИЕ:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -441,7 +422,7 @@ msgstr ""
 "программа перезапустит Windows в режим DOS и автоматически загрузит "
 "следующую часть процесса установки.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -451,7 +432,7 @@ msgstr ""
 "перезагрузки, вас спросят, хотите ли вы запустить Windows или продолжить "
 "процесс установки.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -469,12 +450,6 @@ msgstr ""
 "Windows на диске), вы можете удалить данный загрузчик через диалог Windows "
 "\"Установка и удаление программ\" в \"Панели управления\"."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Перезагрузить компьютер сейчас?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Окружение рабочего стола:"
-
-#~ msgid "None"
-#~ msgstr "Отсутствует"
diff --git a/l10n/po/sk.po b/l10n/po/sk.po
index 27bb71c..91e828b 100644
--- a/l10n/po/sk.po
+++ b/l10n/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-11-09 15:44+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -255,55 +255,36 @@ msgid "Text install"
 msgstr "Textová inštalácia"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Sťahuje sa %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Pripája sa ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "s"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "m"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "h"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) z %dkB pri %d.%01dkB/s"
+#. " (ostáva %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) z %dkB pri %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (ostáva %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Zvoľte si verziu inštalátora Debianu, ktorú chcete použiť:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabilné vydanie. Nainštaluje sa Debian „stable“."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -316,7 +297,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -324,7 +305,7 @@ msgstr ""
 "Pred použitím denného vydania sa odporúča prezrieť známe problémy.  Chcete "
 "si ich prezrieť teraz?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -332,39 +313,39 @@ msgstr ""
 "Zavádzač inštalácie sa spustí s nasledovnými parametrami. Ak neviete, čo "
 "robíte, NEMEŇTE žiaden z parametrov."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Nastavenie proxy (počítač:port)"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Umiestnenie súboru boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr ""
 "Základ URL, kde sa nachádzajú obrazy na zavádzanie zo siete (linux a initrd."
 "gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Chyba"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Chyba: zlyhalo kopírovanie $0 do $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Kontroluje sa podpis GPG súboru $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Stiahnutý súbor $0 nie je dôveryhodný! Prerušuje sa."
 
@@ -372,7 +353,7 @@ msgstr "Stiahnutý súbor $0 nie je dôveryhodný! Prerušuje sa."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Nezodpovedá kontrolný súčet $0/$2. Vyšlo $1, ale očakávali sme $4. Prerušuje "
@@ -381,43 +362,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Počíta sa kontrolný súčet $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Generuje sa $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Do $0 sa pripájajú informácie o predvolenom nastavení."
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Chyba: nedá sa spustiť $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Zakazuje sa NTFS kompresia v zavádzacích súboroch"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Zavádzač sa registruje do NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Zavádzač sa registruje do BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Chyba: nepodarilo sa spracovať výstup bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Chyba: súbor $0 sa nenašiel.  Je to naozaj Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "VEĽMI DÔLEŽITÁ POZNÁMKA:\\n\\n"
 
@@ -427,7 +408,7 @@ msgstr "VEĽMI DÔLEŽITÁ POZNÁMKA:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -437,7 +418,7 @@ msgstr ""
 "reštartuje Windows do DOS režimu a automaticky načíta ďalšiu časť "
 "inštalátora.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -447,7 +428,7 @@ msgstr ""
 "spustenia počítača dostanete na výber spustenie Windows alebo pokračovanie v "
 "inštalácii.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -464,15 +445,6 @@ msgstr ""
 "(a ak ste sa rozhodli ponechať Windows na svojom disku) môžete odstrániť "
 "tento zavádzač pomocou dialógu Pridať/odobrať programy v Ovládacom paneli."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Chcete teraz reštartovať počítač?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Pracovné prostredie:"
-
-#~ msgid "None"
-#~ msgstr "Žiadne"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Inštalácia Debianu"
diff --git a/l10n/po/sl.po b/l10n/po/sl.po
index 9bcc782..fc9db49 100644
--- a/l10n/po/sl.po
+++ b/l10n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-04-27 13:25+0100\n"
 "Last-Translator: Vanja Cvelbar <cvelbar@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -261,55 +261,36 @@ msgid "Text install"
 msgstr "Tekstovna namestitev"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Prenašanje %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Povezovanje ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekunda"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuta"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "ura"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) od %dkB pri %d.%01dkB/s"
+#. " (preostaja še %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) od %dkB pri %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (preostaja še %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Izberite različico Namestilnika Debian, ki ga želite uporabiti:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Zanesljiva različica. S tem boste namestili Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -322,7 +303,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -330,7 +311,7 @@ msgstr ""
 "Pred uporabo dnevne izdelave je priporočeno preveriti znane težave. Želite "
 "to storiti zdaj?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -338,37 +319,37 @@ msgstr ""
 "Uporabljeni bodo sledeči parametri. NE spreminjajte nič, razen če ne veste "
 "kaj delate."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Nastavitev posredovalnega strežnika (strežnik:vrata):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Mesto kjer se nahaja boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Osnovni URL slik (linux in initrd.gz) za mrežni zagon (netboot):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Napaka"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Napaka: ni bilo mogoče kopirati $0 v $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Preverjanje podpisa GPG za $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Naložena datoteka $0 ni vredna zaupanja! Prekinitev."
 
@@ -376,7 +357,7 @@ msgstr "Naložena datoteka $0 ni vredna zaupanja! Prekinitev."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Napak pri nadzorni vsoti za $0/$2. Vrednost $1 ko bi morala biti $4. "
@@ -385,43 +366,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Izračunavanje nadzorne vsote za $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Ustvarjanje $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Dodajanje pred nastavljenih informacij v $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Napaka: ni bilo mogoče zagnati $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Onemogočanje kompresije NTFS v datotekah začetnega nalaganja"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Vpisovanje v NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Vpisovanje v BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Napaka: ni bilo mogoče razčleniti izhodnih podatkov bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Napaka: $0 ni mogoče najti. Je to res sistem Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ZELO POMEMBNO OPOZORILO:\\n\\n"
 
@@ -431,7 +412,7 @@ msgstr "ZELO POMEMBNO OPOZORILO:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -441,7 +422,7 @@ msgstr ""
 "ponovno zagnal sistem Windows v način DOS in samodejno naložil naslednji del "
 "namestitvenega procesa.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -451,7 +432,7 @@ msgstr ""
 "zagonom boste lahko izbrali med zagonom sistema Windows in nadaljevanjem "
 "namestitvenega procesa.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -470,12 +451,6 @@ msgstr ""
 "pomočjo pogovornega okna Namesti ali odstrani programe v Nadzorni plošči "
 "sistema Windows."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Želite zdaj ponovno zagnati?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Namizno okolje"
-
-#~ msgid "None"
-#~ msgstr "Brez"
diff --git a/l10n/po/sq.po b/l10n/po/sq.po
index 7e39cdb..8a6e8d9 100644
--- a/l10n/po/sq.po
+++ b/l10n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2008-05-09 12:01+0100\n"
 "Last-Translator: Eva Vranici <evavranici@gmail.com>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -259,55 +259,36 @@ msgid "Text install"
 msgstr "Instalim teksti"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Duke shkarkuar %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Duke u lidhur ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekondë"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minutë"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "orë"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) nga %dkB në %d.%01dkB/s"
+#. " (%d %s%s të mbetura)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) nga %dkB në %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s të mbetura)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Zgjidh versionin të Instaluesit-Debian për të përdorur:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Lëshim i qëndrueshëm. Kjo do të instalojë Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -320,7 +301,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -328,7 +309,7 @@ msgstr ""
 "Eshtë e rekomanduar të kontrolloni për probleme të njohura përpara një "
 "ndërtimi ditor. Doni ta bëni këtë tani?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -336,37 +317,37 @@ msgstr ""
 "Parametrat e mëposhtëm do të përdoren. MOS ndrysho asnjë nga to në qoftë se "
 "nuk e dini se çfarë po bëni."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Konfigurimet e Proxy (host:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Vendodhja e boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL bazë për imazhe netboot (linux and initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Gabim"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Gabim: dështoi për të kopjuar $0 tek $1"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Duke kontrolluar nënshkrimin GPS në $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Skedari $0 i shkarkuar nuk mund të besohet! Duke abortuar."
 
@@ -374,7 +355,7 @@ msgstr "Skedari $0 i shkarkuar nuk mund të besohet! Duke abortuar."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Mospërputhje checksum-i për $0/$2. U mor $1 kur pritej $4. Duke u abortuar."
@@ -382,43 +363,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Duke llogaritur checksum për $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Duke gjeneruar $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Duke shtuar informacionin paraprak në $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Gabim: e pamundur për të ekzekutuar $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Duke çaktivizuar kompresionin NTFS në skedarët bootstrap"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Duke regjistruar në NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Duke regjistruar në BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Gabim: nuk arriti të analizojë produktin bcdedit.exe"
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Gabim: $0 nuk u gjet. A është kjo vërtet Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ÇDO SHËNIM TË RËNDËSISHËM:\\n\\n"
 
@@ -428,7 +409,7 @@ msgstr "ÇDO SHËNIM TË RËNDËSISHËM:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -438,7 +419,7 @@ msgstr ""
 "tuaj, ky program do të rifillojë Windows në DOS mode, dhe do të ngarkojë "
 "automatikisht pjesën tjetër të proçesit të instalimit.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -448,7 +429,7 @@ msgstr ""
 "Gjatë ndezjes tjeter, ju do të pyeteni nëse doni të filloni Windows apo të "
 "vazhdoni me proçesin e instalimit.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -467,6 +448,6 @@ msgstr ""
 "mund ta çinstaloni këtë ngarkim me anë të dialogut Windows Shto/Hiq "
 "Programe, në Control Panel."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Doni të rindizni tani?"
diff --git a/l10n/po/sr.po b/l10n/po/sr.po
index 9b13a40..26ef7f3 100644
--- a/l10n/po/sr.po
+++ b/l10n/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.6.18\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-01-22 20:16+0100\n"
 "Last-Translator: Karolina Kalic <karolina@resenje.org>\n"
 "Language-Team: Serbian\n"
@@ -256,55 +256,36 @@ msgid "Text install"
 msgstr "Текстуално инталирање"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Преузимање %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Повезивање..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "секунда"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "минут"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "сат"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) од %dkB при %d.%01dkB/s"
+#. " (%d %s%s је преостало)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) од %dkB при %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s је преостало)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Изаберите верзију Debian-Installer-а за употребу:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Стабилно издање.  Ово ће инсталирати Debian „stable“."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -317,7 +298,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -325,44 +306,44 @@ msgstr ""
 "Препоручује се да погледате да ли постоје познати проблеми пре употребе "
 "дневног издања.  Да ли желите да проверите сада?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr ""
 "Употребиће се следећи параметри. НЕ мењајте ништа, осим ако знате шта радите."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxy подешавања (host:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Локација boot.ini-а:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Основни URL за netboot слике (linux и initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Грешка"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Грешка: неуспело копирање $0 у $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Проверавање GPG потписа на $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Преузетом $0 фајлу се не може веровати! Прекидање."
 
@@ -370,7 +351,7 @@ msgstr "Преузетом $0 фајлу се не може веровати! П
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Сума се није подударила за $0/$2. Добијено је $1 уместо очекиваних $4. "
@@ -379,44 +360,44 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Рачунање суме за  $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Генерисање $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Додавање информација на $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Грешка: немогућност покретања $0"
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Искључивање NTFS компресије у bootstrap фајловима"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Регистровање у NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Регистровање у BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Грешка: неуспело парсирање bcdedit.exe излаза."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Грешка: $0 није пронађен.  Да ли је ово сигурно Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ВЕОМА ВАЖНО ОБАВЕШТЕЊЕ:\\n\\n"
 
@@ -426,7 +407,7 @@ msgstr "ВЕОМА ВАЖНО ОБАВЕШТЕЊЕ:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -436,7 +417,7 @@ msgstr ""
 "потврде, овај програм ће рестартовати Windows у DOS режиму, и аутоматски "
 "учитати следећи корак инсталационог процеса.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -446,7 +427,7 @@ msgstr ""
 "вашег следећег покретања, бићете питани да желите да покренете Windows или "
 "да наставите са инсталационим процесом.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -464,12 +445,6 @@ msgstr ""
 "на вашем диску), можете да обришете овај покретачки програм путем Windows-"
 "овог Add/Remove Programs дијалога у контролном панелу."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Да ли желите да рестартујете сад?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Десктоп окружење:"
-
-#~ msgid "None"
-#~ msgstr "Ништа"
diff --git a/l10n/po/sr@latin.po b/l10n/po/sr@latin.po
index 5504476..0c180a6 100644
--- a/l10n/po/sr@latin.po
+++ b/l10n/po/sr@latin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.6.18\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-01-22 20:16+0100\n"
 "Last-Translator: Karolina Kalic <karolina@resenje.org>\n"
 "Language-Team: Serbian\n"
@@ -257,55 +257,36 @@ msgid "Text install"
 msgstr "Tekstualno intaliranje"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Preuzimanje %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Povezivanje..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekunda"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minut"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "sat"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) od %dkB pri %d.%01dkB/s"
+#. " (%d %s%s je preostalo)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) od %dkB pri %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s je preostalo)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Izaberite verziju Debian-Installer-a za upotrebu:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabilno izdanje.  Ovo će instalirati Debian „stable“."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -318,7 +299,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -326,7 +307,7 @@ msgstr ""
 "Preporučuje se da pogledate da li postoje poznati problemi pre upotrebe "
 "dnevnog izdanja.  Da li želite da proverite sada?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -334,37 +315,37 @@ msgstr ""
 "Upotrebiće se sledeći parametri. NE menjajte ništa, osim ako znate šta "
 "radite."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxy podešavanja (host:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Lokacija boot.ini-a:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Osnovni URL za netboot slike (linux i initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Greška"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Greška: neuspelo kopiranje $0 u $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Proveravanje GPG potpisa na $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Preuzetom $0 fajlu se ne može verovati! Prekidanje."
 
@@ -372,7 +353,7 @@ msgstr "Preuzetom $0 fajlu se ne može verovati! Prekidanje."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Suma se nije podudarila za $0/$2. Dobijeno je $1 umesto očekivanih $4. "
@@ -381,44 +362,44 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Računanje sume za  $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Generisanje $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Dodavanje informacija na $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Greška: nemogućnost pokretanja $0"
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Isključivanje NTFS kompresije u bootstrap fajlovima"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrovanje u NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrovanje u BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Greška: neuspelo parsiranje bcdedit.exe izlaza."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Greška: $0 nije pronađen.  Da li je ovo sigurno Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "VEOMA VAŽNO OBAVEŠTENJE:\\n\\n"
 
@@ -428,7 +409,7 @@ msgstr "VEOMA VAŽNO OBAVEŠTENJE:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -438,7 +419,7 @@ msgstr ""
 "potvrde, ovaj program će restartovati Windows u DOS režimu, i automatski "
 "učitati sledeći korak instalacionog procesa.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -448,7 +429,7 @@ msgstr ""
 "vašeg sledećeg pokretanja, bićete pitani da želite da pokrenete Windows ili "
 "da nastavite sa instalacionim procesom.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -466,12 +447,6 @@ msgstr ""
 "na vašem disku), možete da obrišete ovaj pokretački program putem Windows-"
 "ovog Add/Remove Programs dijaloga u kontrolnom panelu."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Da li želite da restartujete sad?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Desktop okruženje:"
-
-#~ msgid "None"
-#~ msgstr "Ništa"
diff --git a/l10n/po/sv.po b/l10n/po/sv.po
index 46c20d1..16b2bdb 100644
--- a/l10n/po/sv.po
+++ b/l10n/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-10-01 00:15+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -258,55 +258,36 @@ msgid "Text install"
 msgstr "Textbaserad installerare"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Hämtar %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Ansluter ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "sekund"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minut"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "timme"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%d kB (%d%%) av %d kB i %d.%01dkB/s"
+#. " (%d %s%s återstår)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%d kB (%d%%) av %d kB i %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s återstår)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Välj vilken version av Debian-Installer som ska användas:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Stabil utgåva.  Det här kommer att installera Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -319,7 +300,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -327,7 +308,7 @@ msgstr ""
 "Det rekommenderas att du letar upp information om kända problem innan du "
 "använder ett dagligt bygge.  Vill du göra det nu?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -335,37 +316,37 @@ msgstr ""
 "Följande parametrar kommer att användas.  Ändra INTE någon av dessa såvida "
 "du inte vet vad du gör."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxyinställningar (värdnamn:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Plats för boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Bas-URL för nätuppstartsavbilder (linux och initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Fel"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Fel: misslyckades med att kopiera $0 till $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Kontrollerar GPG-signatur på $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Den nedladdade filen $0 har ett tillitsproblem! Avbryter."
 
@@ -373,7 +354,7 @@ msgstr "Den nedladdade filen $0 har ett tillitsproblem! Avbryter."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Kontrollsummorna stämmer inte för $0/$2. Fick $1 men förväntade $4. Avbryter."
@@ -381,43 +362,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Beräknar kontrollsumma för $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Skapar $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Applicerar information från förinställningar för $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Fel: kunde inte köra $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Stänger av NTFS-komprimering i bootstrap-filer."
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrerar i NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrerar i BootMgr."
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Fel: misslyckades med att tolka utdata från bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Fel: $0 hittades inte.  Är det här verkligen Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "MYCKET VIKTIG NOTERING:\\n\\n"
 
@@ -427,7 +408,7 @@ msgstr "MYCKET VIKTIG NOTERING:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -437,7 +418,7 @@ msgstr ""
 "Efter att du har bekräftat kommer programmet att starta om Windows i DOS-"
 "läget och automatiskt läsa in nästa del av installationsprocessen.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -448,7 +429,7 @@ msgstr ""
 "starta Windows eller Debian Installer.  Välj Debian Installer för att "
 "fortsätta med installationsprocessen.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -467,27 +448,6 @@ msgstr ""
 "disk) kan du avinstallera denna inläsare genom Windows Lägg till/Ta bort "
 "program i Kontrollpanelen."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Vill du starta om nu?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Skrivbordsmiljö:"
-
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian-installerare"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Förinställningsrad för Debconf:"
-
-#~ msgid "GNOME.  Emphasizes ease of use."
-#~ msgstr "GNOME.  Enkel att använda."
-
-#~ msgid "KDE.  Emphasizes customizability."
-#~ msgstr "KDE.  Anpassningsbar."
-
-#~ msgid "XFCE.  Emphasizes speed and low use of resources."
-#~ msgstr "XFCE.  Snabb och resurssnål."
diff --git a/l10n/po/ta.po b/l10n/po/ta.po
index 4645895..f9ecef4 100644
--- a/l10n/po/ta.po
+++ b/l10n/po/ta.po
@@ -280,6 +280,9 @@ msgstr "மணி"
 msgid "s"
 msgstr "கள்"
 
+#. Former values:
+#. "%dkB (%d%%) of %dkB at %d.%01dkB/s"
+#. " (%d %s%s மீதமுள்ளது)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -456,9 +459,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "இப்போது மறுதுவக்கம் செய்ய வேண்டுமா?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "மேஜை சுழல்"
-
-#~ msgid "None"
-#~ msgstr "ஒன்றுமில்லை"
diff --git a/l10n/po/te.po b/l10n/po/te.po
index 8593dea..76472d9 100644
--- a/l10n/po/te.po
+++ b/l10n/po/te.po
@@ -251,6 +251,9 @@ msgstr "గంట"
 msgid "s"
 msgstr ""
 
+#. Former values:
+#. ""
+#. " (%d %s%s మిగిలివుంది)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -413,9 +416,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "మీరిప్పుడు పునఃప్రారంభించాలి అనుకుంటున్నారా?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "రంగస్థల ఆవరణం:"
-
-#~ msgid "None"
-#~ msgstr "ఏమీలేదు"
diff --git a/l10n/po/th.po b/l10n/po/th.po
index 134f83a..c4e4d4e 100644
--- a/l10n/po/th.po
+++ b/l10n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader \n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-24 21:23+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -247,55 +247,36 @@ msgid "Text install"
 msgstr "ติดตั้งในโหมดข้อความ"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "กำลังดาวน์โหลด %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "วินาที"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "นาที"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "ชั่วโมง"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) จาก %dkB ที่ %d.%01dkB/s"
+#. " (เหลืออีก %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) จาก %dkB ที่ %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (เหลืออีก %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "เลือกรุ่นของโปรแกรมติดตั้งเดเบียนที่ต้องการใช้:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "รุ่นเสถียร  จะติดตั้งเดเบียน \"stable\""
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -307,7 +288,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -315,43 +296,43 @@ msgstr ""
 "ขอแนะนำให้คุณตรวจสอบประเด็นปัญหาที่เป็นที่ทราบกันแล้วก่อนที่จะใช้รุ่นประจำวัน "
 "คุณต้องการตรวจสอบเลยหรือไม่?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr "จะใช้พารามิเตอร์ต่อไปนี้ *อย่าเปลี่ยน* นอกจากคุณจะมีความเข้าใจเกี่ยวกับค่าต่างๆ"
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "ค่าตั้งพร็อกซี (โฮสต์:พอร์ต):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "ตำแหน่งที่ตั้งของ boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL ตั้งต้นสำหรับแฟ้ม netboot (linux และ initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "ข้อผิดพลาด: ไม่สามารถคัดลอก $0 ไปยัง $1"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "กำลังตรวจสอบลายเซ็น GPG ใน $0"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "แฟ้ม $0 ที่ดาวน์โหลดมาไม่สามารถเชื่อถือได้! ขอยกเลิก"
 
@@ -359,50 +340,50 @@ msgstr "แฟ้ม $0 ที่ดาวน์โหลดมาไม่ส�
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "ผลรวมตรวจสอบไม่ถูกต้องสำหรับ $0/$2 ได้รับ $1 แต่ต้องการ $4 ขอยกเลิก"
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "กำลังคำนวณผลรวมตรวจสอบสำหรับ $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "กำลังสร้าง $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "กำลังเพิ่มข้อมูลค่าตั้งล่วงหน้าต่อท้าย $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "ข้อผิดพลาด: ไม่สามารถเรียก $0"
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "กำลังปิดใช้การบีบอัด NTFS ในแฟ้มบูต"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "กำลังลงทะเบียนใน NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "กำลังลงทะเบียนใน BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "ข้อผิดพลาด: ไม่สามารถแจงผลลัพธ์จาก bcdedit.exe"
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "ข้อผิดพลาด: ไม่พบ $0  ระบบนี้ใช่ Windows $windows_version จริงหรือ?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "* ข้อสังเกตสำคัญ * :\\n\\n"
 
@@ -412,7 +393,7 @@ msgstr "* ข้อสังเกตสำคัญ * :\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -421,7 +402,7 @@ msgstr ""
 "กำลังจะเริ่มการติดตั้งขั้นที่สอง  หลังจากที่คุณตอบยืนยัน โปรแกรมนี้จะบูตวินโดวส์ใหม่เข้าสู่โหมด DOS "
 "และเรียกโปรแกรมติดตั้งขั้นถัดไปโดยอัตโนมัติ\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -430,7 +411,7 @@ msgstr ""
 "คุณต้องบูตเครื่องใหม่เพื่อจะดำเนินการติดตั้งต่อไป เมื่อบูตเครื่อง "
 "คุณจะพบคำถามว่าจะเปิดวินโดวส์หรือจะดำเนินการติดตั้งต่อไป\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -446,27 +427,6 @@ msgstr ""
 "(และคุณได้เลือกที่จะคงวินโดวส์ไว้ในดิสก์) คุณสามารถลบเครื่องมือเรียกโปรแกรมนี้ได้ โดยใช้หน้าต่าง "
 "Add/Remove Programs ใน Control Panel ของวินโดวส์"
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "ต้องการบูตเครื่องใหม่เลยหรือไม่?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "ระบบเดสก์ท็อป:"
-
-#~ msgid "None"
-#~ msgstr "ไม่ติดตั้ง"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian Installer"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "บรรทัด Debconf preseed:"
-
-#~ msgid "GNOME.  Emphasizes ease of use."
-#~ msgstr "GNOME  เน้นที่ความง่าย"
-
-#~ msgid "KDE.  Emphasizes customizability."
-#~ msgstr "KDE  เน้นการปรับแต่ง"
-
-#~ msgid "XFCE.  Emphasizes speed and low use of resources."
-#~ msgstr "XFCE  เน้นความเร็วและการประหยัดทรัพยากร"
diff --git a/l10n/po/tr.po b/l10n/po/tr.po
index 2921087..0b20ec7 100644
--- a/l10n/po/tr.po
+++ b/l10n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian-Installer Loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-09-11 20:21+0200\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -259,55 +259,36 @@ msgid "Text install"
 msgstr "Metin tabanlı ortamda kurulum"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "%s indiriliyor"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Bağlanılıyor ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "saniye"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "dakika"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "saat"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) / %dkB %d.%01dkB/s hızıyla"
+#. " (kalan %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) / %dkB %d.%01dkB/s hızıyla"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (kalan %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Kullanılacak Debian-Kur'un versiyonunu seçin:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Kararlı sürüm. Bu seçenek Debian  \"kararlı\"yı kuracak."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -320,7 +301,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -328,7 +309,7 @@ msgstr ""
 "Günlük derleme'yi kullanmadan önce bilinen sorunlara bir bakmanız önerilir. "
 "Bunu şimdi yapmak ister misiniz? (Bu liste İngilizce'dir.)"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -336,37 +317,37 @@ msgstr ""
 "Yükleyici aşağıdaki değerlerle yapılandırılacak.  Ne yaptığınızdan emin "
 "olmadığınız sürece bu ayarların hiçbirini DEĞİŞTİRMEYİN."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Vekil sunucu ayarları (makine:port):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "'boot.ini' dosyasının konumu:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "'netboot' imajları (linux ve initrd.gz) için kök URL:"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Hata"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Hata: $0 kaynağından $1 hedefine kopyalama başarısız oldu."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "$0 dosyasının GPG imzası kontrol ediliyor."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "İndirilen $0 dosyası güvenilir değil! İşlem iptal edilecek."
 
@@ -374,7 +355,7 @@ msgstr "İndirilen $0 dosyası güvenilir değil! İşlem iptal edilecek."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "$0/$2 dosyasının toplama sağlaması yapılamadı. $4 beklenirken $1 hesaplandı. "
@@ -383,43 +364,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "$2 dosyasının sağlama toplamı hesaplanıyor"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "$0 oluşturuluyor"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Önyanıt bilgisi şuna ekleniyor: $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Hata: $0 çalıştırılamadı."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Önyükleyici dosyalarının NTFS sıkıştırması devre dışı bırakılıyor"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "NTLDR'ye kaydediliyor"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "BootMgr'ye kaydediliyor"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Hata: bcdedit.exe çıktısı ayrıştırılamadı."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Hata: $0 bulunamadı.  Bu gerçekten bir Windows $windows_version mi?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ÇOK ÖNEMLİ UYARI:\\n\\n"
 
@@ -429,7 +410,7 @@ msgstr "ÇOK ÖNEMLİ UYARI:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -439,7 +420,7 @@ msgstr ""
 "sonra, program Windows'u DOS kipinde başlatacak ve kurulum işleminin bir "
 "sonraki kısmını otomatik olarak yükleyecek.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -449,7 +430,7 @@ msgstr ""
 "Bir sonraki açılışta Windows veya Kurulum Programından hangisini başlatmak "
 "istediğiniz size sorulacak.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -468,18 +449,6 @@ msgstr ""
 "seçmişseniz), bu yükleyiciyi programı Windows Denetim Masası'ndaki Program "
 "Ekle/Kaldır seçeneği ile kaldırabilirsiniz."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Şimdi sistemi yeniden başlatmak ister misiniz?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Masaüstü ortamı:"
-
-#~ msgid "None"
-#~ msgstr "Hiçbiri"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian Kurulum Programi"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Debconf önyanıtlama satırı:"
diff --git a/l10n/po/ug.po b/l10n/po/ug.po
index 909aaf0..5ceca54 100644
--- a/l10n/po/ug.po
+++ b/l10n/po/ug.po
@@ -287,6 +287,9 @@ msgstr "سائەت"
 msgid "s"
 msgstr "s"
 
+#. Former values:
+#. "%dkB (%d%%) جەمئىي %dkB سۈرئەت %d.%01dkB/s"
+#. " (%d %s%s قالدى)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -472,9 +475,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "كومپيۇتېرنى دەرھال قايتا قوزغىتامسىز؟"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "ئۈستەلئۈستى مۇھىتى:"
-
-#~ msgid "None"
-#~ msgstr "يوق"
diff --git a/l10n/po/uk.po b/l10n/po/uk.po
index 2f11763..57fc97e 100644
--- a/l10n/po/uk.po
+++ b/l10n/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2011-02-22 15:48+0200\n"
 "Last-Translator: Yatsenko Alexandr <yatsenko.alexandr@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -257,55 +257,36 @@ msgid "Text install"
 msgstr "Встановлення в текстовому режимі"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Звантаження %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "З'єднання..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "секунда"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "хвилина"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "година"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "с"
-
+#. Former values:
+#. "%dkБ (%d%%) з %dkБ на %d.%01dkБ/с"
+#. "(залишилось %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkБ (%d%%) з %dkБ на %d.%01dkБ/с"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr "(залишилось %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Оберіть тип встановлювача Debian для використання:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Стабільний випуск. Буде встановлено Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -318,7 +299,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -326,7 +307,7 @@ msgstr ""
 "Рекомендовано переглянути список відомих проблем перед використанням "
 "щоденної збірки. Хочете зробити це зараз?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -334,37 +315,37 @@ msgstr ""
 "Буде вжито такі параметри. НЕ змінюйте їх, крім випадків, коли точно знаєте, "
 "що робите."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Налаштування проксі (адреса:порт):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Розміщення boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Базовий URL для образів мережевого завантаження (linux та initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Помилка"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Помилка: не вдалося скопіювати $0 до $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Перевірка GPG підписів на $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "Неможливо перевірити завантажений файл $0! Встановлення зупинено."
 
@@ -372,7 +353,7 @@ msgstr "Неможливо перевірити завантажений фай�
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Невірна контрольна сума у $0/$2. Отримано $1 замість очікуваних $4. "
@@ -381,43 +362,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Обчислення контрольної суми для $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Створення $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Додавання шаблону відповідей до $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Помилка: неможливо запустити $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Вимикання стиснення NTFS для файлів початкового завантаження"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Реєстрація в NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Реєстрація в BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Помилка: неможливо обробити інформацію від bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Помилка: $0 не знайдено. Це дійсно Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ДУЖЕ ВАЖЛИВЕ ПОВІДОМЛЕННЯ:\\n\\n"
 
@@ -427,7 +408,7 @@ msgstr "ДУЖЕ ВАЖЛИВЕ ПОВІДОМЛЕННЯ:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -437,7 +418,7 @@ msgstr ""
 "перезавантажить Windows в режим DOS та автоматично завантажить наступну "
 "частину процедури встановлення.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -447,7 +428,7 @@ msgstr ""
 "наступного завантаження, ви зможете обрати чи запустити Windows чи "
 "продовжити встановлення\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -465,12 +446,6 @@ msgstr ""
 "Windows на вашому диску), ви зможете вилучити завантажувач через аплет "
 "\"Встановлення та видалення програм\" у панелі керування Windows."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Перезавантажити комп'ютер зараз?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Стільничне середовище:"
-
-#~ msgid "None"
-#~ msgstr "Нічого"
diff --git a/l10n/po/vi.po b/l10n/po/vi.po
index 572f16e..7d9a3bd 100644
--- a/l10n/po/vi.po
+++ b/l10n/po/vi.po
@@ -287,6 +287,9 @@ msgstr "giờ"
 msgid "s"
 msgstr " "
 
+#. Former values:
+#. "%dkB (%d%%) trên %dkB theo %d.%01dkB/g"
+#. " (%d %s%s còn lại)"
 #: win32-loader.c:133
 #, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
@@ -470,9 +473,3 @@ msgstr ""
 #: win32-loader.c:189
 msgid "Do you want to reboot now?"
 msgstr "Bạn có muốn khởi động lại máy ngay bây giờ không?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Môi trường máy làm việc:"
-
-#~ msgid "None"
-#~ msgstr "Không có"
diff --git a/l10n/po/zh_CN.po b/l10n/po/zh_CN.po
index 07949a4..27131e8 100644
--- a/l10n/po/zh_CN.po
+++ b/l10n/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-01-22 00:51+0800\n"
 "Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -247,55 +247,36 @@ msgid "Text install"
 msgstr "文本化安装"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "正在下载 %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "正在连接 ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "秒"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "分钟"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "小时"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) 共 %dkB 速度 %d.%01dkB/s"
+#. " (还剩 %d %s%s)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) 共 %dkB 速度 %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (还剩 %d %s%s)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "请选择使用哪个版本的 Debian 安装程序："
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "稳定版。这将安装 Debian “稳定版”。"
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -307,49 +288,49 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
 msgstr "我们建议您查看在使用每日编译版之前先查看其已知问题。您现在想查看吗？"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr "将会设置使用以下参数。请“不要”做任何修改除非您知道您在做什么。"
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "代理设置(主机:端口)："
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "boot.ini 的位置："
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "网络启动映像(linux 和 initrd.gz)所在的网络目录："
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "错误"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "错误：复制 $0 到 $1 失败。"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "正在检查$0的GPG签名。"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "下载的$0文件不被信任！终止。"
 
@@ -357,50 +338,50 @@ msgstr "下载的$0文件不被信任！终止。"
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "$0/$2的校验和不匹配。期待$4而计算结果是$1。终止。"
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "正在计算$2的校验和"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "正在创建 $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "正在将预置信息追加到 $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "错误：无法运行 $0。"
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "正在禁用引导文件中的 NTFS 压缩"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "正在 NTLDR 中注册"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "正在 BootMgr 中注册"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "错误：解析 bcdedit.exe 的输出失败。"
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "错误：无法找到 $0。这确实是 Windows $windows_version 吗？"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "“非常重要的提示”：\\n\\n"
 
@@ -410,7 +391,7 @@ msgstr "“非常重要的提示”：\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -419,7 +400,7 @@ msgstr ""
 "安装进程的第二阶段现在即将开始。在您确认以后，本程序将会重启 Windows 到 DOS "
 "模式，并自动加载安装进程的下一部分。\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -428,7 +409,7 @@ msgstr ""
 "您需要重启来进行您的安装。在您下次启动过程中，您将会被询问是想要启动 Windows "
 "还是继续安装进程。\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -443,18 +424,6 @@ msgstr ""
 "任”。\\n\\n一旦您的安装完成(而且如果您选择在您的磁盘上保留 Windows)，您可以通"
 "过 Windows 控制面板中的添加/删除程序对话框来卸载此加载程序。"
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "您想现在重新启动吗？"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "桌面环境："
-
-#~ msgid "None"
-#~ msgstr "无"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian 安装程序"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Debconf 预置行："
diff --git a/l10n/po/zh_TW.po b/l10n/po/zh_TW.po
index 4c37a84..db65540 100644
--- a/l10n/po/zh_TW.po
+++ b/l10n/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 0.6.0\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-04-22 19:27-0700\n"
 "Last-Translator: Vincent Chen <vinmun@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -244,55 +244,36 @@ msgid "Text install"
 msgstr "以文字模式安裝"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "正在下載 %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "正在連線 ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "秒"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "分鐘"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "小時"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr " "
-
+#. Former values:
+#. "%dkB (%d%%) 共 %dkB 速度 %d.%01dkB/s"
+#. " （尚有 %d %s%s）"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) 共 %dkB 速度 %d.%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " （尚有 %d %s%s）"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "請選擇要使用哪個版本的 Debian 安裝程式："
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "穩定版。這將安裝 Debian「stable」。"
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -304,49 +285,49 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
 msgstr "在此建議您，請在使用每日編譯版之前先查看其已知問題。是否立即查看？"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
 msgstr "將會使用以下參數。除非有絕對把握，請【不要】對它們進行任何修改。"
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Proxy 設定（主機:埠）："
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "boot.ini 的位置："
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "網路開機影像檔（linux 及 initrd.gz）的基本網址："
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "錯誤"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "錯誤：無法將 $0 複製到 $1。"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "正在檢查 $0 的 GPG 簽名。"
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "下載的檔案 $0 不能被信任！終止中。"
 
@@ -354,50 +335,50 @@ msgstr "下載的檔案 $0 不能被信任！終止中。"
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr "$0/$2 的校驗碼不一致。得到了 $1 但預期的是 $4。終止中。"
 
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "正在計算 $2 的校驗碼"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "正在產生 $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "將預先設定資訊附加到 $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "錯誤：無法執行 $0。"
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "正在關閉開機檔案裡的 NTFS 壓縮設定"
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "正在註冊到 NTLDR 裡"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "正在註冊到 BootMgr 裡"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "錯誤：無法分析 bcdedit.exe 的輸出資訊。"
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "錯誤：無法找到 $0。這真的是 Windows $windows_version 嗎？"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "【非常重要的提示】：\\n\\n"
 
@@ -407,7 +388,7 @@ msgstr "【非常重要的提示】：\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -416,7 +397,7 @@ msgstr ""
 "第二階段的安裝作業現在即將開始。在獲得您的確認之後，本程式將會重新啟動 "
 "Windows 至 DOS 模式，並自動載入安裝程式的下一個步驟。\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -425,7 +406,7 @@ msgstr ""
 "您需要重新開機來繼續進行安裝作業。在您下次開機時，您將會被詢問要啟動的是 "
 "Windows 或是繼續進行安裝作業。\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -441,15 +422,6 @@ msgstr ""
 "磁碟裡保留 Windows），您可以利用 Windows 控制台中的 新增/移除程式 對話視窗來"
 "移除這個載入器。"
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "是否要立即重新開機？"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "桌面環境："
-
-#~ msgid "None"
-#~ msgstr "無"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Debian 安裝程式"
diff --git a/l10n/win32-loader.c b/l10n/win32-loader.c
index 974eb43..d1c3eea 100644
--- a/l10n/win32-loader.c
+++ b/l10n/win32-loader.c
@@ -117,21 +117,20 @@ main (int argc, char **argv)
   langstring ("graphics1",			_("Select install mode:"));
   langstring ("graphics2",			_("Graphical install"));
   langstring ("graphics3",			_("Text install"));
-  langstring ("nsisdl1",			_("Downloading %s"));
-  langstring ("nsisdl2",			_("Connecting ..."));
-  langstring ("nsisdl3",			_("second"));
-  langstring ("nsisdl4",			_("minute"));
-  langstring ("nsisdl5",			_("hour"));
+  langstring ("connecting",			_("Connecting ..."));
 /*
   translate:
-  This string is appended to "second", "minute" or "hour" to make plurals.
-  I know it's quite unfortunate.  An alternate method for translating NSISdl
-  has been proposed [1] but in the meantime we'll have to cope with this.
-  [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
- */
-  langstring ("nsisdl6",			_("s"));
-  langstring ("nsisdl7",			_("%dkB (%d%%) of %dkB at %d.%01dkB/s"));
-  langstring ("nsisdl8",			_(" (%d %s%s remaining)"));
+  $(^Byte), $0, $1, $4 must not be translated.
+  These are substitutes as the following:
+  $(^Byte) -> B
+  $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+  $1 -> estimated time remaining for the download
+     It includes the unit. Examples are 1h, 5m, 3s
+  $2 -> current size of downloaded content
+  $4 -> total size of file
+  Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
+*/
+  langstring ("progress",			_("$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"));
   langstring ("di_branch1",			_("Select which version of Debian-Installer to use:"));
   langstring ("di_branch2",			_("Stable release.  This will install Debian \"stable\"."));
   langstring ("di_branch3",			_("Daily build.  This is the development version of Debian-Installer.  It will install Debian \"testing\" by default, and may be capable of installing \"stable\" or \"unstable\" as well."));