diff --git a/ChangeLog b/ChangeLog
index 13aa72c16..af7f03014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-02 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSColorPanel.m,
+	* Source/NSOpenPanel.m,
+	* Source/NSSavePanel.m: Add missing internationalisation.
+
 2009-12-31 Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Source/NSShadow.m, Headers/AppKit/NSShadow.h:
diff --git a/Source/NSColorPanel.m b/Source/NSColorPanel.m
index f88a8000c..9470592bf 100644
--- a/Source/NSColorPanel.m
+++ b/Source/NSColorPanel.m
@@ -222,7 +222,7 @@ static int _gs_gui_color_picker_mode = NSRGBModeColorPanel;
 			    backing: NSBackingStoreRetained
 			      defer: NO
 			     screen: nil];
-  [self setTitle: @"Colors"];
+  [self setTitle: _(@"Colors")];
 
   v = [self contentView];
 
@@ -284,7 +284,7 @@ static int _gs_gui_color_picker_mode = NSRGBModeColorPanel;
   [_alphaSlider setMaxValue: MAX_ALPHA_VALUE];
   [_alphaSlider setFloatValue: MAX_ALPHA_VALUE];
   [_alphaSlider setContinuous: YES];
-  [_alphaSlider setTitle: @"Opacity"];
+  [_alphaSlider setTitle: _(@"Opacity")];
   [[_alphaSlider cell] setBezeled: YES];
   [_alphaSlider setTarget: self];
   [_alphaSlider setAction: @selector(_alphaChanged:)];
diff --git a/Source/NSOpenPanel.m b/Source/NSOpenPanel.m
index 7feb0f9ff..df488c98a 100644
--- a/Source/NSOpenPanel.m
+++ b/Source/NSOpenPanel.m
@@ -7,10 +7,10 @@
    Author: Scott Christley <scottc@net-community.com>
    Date: 1996
 
-   Author: Daniel Bðhringer <boehring@biomed.ruhr-uni-bochum.de>
+   Author: Daniel Boehringer <boehring@biomed.ruhr-uni-bochum.de>
    Date: August 1998
 
-   Source by Daniel Bðhringer integrated into Scott Christley's preliminary
+   Source by Daniel Boehringer integrated into Scott Christley's preliminary
    implementation by Felipe A. Rodriguez <far@ix.netcom.com>
 
    Author: Nicola Pero <n.pero@mi.flashnet.it>
@@ -38,19 +38,20 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <Foundation/NSString.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSFileManager.h>
-#include <Foundation/NSNotification.h>
-#include <Foundation/NSURL.h>
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSBrowser.h"
-#include "AppKit/NSBrowserCell.h"
-#include "AppKit/NSButton.h"
-#include "AppKit/NSForm.h"
-#include "AppKit/NSMatrix.h"
-#include "AppKit/NSOpenPanel.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSBrowser.h"
+#import "AppKit/NSBrowserCell.h"
+#import "AppKit/NSButton.h"
+#import "AppKit/NSForm.h"
+#import "AppKit/NSMatrix.h"
+#import "AppKit/NSOpenPanel.h"
 
 static NSString	*
 pathToColumn(NSBrowser *browser, int column)
@@ -87,7 +88,7 @@ static NSOpenPanel *_gs_gui_open_panel = nil;
 - (void) _resetDefaults
 {
   [super _resetDefaults];
-  [self setTitle: @"Open"];
+  [self setTitle: _(@"Open")];
   [self setCanChooseFiles: YES];
   [self setCanChooseDirectories: YES];
   [self setAllowsMultipleSelection: NO];
@@ -129,7 +130,7 @@ static NSOpenPanel *_gs_gui_open_panel = nil;
       else
 	{
 	  [_form abortEditing];
-	  [[_form cellAtIndex: 0] setStringValue:@""];
+	  [[_form cellAtIndex: 0] setStringValue: @""];
 	  [_form setNeedsDisplay: YES];
 	  [_okButton setEnabled: YES];
 	}
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index 75644dbae..f4bb2c304 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -32,29 +32,29 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <Foundation/NSAutoreleasePool.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSFileManager.h>
-#include <Foundation/NSNotification.h>
-#include <Foundation/NSPathUtilities.h>
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSURL.h>
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSBox.h"
-#include "AppKit/NSBrowser.h"
-#include "AppKit/NSBrowserCell.h"
-#include "AppKit/NSButton.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSForm.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSImageView.h"
-#include "AppKit/NSMatrix.h"
-#include "AppKit/NSPasteboard.h"
-#include "AppKit/NSDragging.h"
-#include "AppKit/NSSavePanel.h"
-#include "AppKit/NSTextField.h"
-#include "AppKit/NSWorkspace.h"
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSPathUtilities.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSURL.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSBox.h"
+#import "AppKit/NSBrowser.h"
+#import "AppKit/NSBrowserCell.h"
+#import "AppKit/NSButton.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSForm.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSImageView.h"
+#import "AppKit/NSMatrix.h"
+#import "AppKit/NSPasteboard.h"
+#import "AppKit/NSDragging.h"
+#import "AppKit/NSSavePanel.h"
+#import "AppKit/NSTextField.h"
+#import "AppKit/NSWorkspace.h"
 
 #include "GSGuiPrivate.h"
 
@@ -233,7 +233,7 @@ setPath(NSBrowser *browser, NSString *path)
 
   r = NSMakeRect (8, 39, 291, 21);
   _form = [NSForm new];
-  [_form addEntry: @"Name:"];
+  [_form addEntry: _(@"Name:")];
   [_form setFrame: r];
   // Force the size we want
   [_form setCellSize: NSMakeSize (291, 21)];
@@ -296,7 +296,7 @@ setPath(NSBrowser *browser, NSString *path)
   r = NSMakeRect (148, 6, 71, 27);
   button = [[NSButton alloc] initWithFrame: r]; 
   [button setBordered: YES];
-  [button setTitle:  @"Cancel"];
+  [button setTitle:  _(@"Cancel")];
   [button setImagePosition: NSNoImage]; 
   [button setTarget: self];
   [button setAction: @selector(cancel:)];
@@ -312,7 +312,7 @@ setPath(NSBrowser *browser, NSString *path)
   r = NSMakeRect (228, 6, 71, 27);
   _okButton = [[NSButton alloc] initWithFrame: r]; 
   [_okButton setBordered: YES];
-  [_okButton setTitle:  @"OK"];
+  [_okButton setTitle:  _(@"OK")];
   [_okButton setImagePosition: NSImageRight]; 
   [_okButton setImage: [NSImage imageNamed: @"common_ret"]];
   [_okButton setAlternateImage: [NSImage imageNamed: @"common_retH"]];
@@ -410,8 +410,8 @@ setPath(NSBrowser *browser, NSString *path)
 - (void) _resetDefaults
 {
   [self _setDefaultDirectory];
-  [self setPrompt: @"Name:"];
-  [self setTitle: @"Save"];
+  [self setPrompt: _(@"Name:")];
+  [self setTitle: _(@"Save")];
   [self setAllowedFileTypes: nil];
   [self setAllowsOtherFileTypes: NO];
   [self setTreatsFilePackagesAsDirectories: NO];
@@ -1699,7 +1699,7 @@ createRowsForColumn: (int)column
     {
       display_progress = YES;
       base_frac = count / 4;
-      progressString = [@"Reading Directory " stringByAppendingString: path];
+      progressString = [_(@"Reading Directory ") stringByAppendingString: path];
       [super setTitle: progressString];
       // Is the following really safe? 
       [self flushWindow];
@@ -1848,7 +1848,7 @@ createRowsForColumn: (int)column
   NSComparisonResult  result;
   NSRange             range;
 
-  s = [[[aNotification userInfo] objectForKey:@"NSFieldEditor"] string];
+  s = [[[aNotification userInfo] objectForKey: @"NSFieldEditor"] string];
 
   /*
    * If the user typed in an absolute path, display it.