Use only UTF-8 encoded NSIS language files

1 files changed, 5 insertions, 17 deletions

diff --git a/l10n/win32-loader.sh b/l10n/win32-loader.sh
index f39835d..c71d5e0 100755
--- a/l10n/win32-loader.sh
+++ b/l10n/win32-loader.sh
@@ -67,7 +67,7 @@ fi
 gettext English > /dev/null
 
 # The bulk of the strings
-./win32-loader | iconv -c -f utf-8 -t "${charset}"
+./win32-loader
 
 # Now comes a string that may be used by NTLDR (or not).  So we need both
 # samples.
@@ -88,19 +88,7 @@ d_i=`gettext '$target_distro $kernel_name - Continue with install process'`
 pxe=`gettext "PXE - Network boot"`
 
 #  - Then we get a sample for bootmgr in the native charset.
-echo "${d_i}" | iconv -c -f utf-8 -t "${charset}" | langstring d-i
-echo "${pxe}" | iconv -c -f utf-8 -t "${charset}" | langstring pxe
-
-#  - And another for ntldr in its own charset.  If the charset cannot be
-#    converted to ${ntldr_charset}, fallback to English untill it's fixed.
-(if echo "${d_i}" | iconv -c -f utf-8 -t "${ntldr_charset}" > /dev/null 2>&1 ; then
-  echo "${d_i}" | iconv -c -f utf-8 -t "${ntldr_charset}"
-else
-  echo '$target_distro $kernel_name - Continue with install process'
-fi) | langstring d-i_ntldr
-
-(if echo "${pxe}" | iconv -c -f utf-8 -t "${ntldr_charset}" > /dev/null 2>&1 ; then
-  echo "${pxe}" | iconv -c -f utf-8 -t "${ntldr_charset}"
-else
-  echo "PXE - Network boot"
-fi) | langstring pxe_ntldr
+echo "${d_i}" | langstring d-i
+echo "${d_i}" | langstring d-i_ntldr
+echo "${pxe}" | langstring pxe
+echo "${pxe}" | langstring pxe_ntldr