Fix incorrect characters.

pull/1/head
Darrell Anderson 11 years ago
parent 34cf284af9
commit e8fb385870

@ -444,7 +444,7 @@ fixed filesize display for very large files and projects (integer overflow)
fixed CD-TEXT reading. On some systems some senseless characters where appended. fixed CD-TEXT reading. On some systems some senseless characters where appended.
fixed Id3lib detection in configure.in.in fixed Id3lib detection in configure.in.in
added primitive supermount support added primitive supermount support
kernel 2.5 compile fixes (thanks to ismail (cartman) d<EFBFBD>mez <ismail.donmez@boun.edu.tr>) kernel 2.5 compile fixes (thanks to ismail (cartman) dönmez <ismail.donmez@boun.edu.tr>)
K3b now defaults to the generic-mmc cdrdao driver if the used burner is not listed in K3b now defaults to the generic-mmc cdrdao driver if the used burner is not listed in
cdrdao's driver table. As all modern drives use the generic-mmc driver anyway this cdrdao's driver table. As all modern drives use the generic-mmc driver anyway this
is valid and prevents from a lot of newbie problems. is valid and prevents from a lot of newbie problems.

@ -1188,7 +1188,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device )
// TODO: also import some other pd fields // TODO: also import some other pd fields
const K3bIso9660Directory* rootDir = iso.firstRRDirEntry(); const K3bIso9660Directory* rootDir = iso.firstRRDirEntry();
// J<EFBFBD>rg Schilling says that it is impossible to import the joliet tree for multisession // Jörg Schilling says that it is impossible to import the joliet tree for multisession
// if( !rootDir ) // if( !rootDir )
// rootDir = iso.firstJolietDirEntry(); // rootDir = iso.firstJolietDirEntry();
if( !rootDir ) if( !rootDir )

@ -319,7 +319,7 @@ class LIBK3B_EXPORT K3bIso9660File : public K3bIso9660Entry
/** /**
* This class is based on the KIso class by * This class is based on the KIso class by
* Gy<EFBFBD>gy Szombathelyi <gyurco@users.sourceforge.net>. * György Szombathelyi <gyurco@users.sourceforge.net>.
* A lot has been changed and bugfixed. * A lot has been changed and bugfixed.
* The API has been improved to be useful. * The API has been improved to be useful.
* *

@ -73,18 +73,18 @@ namespace K3bDevice {
s += TQString( " %1 |" ).arg( pack[i].dbcc, 4 ); s += TQString( " %1 |" ).arg( pack[i].dbcc, 4 );
// char str[12]; // char str[12];
// sprintf( str, "%c%c%c%c%c%c%c%c%c%c%c%c", // sprintf( str, "%c%c%c%c%c%c%c%c%c%c%c%c",
// pack[i].data[0] == '\0' ? '<27>' : pack[i].data[0], // pack[i].data[0] == '\0' ? '°' : pack[i].data[0],
// pack[i].data[1] == '\0' ? '<27>' : pack[i].data[1], // pack[i].data[1] == '\0' ? '°' : pack[i].data[1],
// pack[i].data[2] == '\0' ? '<27>' : pack[i].data[2], // pack[i].data[2] == '\0' ? '°' : pack[i].data[2],
// pack[i].data[3] == '\0' ? '<27>' : pack[i].data[3], // pack[i].data[3] == '\0' ? '°' : pack[i].data[3],
// pack[i].data[4] == '\0' ? '<27>' : pack[i].data[4], // pack[i].data[4] == '\0' ? '°' : pack[i].data[4],
// pack[i].data[5] == '\0' ? '<27>' : pack[i].data[5], // pack[i].data[5] == '\0' ? '°' : pack[i].data[5],
// pack[i].data[6] == '\0' ? '<27>' : pack[i].data[6], // pack[i].data[6] == '\0' ? '°' : pack[i].data[6],
// pack[i].data[7] == '\0' ? '<27>' : pack[i].data[7], // pack[i].data[7] == '\0' ? '°' : pack[i].data[7],
// pack[i].data[8] == '\0' ? '<27>' : pack[i].data[8], // pack[i].data[8] == '\0' ? '°' : pack[i].data[8],
// pack[i].data[9] == '\0' ? '<27>' : pack[i].data[9], // pack[i].data[9] == '\0' ? '°' : pack[i].data[9],
// pack[i].data[10] == '\0' ? '<27>' : pack[i].data[10], // pack[i].data[10] == '\0' ? '°' : pack[i].data[10],
// pack[i].data[11] == '\0' ? '<27>' : pack[i].data[11] ); // pack[i].data[11] == '\0' ? '°' : pack[i].data[11] );
// s += TQString( " %1 |" ).arg( "'" + TQCString(str,13) + "'", 14 ); // s += TQString( " %1 |" ).arg( "'" + TQCString(str,13) + "'", 14 );
// TQ_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1]; // TQ_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1];
// s += TQString( " %1 |" ).arg( crc ); // s += TQString( " %1 |" ).arg( crc );

@ -1,7 +1,7 @@
// vim: set tabstop=4 shiftwidth=4 noexpandtab // vim: set tabstop=4 shiftwidth=4 noexpandtab
/* /*
Gwenview - A simple image viewer for KDE Gwenview - A simple image viewer for KDE
Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau Copyright 2000-2004 Aurélien Gâteau
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

@ -288,7 +288,7 @@ void K3bMainWindow::initActions()
actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()), actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()),
actionCollection(), "tools_blank_cdrw" ); actionCollection(), "tools_blank_cdrw" );
TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("<EFBFBD>"), "formatdvd", 0, TQT_TQOBJECT(this), TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("±"), "formatdvd", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" );
actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()), actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()),
actionCollection(), "tools_write_cd_image" ); actionCollection(), "tools_write_cd_image" );
@ -330,7 +330,7 @@ void K3bMainWindow::initActions()
actionFileNewMovix->setToolTip( i18n("Creates a new eMovix CD project") ); actionFileNewMovix->setToolTip( i18n("Creates a new eMovix CD project") );
actionFileNewVcd->setToolTip( i18n("Creates a new Video CD project") ); actionFileNewVcd->setToolTip( i18n("Creates a new Video CD project") );
actionToolsBlankCdrw->setToolTip( i18n("Open the CD-RW erasing dialog") ); actionToolsBlankCdrw->setToolTip( i18n("Open the CD-RW erasing dialog") );
actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").arg("<EFBFBD>") ); actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").arg("±") );
actionCdCopy->setToolTip( i18n("Open the CD copy dialog") ); actionCdCopy->setToolTip( i18n("Open the CD copy dialog") );
actionToolsWriteCdImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to CD") ); actionToolsWriteCdImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to CD") );
actionToolsWriteDvdImage->setToolTip( i18n("Write an Iso9660 image to DVD") ); actionToolsWriteDvdImage->setToolTip( i18n("Write an Iso9660 image to DVD") );

@ -152,11 +152,11 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
// //
if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) && if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) &&
(d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) ) (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) )
d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("<EFBFBD>"); d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("±");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL ) else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL )
d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("<EFBFBD>"); d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("±");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL ) else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL )
d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("<EFBFBD>"); d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("±");
else else
d->wantedMediaTypeString = i18n("CD-R(W)"); d->wantedMediaTypeString = i18n("CD-R(W)");

@ -41,7 +41,7 @@
K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* name, bool modal ) K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* name, bool modal )
: K3bInteractionDialog( parent, name, : K3bInteractionDialog( parent, name,
i18n("DVD Formatting"), i18n("DVD Formatting"),
i18n("DVD%1RW").arg("<EFBFBD>"), i18n("DVD%1RW").arg("±"),
START_BUTTON|CANCEL_BUTTON, START_BUTTON|CANCEL_BUTTON,
START_BUTTON, START_BUTTON,
"DVD Formatting", // config group "DVD Formatting", // config group

Loading…
Cancel
Save