diff --git a/ChangeLog b/ChangeLog
index 3625dfb76..278768775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-03 German Arias <german@xelalug.org>
+
+	* Source/NSPrintPanel.m,
+	* Source/NSPrintOperation.m,
+	* Source/GSThemeInspector.m: Added missing internationalisation, now is
+        completed (or so I hope).
+	* Resources/Spanish.lproj/Localizable.strings: More strings in spanish
+        (with this the translation to spanish is finished).
+
 2010-01-03 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Resources/English.lproj/Localizable.strings: Regenerate this file.
diff --git a/Resources/Spanish.lproj/Localizable.strings b/Resources/Spanish.lproj/Localizable.strings
index 771bcb813..3a854517b 100644
--- a/Resources/Spanish.lproj/Localizable.strings
+++ b/Resources/Spanish.lproj/Localizable.strings
@@ -50,6 +50,7 @@ add comments above this one
 /* File: ../Source/GSHelpManagerPanel.m:101 */
 /* File: ../Source/NSAlert.m:1427 */
 /* File: ../Source/NSPrintPanel.m:285 */
+/* File: ../Source/NSPrintOperation.m:681 */
 "OK" = "Aceptar";
 
 /* File: ../Source/GSPrintOperation.m:159 */
@@ -89,6 +90,17 @@ add comments above this one
 "Open" = "Abrir";
 
 
+/*** Strings from ../Source/GSThemeInspector.m ***/
+/* File: ../Source/GSThemeInspector.m:140 */
+"Version: %@" = "Versi\U00F3n: %@";
+
+
+/*** Strings from ../Source/NSPrintOperation.m ***/
+/* File: ../Source/NSPrintOperation.m:680 */
+"Error" = "Error";
+"Printing error: %@" = "Error de impresi\U00F3n: %@";
+
+
 /*** Strings from ../Source/NSFontPanel.m ***/
 /* File: ../Source/NSFontPanel.m:239 */
 "Multiple fonts selected" = "Varias fuentes seleccionadas";
@@ -147,6 +159,10 @@ add comments above this one
 /* File: ../Source/NSPrintPanel.m:284 */
 "Sorry" = "Error";
 "Faxing of print file not implemented" = "El faxeo de archivos no esta implementado";
+/* File: ../Source/NSPrintPanel.m:467 */
+/* File: ../Source/NSPrintPanel.m:602 */
+/* File: ../Source/NSPrintPanel.m:609 */
+"Manual" = "Manual";
 
 
 /*** Strings from ../Source/GSInoPanel.m ***/
diff --git a/Source/GSThemeInspector.m b/Source/GSThemeInspector.m
index 679a82844..a61f1c3d8 100644
--- a/Source/GSThemeInspector.m
+++ b/Source/GSThemeInspector.m
@@ -33,6 +33,7 @@
 #include "AppKit/NSTextView.h"
 #include "AppKit/NSWindow.h"
 #include "GSThemePrivate.h"
+#include "GSGuiPrivate.h"
 
 static NSTextField *
 new_label (NSString *value)
@@ -136,7 +137,7 @@ static GSThemeInspector	*sharedInspector = nil;
   version = [[theme infoDictionary] objectForKey: @"GSThemeVersion"];
   if ([version length] > 0)
     {
-      version = [NSString stringWithFormat: @"Version: %@", version];
+      version = [NSString stringWithFormat: _(@"Version: %@"), version];
       tf = new_label(version);
       [tf setFont: [NSFont systemFontOfSize: 12]];
       [tf sizeToFit];
diff --git a/Source/NSPrintOperation.m b/Source/NSPrintOperation.m
index ce24e1c5c..be1da44ac 100644
--- a/Source/NSPrintOperation.m
+++ b/Source/NSPrintOperation.m
@@ -60,6 +60,7 @@
 #include "GNUstepGUI/GSEPSPrintOperation.h"
 #include "GNUstepGUI/GSPDFPrintOperation.h"
 #include "GNUstepGUI/GSPrintOperation.h"
+#include "GSGuiPrivate.h"
 
 #define NSNUMBER(a) [NSNumber numberWithInt: (a)]
 #define NSFNUMBER(a) [NSNumber numberWithFloat: (a)]
@@ -676,8 +677,8 @@ static NSString *NSPrintOperationThreadKey = @"NSPrintOperationThreadKey";
     {
       [_view _cleanupPrinting];
       [NSGraphicsContext setCurrentContext: oldContext];
-      NSRunAlertPanel(@"Error", @"Printing error: %@", 
-                      @"OK", NULL, NULL, localException);
+      NSRunAlertPanel(_(@"Error"), _(@"Printing error: %@"), 
+                      _(@"OK"), NULL, NULL, localException);
     }
   NS_ENDHANDLER
   [self destroyContext];
diff --git a/Source/NSPrintPanel.m b/Source/NSPrintPanel.m
index b4ce982a5..c76f8a019 100644
--- a/Source/NSPrintPanel.m
+++ b/Source/NSPrintPanel.m
@@ -464,7 +464,7 @@ static NSPrintPanel *shared_instance;
 
       manual = [printer stringForKey:@"DefaultManualFeed" inTable: @"PPD"];
       if (manual)
-	[control addItemWithTitle: @"Manual"];
+	[control addItemWithTitle: _(@"Manual")];
       list = [printer stringListForKey:@"InputSlot" inTable: @"PPD"];
       if ([list count])
 	{
@@ -599,14 +599,14 @@ static NSPrintPanel *shared_instance;
       if (manual)
 	{
 	  if (selected == 0)
-	    sel = @"Manual";
+	    sel = _(@"Manual");
 	  else
 	    selected--;
 	}
       if (sel == nil)
 	sel = [list objectAtIndex: selected];
       def = [printer stringForKey:@"DefaultInputSlot" inTable: @"PPD"];
-      if ([sel isEqual: @"Manual"] == YES)
+      if ([sel isEqual: _(@"Manual")] == YES)
 	{
 	  [dict setObject: NSPrintManualFeed forKey: NSPrintPaperFeed];
 	  /* FIXME: This needs to be more robust. I'm just assuming