Index: inc/gettext.pp
===================================================================
--- inc/gettext.pp	(revision 1444)
+++ inc/gettext.pp	(working copy)
@@ -70,14 +70,14 @@
   EMOFileError = class(Exception);
 
 
-  procedure GetLanguageIDs(var Lang, FallbackLang: string);
+  procedure GetLanguageIDs(out Lang, FallbackLang: string);
   procedure TranslateResourceStrings(AFile: TMOFile);
   procedure TranslateResourceStrings(const AFilename: String);
 
 
 implementation
 
-uses {$ifdef win32} windows, {$endif}dos;
+{$ifdef win32}uses windows;{$endif}
 
 var
   GettextUsed: Boolean;
@@ -261,7 +261,7 @@
 {$endif}
 
 {$ifdef win32}
-procedure GetLanguageIDs(var Lang, FallbackLang: string);
+procedure GetLanguageIDs(out Lang, FallbackLang: string);
 var
   Buffer: array[1..4] of char;
   Country: string;
@@ -286,15 +286,15 @@
 
 {$else}
 
-procedure GetLanguageIDs(var Lang, FallbackLang: string);
+procedure GetLanguageIDs(out Lang, FallbackLang: string);
 begin
-  lang := GetEnv('LC_ALL');
+  lang := GetEnvironmentVariable('LC_ALL');
   if Length(lang) = 0 then
   begin
-    lang := GetEnv('LC_MESSAGES');
+    lang := GetEnvironmentVariable('LC_MESSAGES');
     if Length(lang) = 0 then
     begin
-      lang := GetEnv('LANG');
+      lang := GetEnvironmentVariable('LANG');
       if Length(lang) = 0 then
         exit;   // no language defined via environment variables
     end;
