hal/libhal-storage libhal-storage.c,1.20,1.21

[David Zeuthen]

Update of /cvs/hal/hal/libhal-storage
In directory gabe:/tmp/cvs-serv19137/libhal-storage

Modified Files:
	libhal-storage.c 
Log Message:
2005-07-29  David Zeuthen  <davidz at redhat.com>

        Patch from Danny Kukawka <danny.kukawka at web.de>.

        * libhal-storage/libhal-storage.c,
        tools/device-manager/hal-device-manager.glade, tools/fstab-sync.c:
        this is a patch to fix typos of translatable strings. New
        translation files will follow due to end of August.



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- libhal-storage.c	22 Jul 2005 18:57:29 -0000	1.20
+++ libhal-storage.c	29 Jul 2005 17:57:04 -0000	1.21
@@ -382,75 +382,74 @@
 		default:
 			/* explict fallthrough */
 		case LIBHAL_VOLUME_DISC_TYPE_CDROM:
-			name = strdup (_("CD-ROM Disc"));
+			name = strdup (_("CD-ROM "));
 			break;
 			
 		case LIBHAL_VOLUME_DISC_TYPE_CDR:
 			if (libhal_volume_disc_is_blank (volume))
-				name = strdup (_("Blank CD-R Disc"));
+				name = strdup (_("Blank CD-R"));
 			else
-				name = strdup (_("CD-R Disc"));
+				name = strdup (_("CD-R"));
 			break;
 			
 		case LIBHAL_VOLUME_DISC_TYPE_CDRW:
 			if (libhal_volume_disc_is_blank (volume))
-				name = strdup (_("Blank CD-RW Disc"));
+				name = strdup (_("Blank CD-RW"));
 			else
-				name = strdup (_("CD-RW Disc"));
+				name = strdup (_("CD-RW"));
 			break;
 			
 		case LIBHAL_VOLUME_DISC_TYPE_DVDROM:
-			name = strdup (_("DVD-ROM Disc"));
+			name = strdup (_("DVD-ROM"));
 			break;
 			
 		case LIBHAL_VOLUME_DISC_TYPE_DVDRAM:
 			if (libhal_volume_disc_is_blank (volume))
-				name = strdup (_("Blank DVD-RAM Disc"));
+				name = strdup (_("Blank DVD-RAM"));
 			else
-				name = strdup (_("DVD-RAM Disc"));
+				name = strdup (_("DVD-RAM"));
 			break;
 			
 		case LIBHAL_VOLUME_DISC_TYPE_DVDR:
 			if (libhal_volume_disc_is_blank (volume))
-				name = strdup (_("Blank DVD-R Disc"));
+				name = strdup (_("Blank DVD-R"));
 			else
-				name = strdup (_("DVD-R Disc"));
+				name = strdup (_("DVD-R"));
 			break;
 			
 		case LIBHAL_VOLUME_DISC_TYPE_DVDRW:
 			if (libhal_volume_disc_is_blank (volume))
-				name = strdup (_("Blank DVD-RW Disc"));
+				name = strdup (_("Blank DVD-RW"));
 			else
-				name = strdup (_("DVD-RW Disc"));
-
+				name = strdup (_("DVD-RW"));
 			break;
 
 		case LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR:
 			if (libhal_volume_disc_is_blank (volume))
-				name = strdup (_("Blank DVD+R Disc"));
+				name = strdup (_("Blank DVD+R"));
 			else
-				name = strdup (_("DVD+R Disc"));
+				name = strdup (_("DVD+R"));
 			break;
 			
 		case LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW:
 			if (libhal_volume_disc_is_blank (volume))
-				name = strdup (_("Blank DVD+RW Disc"));
+				name = strdup (_("Blank DVD+RW"));
 			else
-				name = strdup (_("DVD+RW Disc"));
+				name = strdup (_("DVD+RW"));
 			break;
 		
 		case LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR_DL:
 			if (libhal_volume_disc_is_blank (volume))
-				name = strdup (_("Blank DVD+R Dual-Layer Disc"));
+				name = strdup (_("Blank DVD+R Dual-Layer"));
 			else
-				name = strdup (_("DVD+R Dual-Layer Disc"));
+				name = strdup (_("DVD+R Dual-Layer"));
 			break;
 		}
 		
 		/* Special case for pure audio disc */
 		if (libhal_volume_disc_has_audio (volume) && !libhal_volume_disc_has_data (volume)) {
 			free (name);
-			name = strdup (_("Audio Disc"));
+			name = strdup (_("Audio CD"));
 		}
 
 		goto out;