diff --git a/ChangeLog b/ChangeLog
index af7f03014..252e19e1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-02 German Arias <german@xelalug.org>
+
+	* Source/NSOpenPanel.m: Reverted some previous changes, added GSGuiPrivate.h.
+	* Source/NSColorPanel.m: Added GSGuiPrivate.h.
+	* Source/NSDocument.m: Added missing internationalisation.
+	* Resources/Spanish.lproj/Localizable.strings: More strings on spanish.
+
 2010-01-02 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSColorPanel.m,
diff --git a/Resources/Spanish.lproj/Localizable.strings b/Resources/Spanish.lproj/Localizable.strings
index 3642286a4..aa3ea4be1 100644
--- a/Resources/Spanish.lproj/Localizable.strings
+++ b/Resources/Spanish.lproj/Localizable.strings
@@ -59,6 +59,34 @@ add comments above this one
 
 /*** Unmatched/untranslated keys ***/
 
+/*** Strings from ../Source/NSOpenPanel.m ***/
+/* File: ../Source/NSOpenPanel.m:92 */
+"Open" = "Abrir";
+
+
+/*** Strings from ../Source/NSColorPanel.m ***/
+/* File: ../Source/NSColorPanel.m:227 */
+"Colors" = "Colores";
+
+
+/*** Strings from ../Source/NSFontPanel.m ***/
+/* File: ../Source/NSFontPanel.m:542 */
+"Font Panel" = "Fuentes";
+/* File: ../Source/NSFontPanel.m:566 */
+"Font preview" = "Vista Previa";
+/* File: ../Source/NSFontPanel.m:627 */
+"Size" = "Tama\U00F1o";
+/* File: ../Source/NSFontPanel.m:685 */
+"Revert" = "Revertir";
+/* File: ../Source/NSFontPanel.m:695 */
+"Preview" = "Previa";
+/* File: ../Source/NSFontPanel.m:708 */
+"Set" = "Aplicar";
+/* File: ../Source/NSFontPanel.m:1105 */
+"Family" = "Fuente";
+/* File: ../Source/NSFontPanel.m:1109 */
+"Typeface" = "Estilo";
+
 
 /*** Strings from ../Source/GSHelpManagerPanel.m ***/
 /* File: ../Source/GSHelpManagerPanel.m:70 */
@@ -210,6 +238,8 @@ add comments above this one
 "Save To" = "Guardar Para";
 /* File: ../Source/NSDocument.m:551 */
 "Untitled-%d" = "Sin nombre-%d";
+/* File: ../Source/NSDocument.m:1064 */
+"File Type" = "Tipo de Archivo";
 
 
 /*** Strings from ../Source/NSDocumentController.m ***/
@@ -252,6 +282,8 @@ add comments above this one
 "The path '%@' is not a directory." = "La ruta '%@' no es un directorio.";
 /* File: ../Source/NSSavePanel.m:1228 */
 "Yes" = "Si";
+/* File: ../Source/NSSavePanel.m:236 */
+"Name:" = "Nombre:";
 
 
 /*** Strings from ../Source/NSToolbarItem.m ***/
diff --git a/Source/NSColorPanel.m b/Source/NSColorPanel.m
index 9470592bf..97fe8559b 100644
--- a/Source/NSColorPanel.m
+++ b/Source/NSColorPanel.m
@@ -46,6 +46,8 @@
 #include "AppKit/NSWindow.h"
 #include "GNUstepGUI/IMLoading.h"
 
+#include "GSGuiPrivate.h"
+
 #define MAX_ALPHA_VALUE 100.0
 static NSLock *_gs_gui_color_panel_lock = nil;
 static NSColorPanel *_gs_gui_color_panel = nil;
diff --git a/Source/NSDocument.m b/Source/NSDocument.m
index 3192b95f5..a72eebc4f 100644
--- a/Source/NSDocument.m
+++ b/Source/NSDocument.m
@@ -1061,7 +1061,7 @@ originalContentsURL: (NSURL *)orig
       NSRect spaFrame = NSMakeRect(115,14,150,22);
 
       _save_panel_accessory = [[NSBox alloc] initWithFrame: accessoryFrame];
-      [(NSBox *)_save_panel_accessory setTitle: @"File Type"];
+      [(NSBox *)_save_panel_accessory setTitle: _(@"File Type")];
       [_save_panel_accessory setAutoresizingMask: 
                             NSViewWidthSizable | NSViewHeightSizable];
       _spa_button = [[NSPopUpButton alloc] initWithFrame: spaFrame];
diff --git a/Source/NSOpenPanel.m b/Source/NSOpenPanel.m
index df488c98a..f164dc8a9 100644
--- a/Source/NSOpenPanel.m
+++ b/Source/NSOpenPanel.m
@@ -39,7 +39,6 @@
 */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSBundle.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSNotification.h>
@@ -53,6 +52,8 @@
 #import "AppKit/NSMatrix.h"
 #import "AppKit/NSOpenPanel.h"
 
+#include "GSGuiPrivate.h"
+
 static NSString	*
 pathToColumn(NSBrowser *browser, int column)
 {