summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.cpp2
-rw-r--r--libk3b/tools/k3biso9660.h2
-rw-r--r--libk3bdevice/k3bcdtext.cpp24
-rw-r--r--src/fastscale/scale.h2
-rw-r--r--src/k3b.cpp4
-rw-r--r--src/k3bemptydiscwaiter.cpp6
-rw-r--r--src/misc/k3bdvdformattingdialog.cpp2
8 files changed, 22 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 92fc18b..ca44348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 Id3lib detection in configure.in.in
added primitive supermount support
-kernel 2.5 compile fixes (thanks to ismail (cartman) d�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
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.
diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index debc574..d25e342 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -1188,7 +1188,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device )
// TODO: also import some other pd fields
const K3bIso9660Directory* rootDir = iso.firstRRDirEntry();
- // J�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 )
// rootDir = iso.firstJolietDirEntry();
if( !rootDir )
diff --git a/libk3b/tools/k3biso9660.h b/libk3b/tools/k3biso9660.h
index c25ef48..395c6ea 100644
--- a/libk3b/tools/k3biso9660.h
+++ b/libk3b/tools/k3biso9660.h
@@ -319,7 +319,7 @@ class LIBK3B_EXPORT K3bIso9660File : public K3bIso9660Entry
/**
* This class is based on the KIso class by
- * Gy�gy Szombathelyi <gyurco@users.sourceforge.net>.
+ * György Szombathelyi <gyurco@users.sourceforge.net>.
* A lot has been changed and bugfixed.
* The API has been improved to be useful.
*
diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp
index efc7d19..3bb6fa8 100644
--- a/libk3bdevice/k3bcdtext.cpp
+++ b/libk3bdevice/k3bcdtext.cpp
@@ -73,18 +73,18 @@ namespace K3bDevice {
s += TQString( " %1 |" ).arg( pack[i].dbcc, 4 );
// char str[12];
// sprintf( str, "%c%c%c%c%c%c%c%c%c%c%c%c",
-// pack[i].data[0] == '\0' ? '�' : pack[i].data[0],
-// pack[i].data[1] == '\0' ? '�' : pack[i].data[1],
-// pack[i].data[2] == '\0' ? '�' : pack[i].data[2],
-// pack[i].data[3] == '\0' ? '�' : pack[i].data[3],
-// pack[i].data[4] == '\0' ? '�' : pack[i].data[4],
-// pack[i].data[5] == '\0' ? '�' : pack[i].data[5],
-// pack[i].data[6] == '\0' ? '�' : pack[i].data[6],
-// pack[i].data[7] == '\0' ? '�' : pack[i].data[7],
-// pack[i].data[8] == '\0' ? '�' : pack[i].data[8],
-// pack[i].data[9] == '\0' ? '�' : pack[i].data[9],
-// pack[i].data[10] == '\0' ? '�' : pack[i].data[10],
-// pack[i].data[11] == '\0' ? '�' : pack[i].data[11] );
+// pack[i].data[0] == '\0' ? '°' : pack[i].data[0],
+// pack[i].data[1] == '\0' ? '°' : pack[i].data[1],
+// pack[i].data[2] == '\0' ? '°' : pack[i].data[2],
+// pack[i].data[3] == '\0' ? '°' : pack[i].data[3],
+// pack[i].data[4] == '\0' ? '°' : pack[i].data[4],
+// pack[i].data[5] == '\0' ? '°' : pack[i].data[5],
+// pack[i].data[6] == '\0' ? '°' : pack[i].data[6],
+// pack[i].data[7] == '\0' ? '°' : pack[i].data[7],
+// pack[i].data[8] == '\0' ? '°' : pack[i].data[8],
+// pack[i].data[9] == '\0' ? '°' : pack[i].data[9],
+// pack[i].data[10] == '\0' ? '°' : pack[i].data[10],
+// pack[i].data[11] == '\0' ? '°' : pack[i].data[11] );
// s += TQString( " %1 |" ).arg( "'" + TQCString(str,13) + "'", 14 );
// TQ_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1];
// s += TQString( " %1 |" ).arg( crc );
diff --git a/src/fastscale/scale.h b/src/fastscale/scale.h
index f2e17e0..3eee5e9 100644
--- a/src/fastscale/scale.h
+++ b/src/fastscale/scale.h
@@ -1,7 +1,7 @@
// vim: set tabstop=4 shiftwidth=4 noexpandtab
/*
Gwenview - A simple image viewer for KDE
-Copyright 2000-2004 Aur�lien G�teau
+Copyright 2000-2004 Aurélien Gâteau
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/k3b.cpp b/src/k3b.cpp
index 56159c1..6cd7cd7 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -288,7 +288,7 @@ void K3bMainWindow::initActions()
actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()),
actionCollection(), "tools_blank_cdrw" );
- TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("�"), "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" );
actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()),
actionCollection(), "tools_write_cd_image" );
@@ -330,7 +330,7 @@ void K3bMainWindow::initActions()
actionFileNewMovix->setToolTip( i18n("Creates a new eMovix CD project") );
actionFileNewVcd->setToolTip( i18n("Creates a new Video CD project") );
actionToolsBlankCdrw->setToolTip( i18n("Open the CD-RW erasing dialog") );
- actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").arg("�") );
+ actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").arg("±") );
actionCdCopy->setToolTip( i18n("Open the CD copy dialog") );
actionToolsWriteCdImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to CD") );
actionToolsWriteDvdImage->setToolTip( i18n("Write an Iso9660 image to DVD") );
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index f763f72..288e854 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -152,11 +152,11 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
//
if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) &&
(d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) )
- d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("�");
+ d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("±");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL )
- d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("�");
+ d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("±");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL )
- d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("�");
+ d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("±");
else
d->wantedMediaTypeString = i18n("CD-R(W)");
diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp
index d6fc2af..7c436fd 100644
--- a/src/misc/k3bdvdformattingdialog.cpp
+++ b/src/misc/k3bdvdformattingdialog.cpp
@@ -41,7 +41,7 @@
K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* name, bool modal )
: K3bInteractionDialog( parent, name,
i18n("DVD Formatting"),
- i18n("DVD%1RW").arg("�"),
+ i18n("DVD%1RW").arg("±"),
START_BUTTON|CANCEL_BUTTON,
START_BUTTON,
"DVD Formatting", // config group