X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=language-functions;h=3f4091f5c6ad158777650bdf9aca4239205e55d5;hp=214890e083a0aa50e4624bfd32bc188dc1146290;hb=0fb27baedd40895f6ab82017c3a3e137ee488955;hpb=965b86e04b7ab20220eb0ba35212e67080ada6b0 diff --git a/language-functions b/language-functions index 214890e..3f4091f 100644 --- a/language-functions +++ b/language-functions @@ -206,8 +206,8 @@ case "$LANGUAGE" in COUNTRY="ch" LANG="de_CH.UTF-8" KEYTABLE="sg-latin1" - XKEYBOARD="de_CH" - KDEKEYBOARD="de_CH" + XKEYBOARD="ch" + KDEKEYBOARD="ch" CHARSET="utf8" # Additional KDE Keyboards KDEKEYBOARDS="de,us,fr" @@ -343,7 +343,7 @@ case "$LANGUAGE" in KDEKEYBOARD="dvorak,us,de" CHARSET="utf8" KDEKEYBOARDS="dvorak,us,de,fr" - TZ="Europe/Vienna" + TZ="UTC" ;; dvorak-iso) # Dvorak layout (ISO) @@ -355,7 +355,7 @@ case "$LANGUAGE" in KDEKEYBOARD="dvorak,us,de" CHARSET="iso8859-15" KDEKEYBOARDS="dvorak,us,de,fr" - TZ="Europe/Vienna" + TZ="UTC" ;; en-iso) # English in Austria [see us + uk for american and english version!] @@ -368,7 +368,7 @@ case "$LANGUAGE" in KDEKEYBOARD="us" CHARSET="iso8859-15" KDEKEYBOARDS="de,fr" - TZ="Europe/Vienna" + TZ="UTC" ;; en|en-utf8) # English in Austria [see us + uk for american and english version!] (UTF8) @@ -381,7 +381,7 @@ case "$LANGUAGE" in CHARSET="utf8" # Additional KDE Keyboards KDEKEYBOARDS="de,fr" - TZ="Europe/Vienna" + TZ="UTC" ;; el-iso) # Greek version @@ -941,7 +941,7 @@ case "$LANGUAGE" in KDEKEYBOARD="us" CHARSET="utf8" KDEKEYBOARDS="de,fr" - TZ="Europe/Vienna" + TZ="UTC" ;; esac