From: Michael Prokop <devnull@localhost>
Date: Thu, 25 Sep 2008 15:26:09 +0000 (+0200)
Subject: Update swedish language settings, thanks again to Martin Karresand.
X-Git-Tag: 0.8.13~6
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=e3b050ac536b951adb1a24c65a80ed9cd3a09eb3;hp=43634527f99d0f53449c3cb1b5d59b5bf195c74f

Update swedish language settings, thanks again to Martin Karresand.
---

diff --git a/debian/changelog b/debian/changelog
index 1688d60..66b1844 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ grml-autoconfig (0.8.13) unstable; urgency=low
 
   * Use random password if bootoption 'ssh' doesn't have an option.
     Thanks for the idea to Marc Haber!
+  * Update swedish language settings, thanks again to Martin Karresand.
 
- -- Michael Prokop <mika@grml.org>  Thu, 25 Sep 2008 17:22:17 +0200
+ -- Michael Prokop <mika@grml.org>  Thu, 25 Sep 2008 17:25:30 +0200
 
 grml-autoconfig (0.8.12) unstable; urgency=low
 
diff --git a/language-functions b/language-functions
index 51c6e01..300d0e8 100644
--- a/language-functions
+++ b/language-functions
@@ -745,28 +745,28 @@ case "$LANGUAGE" in
                 ;;
         se-iso)
                 # Swedish version
-                LANGUAGE="se"
+                LANGUAGE="sv_SE:sv"
                 COUNTRY="se"
-                LANG="sv_SE"
+                LANG="sv_SE.iso885915"
                 KEYTABLE="se-latin1"
                 XKEYBOARD="se"
                 KDEKEYBOARD="se"
-                CHARSET="iso8859-1"
+                CHARSET="sv_SE.iso885915"
                 # Additional KDE Keyboards
-                KDEKEYBOARDS="us"
+                KDEKEYBOARDS="us,fi"
                 TZ="Europe/Stockholm"
                 ;;
         se|se-utf8)
                 # Swedish version (UTF8)
                 LANGUAGE="sv_SE:sv"
                 COUNTRY="se"
-                LANG="sv_SE.UTF-8"
-                KEYTABLE="se"
+                LANG="sv_SE.utf8"
+                KEYTABLE="se-latin1"
                 XKEYBOARD="se"
                 KDEKEYBOARD="se"
                 CHARSET="utf8"
                 # Additional KDE Keyboards
-                KDEKEYBOARDS="us"
+                KDEKEYBOARDS="us,fi"
                 TZ="Europe/Stockholm"
                 ;;
         sk-iso)