Merge from 1.1 (except po/*; translators needed for this).

--HG--
rename : src/video_out/vidix/drivers/mga_vid.c => contrib/vidix/drivers/mga_vid.c
rename : src/video_out/vidix/drivers/nvidia_vid.c => contrib/vidix/drivers/nvidia_vid.c
rename : src/video_out/vidix/drivers/savage_vid.c => contrib/vidix/drivers/savage_vid.c
rename : src/xine-engine/video_out.h => include/xine/video_out.h
rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h
rename : po/libxine1.pot => po/libxine2.pot
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c

3 files changed, 7 insertions, 7 deletions

diff --git a/contrib/vidix/drivers/mga_vid.c b/contrib/vidix/drivers/mga_vid.c
index eed2b9e65..edebc0c4f 100644
--- a/contrib/vidix/drivers/mga_vid.c
+++ b/contrib/vidix/drivers/mga_vid.c
@@ -425,7 +425,7 @@ static void mga_vid_write_regs(int restore)
 	writeb(PALWTADD,  XCOLMSK);
 	writeb(X_DATAREG, colkey_mask[3]);
 
-	printf(MGA_MSG" Restored colorkey (ON: %d  %02X:%02X:%02X)\n",
+	printf(MGA_MSG" Restored colour key (ON: %d  %02X:%02X:%02X)\n",
 	       colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]);
 
     } else if (!colkey_saved) {
@@ -453,7 +453,7 @@ static void mga_vid_write_regs(int restore)
 	writeb(PALWTADD,  XCOLMSK);
 	colkey_mask[3]=(unsigned char)readb(X_DATAREG);
 
-	printf(MGA_MSG" Saved colorkey (ON: %d  %02X:%02X:%02X)\n",
+	printf(MGA_MSG" Saved colour key (ON: %d  %02X:%02X:%02X)\n",
 	       colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]);
     }
 
diff --git a/contrib/vidix/drivers/nvidia_vid.c b/contrib/vidix/drivers/nvidia_vid.c
index 34fa27cb7..b051df326 100644
--- a/contrib/vidix/drivers/nvidia_vid.c
+++ b/contrib/vidix/drivers/nvidia_vid.c
@@ -955,12 +955,12 @@ int vixSetGrKeys( const vidix_grkey_t * grkey){
   if (grkey->ckey.op == CKEY_FALSE)
   {
     info->use_colorkey = 0;
-    printf("[nvidia_vid] colorkeying disabled\n");
+    printf("[nvidia_vid] colour keying disabled\n");
   }
   else {
   info->use_colorkey = 1;
   info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue);
-  printf("[nvidia_vid] set colorkey 0x%x\n",info->vidixcolorkey);
+  printf("[nvidia_vid] set colour key 0x%x\n",info->vidixcolorkey);
   }
   if(info->d_width && info->d_height)rivatv_overlay_start(info,0);
   return 0;
diff --git a/contrib/vidix/drivers/savage_vid.c b/contrib/vidix/drivers/savage_vid.c
index 2ac76198d..17040cc15 100644
--- a/contrib/vidix/drivers/savage_vid.c
+++ b/contrib/vidix/drivers/savage_vid.c
@@ -370,7 +370,7 @@ static void SavageSetColorKeyOld(void)
     blue = info->vidixcolorkey & 0x000000FF;
 
     if( !info->vidixcolorkey ) {
-      printf("SavageSetColorKey disabling colorkey\n");
+      printf("SavageSetColorKey disabling colour key\n");
       OUTREG( COL_CHROMA_KEY_CONTROL_REG, 0 );
       OUTREG( CHROMA_KEY_UPPER_BOUND_REG, 0 );
       OUTREG( BLEND_CONTROL_REG, 0 );
@@ -1134,13 +1134,13 @@ vixSetGrKeys (const vidix_grkey_t * grkey)
   {
     info->use_colorkey = 0;
     info->vidixcolorkey=0;
-    printf("[savage_vid] colorkeying disabled\n");
+    printf("[savage_vid] colour keying disabled\n");
   }
   else {
     info->use_colorkey = 1;
     info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue);
 
-    printf("[savage_vid] set colorkey 0x%x\n",info->vidixcolorkey);
+    printf("[savage_vid] set colour key 0x%x\n",info->vidixcolorkey);
   }
 	//FIXME: freezes if streams arent enabled
   SavageSetColorKeyOld();