[kde-doc-english] [k3b] /: i18n fixes
Pino Toscano
pino at debian.org
Sun Feb 15 19:21:54 UTC 2015
Git commit 3fbe112ed24676fb65bb40d2c3f82b44b6fcd806 by Pino Toscano.
Committed on 15/02/2015 at 19:21.
Pushed by pino into branch 'master'.
i18n fixes
- spell "CD-Text", "CDDB", "ISO 9660", "MD5", "MP3", "SoX, "URL", and "WMA" correctly
- remove extra white space in few places
- a couple of small changes
M +1 -1 doc/index.docbook
M +1 -1 libk3b/jobs/k3bblankingjob.cpp
M +13 -13 libk3b/jobs/k3bcdcopyjob.cpp
M +2 -2 libk3b/jobs/k3bdvdcopyjob.cpp
M +2 -2 libk3b/jobs/k3biso9660imagewritingjob.cpp
M +2 -2 libk3b/jobs/k3bmetawriter.cpp
M +2 -2 libk3b/jobs/k3bverificationjob.cpp
M +6 -6 libk3b/projects/datacd/k3bdatajob.cpp
M +1 -1 libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
M +1 -1 libk3b/projects/datacd/k3bmsinfofetcher.cpp
M +2 -2 libk3b/projects/k3bcdrdaowriter.cpp
M +1 -1 libk3b/projects/k3bgrowisofshandler.cpp
M +3 -3 libk3b/projects/mixedcd/k3bmixedjob.cpp
M +2 -2 libk3b/projects/videocd/k3bvcdjob.cpp
M +1 -1 libk3b/projects/videodvd/k3bvideodvdjob.cpp
M +6 -6 libk3b/tools/k3bstdguiitems.cpp
M +1 -1 plugins/decoder/ffmpeg/k3bffmpegdecoder.desktop
M +1 -1 plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
M +2 -2 plugins/encoder/lame/k3blameencoder.desktop
M +1 -1 plugins/encoder/lame/kcm_k3blameencoder.desktop
M +1 -1 plugins/encoder/sox/k3bsoxencoder.cpp
M +2 -2 plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
M +2 -2 plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.desktop
M +2 -2 src/k3b.cpp
M +1 -1 src/k3bdiskinfoview.cpp
M +1 -1 src/k3bsystemproblemdialog.cpp
M +1 -1 src/k3bwritingmodewidget.cpp
M +3 -3 src/misc/k3bimagewritingdialog.cpp
M +1 -1 src/misc/k3bmediacopydialog.cpp
M +1 -1 src/option/k3bdevicewidget.cpp
M +20 -20 src/projects/base_k3badvanceddataimagesettings.ui
M +2 -2 src/projects/base_k3bdataimagesettings.ui
M +2 -2 src/projects/k3bdataimagesettingswidget.cpp
M +2 -2 src/projects/k3bdatamultisessioncombobox.cpp
M +1 -1 src/projects/k3bdatamultisessionimportdialog.cpp
M +3 -3 src/projects/k3bdatapropertiesdialog.cpp
M +1 -1 src/projects/k3bdataurladdingdialog.cpp
M +1 -1 src/projects/k3bvcdburndialog.cpp
M +1 -1 src/rip/k3baudiocdview.cpp
M +1 -1 src/rip/k3bvideocdrippingdialog.cpp
http://commits.kde.org/k3b/3fbe112ed24676fb65bb40d2c3f82b44b6fcd806
diff --git a/doc/index.docbook b/doc/index.docbook
index 5f953a0..99ab98b 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -169,7 +169,7 @@ all modern systems optical devices belongs to a certain user group (⪚ <quote>
</para>
<para>Now choose what is to be burnt.
</para>
-<para>The top half of the screen is the <emphasis>source pane</emphasis>; it functions like a file manager. You can choose ordinary files from mounted data volumes or audio tracks from inserted audio discs. Names of audio tracks are automatically read from CD-TEXT data, if your CD drive supports reading it, or generated using <ulink url="http://libcddb.sourceforge.net/">CDDB</ulink>; the exact format is controlled by a button in the bottom pane. If the names are incorrect or simply do not match the description of the disc, you can edit them using the toolbar button. Your changes will be cached locally and submitted to the master registry at <ulink url="http://www.freedb.org/">FreeDB</ulink>.
+<para>The top half of the screen is the <emphasis>source pane</emphasis>; it functions like a file manager. You can choose ordinary files from mounted data volumes or audio tracks from inserted audio discs. Names of audio tracks are automatically read from CD-Text data, if your CD drive supports reading it, or generated using <ulink url="http://libcddb.sourceforge.net/">CDDB</ulink>; the exact format is controlled by a button in the bottom pane. If the names are incorrect or simply do not match the description of the disc, you can edit them using the toolbar button. Your changes will be cached locally and submitted to the master registry at <ulink url="http://www.freedb.org/">FreeDB</ulink>.
</para>
<tip>
<para>If the whole record is performed by the same artist, leave the track artist entries blank, fill the <guilabel>Album artist</guilabel>, save to CDDB and requery.
diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp
index f5890b1..9494862 100644
--- a/libk3b/jobs/k3bblankingjob.cpp
+++ b/libk3b/jobs/k3bblankingjob.cpp
@@ -149,7 +149,7 @@ void K3b::BlankingJob::slotFinished(bool success)
emit canceled();
}
else {
- emit infoMessage( i18n("Blanking error "), K3b::Job::MessageError );
+ emit infoMessage( i18n("Blanking error."), K3b::Job::MessageError );
emit infoMessage( i18n("Sorry, no error handling yet."), K3b::Job::MessageError );
}
jobFinished( false );
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index 375e4c0..7beefb8 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -369,7 +369,7 @@ void K3b::CdCopyJob::slotDiskInfoReady( K3b::Device::DeviceHandler* dh )
void K3b::CdCopyJob::searchCdText()
{
- emit newSubTask( i18n("Searching CD-TEXT") );
+ emit newSubTask( i18n("Searching CD-Text") );
connect( K3b::Device::sendCommand( K3b::Device::DeviceHandler::CommandCdTextRaw, m_readerDevice ),
SIGNAL(finished(K3b::Device::DeviceHandler*)),
@@ -383,17 +383,17 @@ void K3b::CdCopyJob::slotCdTextReady( K3b::Device::DeviceHandler* dh )
if( dh->success() ) {
if( K3b::Device::CdText::checkCrc( dh->cdTextRaw() ) ) {
K3b::Device::CdText cdt( dh->cdTextRaw() );
- emit infoMessage( i18n("Found CD-TEXT (%1 - %2).",cdt.performer(),cdt.title()), MessageSuccess );
+ emit infoMessage( i18n("Found CD-Text (%1 - %2).",cdt.performer(),cdt.title()), MessageSuccess );
d->haveCdText = true;
d->cdTextRaw = dh->cdTextRaw();
}
else {
- emit infoMessage( i18n("Found corrupted CD-TEXT. Ignoring it."), MessageWarning );
+ emit infoMessage( i18n("Found corrupted CD-Text. Ignoring it."), MessageWarning );
d->haveCdText = false;
}
}
else {
- emit infoMessage( i18n("No CD-TEXT found."), MessageInfo );
+ emit infoMessage( i18n("No CD-Text found."), MessageInfo );
d->haveCdText = false;
}
@@ -404,7 +404,7 @@ void K3b::CdCopyJob::slotCdTextReady( K3b::Device::DeviceHandler* dh )
void K3b::CdCopyJob::queryCddb()
{
- emit newSubTask( i18n("Querying Cddb") );
+ emit newSubTask( i18n("Querying CDDB") );
d->haveCddb = false;
@@ -425,7 +425,7 @@ void K3b::CdCopyJob::slotCddbQueryFinished( KCDDB::Result result )
if( result == KCDDB::Success ) {
d->cddbInfo = d->cddb->lookupResponse().first();
d->haveCddb = true;
- emit infoMessage( i18n("Found Cddb entry (%1 - %2).",
+ emit infoMessage( i18n("Found CDDB entry (%1 - %2).",
d->cddbInfo.get( KCDDB::Artist ).toString(),
d->cddbInfo.get( KCDDB::Title ).toString() ),
MessageSuccess );
@@ -448,10 +448,10 @@ void K3b::CdCopyJob::slotCddbQueryFinished( KCDDB::Result result )
}
}
else if( result == KCDDB::NoRecordFound ) {
- emit infoMessage( i18n("No Cddb entry found."), MessageWarning );
+ emit infoMessage( i18n("No CDDB entry found."), MessageWarning );
}
else {
- emit infoMessage( i18n("Cddb error (%1).",
+ emit infoMessage( i18n("CDDB error (%1).",
KCDDB::resultToString( result ) ),
MessageError );
}
@@ -467,15 +467,15 @@ void K3b::CdCopyJob::startCopy()
if ( d->haveCdText && d->haveCddb ) {
K3b::Device::CdText cdt( d->cdTextRaw );
- if ( !questionYesNo( i18n( "Found CD-TEXT (%1 - %2) and Cddb (%3 - %4) entries. "
- "Which one should be used to generate the CD-TEXT on the new CD?",
+ if ( !questionYesNo( i18n( "Found CD-Text (%1 - %2) and CDDB (%3 - %4) entries. "
+ "Which one should be used to generate the CD-Text on the new CD?",
cdt.performer(),
cdt.title(),
d->cddbInfo.get( KCDDB::Artist ).toString(),
d->cddbInfo.get( KCDDB::Title ).toString() ),
- i18n( "CD-TEXT" ),
- KGuiItem( i18n( "Use CD-TEXT data" ) ),
- KGuiItem( i18n( "Use Cddb entry" ) ) ) ) {
+ i18n( "CD-Text" ),
+ KGuiItem( i18n( "Use CD-Text data" ) ),
+ KGuiItem( i18n( "Use CDDB entry" ) ) ) ) {
d->haveCdText = false;
}
}
diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp
index b064ec5..607a78b 100644
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
@@ -287,7 +287,7 @@ void K3b::DvdCopyJob::slotDiskInfoReady( K3b::Device::DeviceHandler* dh )
case K3b::Device::MEDIA_DVD_RW_OVWR:
case K3b::Device::MEDIA_BD_RE:
{
- emit infoMessage( i18n("K3b relies on the size saved in the ISO9660 header."), MessageWarning );
+ emit infoMessage( i18n("K3b relies on the size saved in the ISO 9660 header."), MessageWarning );
emit infoMessage( i18n("This might result in a corrupt copy if the source was mastered with buggy software."), MessageWarning );
K3b::Iso9660 isoF( m_readerDevice, 0 );
@@ -295,7 +295,7 @@ void K3b::DvdCopyJob::slotDiskInfoReady( K3b::Device::DeviceHandler* dh )
d->lastSector = ((long long)isoF.primaryDescriptor().logicalBlockSize*isoF.primaryDescriptor().volumeSpaceSize)/2048LL - 1;
}
else {
- emit infoMessage( i18n("Unable to determine the ISO9660 filesystem size."), MessageError );
+ emit infoMessage( i18n("Unable to determine the ISO 9660 filesystem size."), MessageError );
jobFinished(false);
d->running = false;
return;
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp
index d47ac6a..b3d5c29 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.cpp
+++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp
@@ -340,9 +340,9 @@ bool K3b::Iso9660ImageWritingJob::prepareWriter( Device::MediaTypes mediaType )
QString K3b::Iso9660ImageWritingJob::jobDescription() const
{
if( m_simulate )
- return i18n("Simulating ISO9660 Image");
+ return i18n("Simulating ISO 9660 Image");
else
- return ( i18n("Burning ISO9660 Image")
+ return ( i18n("Burning ISO 9660 Image")
+ ( m_copies > 1
? i18np(" - %1 Copy", " - %1 Copies", m_copies)
: QString() ) );
diff --git a/libk3b/jobs/k3bmetawriter.cpp b/libk3b/jobs/k3bmetawriter.cpp
index 3c22f70..558c0ad 100644
--- a/libk3b/jobs/k3bmetawriter.cpp
+++ b/libk3b/jobs/k3bmetawriter.cpp
@@ -843,9 +843,9 @@ void K3b::MetaWriter::informUser()
else if( Device::isDvdMedia( medium.diskInfo().mediaType() ) ) {
if( medium.diskInfo().appendable() ) {
if( medium.diskInfo().mediaType() & (Device::MEDIA_DVD_PLUS_RW|Device::MEDIA_DVD_PLUS_RW_DL) )
- emit infoMessage( i18n("Growing ISO9660 filesystem on DVD+RW."), MessageInfo );
+ emit infoMessage( i18n("Growing ISO 9660 filesystem on DVD+RW."), MessageInfo );
else if( medium.diskInfo().mediaType() == Device::MEDIA_DVD_RW_OVWR )
- emit infoMessage( i18n("Growing ISO9660 filesystem on DVD-RW in restricted overwrite mode."), MessageInfo );
+ emit infoMessage( i18n("Growing ISO 9660 filesystem on DVD-RW in restricted overwrite mode."), MessageInfo );
else if( medium.diskInfo().mediaType() == Device::MEDIA_DVD_PLUS_R )
emit infoMessage( i18n("Appending session to DVD+R."), MessageInfo );
else if( medium.diskInfo().mediaType() == Device::MEDIA_DVD_PLUS_R_DL )
diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp
index 465dde3..d38a3f4 100644
--- a/libk3b/jobs/k3bverificationjob.cpp
+++ b/libk3b/jobs/k3bverificationjob.cpp
@@ -130,7 +130,7 @@ K3b::Msf K3b::VerificationJob::Private::trackLength( const TrackEntry& trackEntr
trackSize = isoF.primaryDescriptor().volumeSpaceSize;
}
else {
- emit q->infoMessage( i18n("Unable to determine the ISO9660 filesystem size."), MessageError );
+ emit q->infoMessage( i18n("Unable to determine the ISO 9660 filesystem size."), MessageError );
return 0;
}
}
@@ -360,7 +360,7 @@ void K3b::VerificationJob::readTrack()
isoF.primaryDescriptor().volumeSpaceSize -1 );
}
else {
- emit infoMessage( i18n("Unable to determine the ISO9660 filesystem size."), MessageError );
+ emit infoMessage( i18n("Unable to determine the ISO 9660 filesystem size."), MessageError );
jobFinished( false );
return;
}
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index feec874..26e6f98 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -849,7 +849,7 @@ bool K3b::DataJob::waitForBurnMedium()
if( foundMedium & K3b::Device::MEDIA_DVD_PLUS_RW &&
( usedMultiSessionMode() == K3b::DataDoc::CONTINUE ||
usedMultiSessionMode() == K3b::DataDoc::FINISH ) )
- emit infoMessage( i18n("Growing ISO9660 filesystem on %1.", Device::mediaTypeString(foundMedium, true)), MessageInfo );
+ emit infoMessage( i18n("Growing ISO 9660 filesystem on %1.", Device::mediaTypeString(foundMedium, true)), MessageInfo );
else
emit infoMessage( i18n("Writing %1.", Device::mediaTypeString(foundMedium, true)), MessageInfo );
}
@@ -881,7 +881,7 @@ bool K3b::DataJob::waitForBurnMedium()
emit infoMessage( i18n("Writing DVD-RW in restricted overwrite mode."), MessageInfo );
}
else {
- emit infoMessage( i18n("Growing ISO9660 filesystem on DVD-RW in restricted overwrite mode."), MessageInfo );
+ emit infoMessage( i18n("Growing ISO 9660 filesystem on DVD-RW in restricted overwrite mode."), MessageInfo );
// we can only do this with growisofs
d->usedWritingApp = K3b::WritingAppGrowisofs;
}
@@ -970,7 +970,7 @@ bool K3b::DataJob::waitForBurnMedium()
if( foundMedium & K3b::Device::MEDIA_BD_RE &&
( usedMultiSessionMode() == K3b::DataDoc::CONTINUE ||
usedMultiSessionMode() == K3b::DataDoc::FINISH ) )
- emit infoMessage( i18n("Growing ISO9660 filesystem on %1.", Device::mediaTypeString(foundMedium, true)), MessageInfo );
+ emit infoMessage( i18n("Growing ISO 9660 filesystem on %1.", Device::mediaTypeString(foundMedium, true)), MessageInfo );
else
emit infoMessage( i18n("Writing %1.", Device::mediaTypeString(foundMedium, true)), MessageInfo );
}
@@ -1006,12 +1006,12 @@ QString K3b::DataJob::jobDetails() const
!d->doc->dummy() &&
!(d->doc->multiSessionMode() == K3b::DataDoc::CONTINUE ||
d->doc->multiSessionMode() == K3b::DataDoc::FINISH) )
- return i18np("ISO9660 Filesystem (Size: %2) – One copy",
- "ISO9660 Filesystem (Size: %2) – %1 copies",
+ return i18np("ISO 9660 Filesystem (Size: %2) – One copy",
+ "ISO 9660 Filesystem (Size: %2) – %1 copies",
d->doc->copies(),
KIO::convertSize( d->doc->size() ) );
else
- return i18n( "ISO9660 Filesystem (Size: %1)",
+ return i18n( "ISO 9660 Filesystem (Size: %1)",
KIO::convertSize( d->doc->size() ) );
}
diff --git a/libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp b/libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
index 686fbbc..afe0749 100644
--- a/libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
+++ b/libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
@@ -249,7 +249,7 @@ bool K3b::DataMultiSessionParameterJob::setupMultiSessionParameters()
nextSessionStart = iso.primaryDescriptor().volumeSpaceSize;
}
else {
- emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.",
+ emit infoMessage( i18n("Could not open ISO 9660 filesystem in %1.",
d->doc->burner()->vendor() + ' ' + d->doc->burner()->description() ), K3b::Job::MessageError );
return false;
}
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
index d3fc191..a9c4559 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -149,7 +149,7 @@ void K3b::MsInfoFetcher::slotMediaDetectionFinished( K3b::Device::DeviceHandler*
jobFinished( true );
}
else {
- emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.",
+ emit infoMessage( i18n("Could not open ISO 9660 filesystem in %1.",
m_device->vendor() + ' ' + m_device->description() ), MessageError );
jobFinished( false );
}
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index da252ef..cac3c88 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -964,13 +964,13 @@ void K3b::CdrdaoWriter::parseCdrdaoMessage()
emit nextTrack( d->newMsg.track, d->newMsg.totalTracks );
break;
case PGSMSG_WCD_LEADIN:
- emit newSubTask( i18n("Writing leadin ") );
+ emit newSubTask( i18n("Writing leadin") );
break;
case PGSMSG_WCD_DATA:
emit nextTrack( d->newMsg.track, d->newMsg.totalTracks );
break;
case PGSMSG_WCD_LEADOUT:
- emit newSubTask( i18n("Writing leadout ") );
+ emit newSubTask( i18n("Writing leadout") );
break;
}
diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp
index f1c5681..3425621 100644
--- a/libk3b/projects/k3bgrowisofshandler.cpp
+++ b/libk3b/projects/k3bgrowisofshandler.cpp
@@ -155,7 +155,7 @@ void K3b::GrowisofsHandler::handleLine( const QString& line )
emit infoMessage( i18n("Removing reference to lead-out."), K3b::Job::MessageInfo );
}
else if( line.contains( "copying volume descriptor" ) ) {
- emit infoMessage( i18n("Modifying ISO9660 volume descriptor"), K3b::Job::MessageInfo );
+ emit infoMessage( i18n("Modifying ISO 9660 volume descriptor"), K3b::Job::MessageInfo );
}
else if( line.contains( "FEATURE 21h is not on" ) ) {
if( !m_dao ) {
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp
index 9564352..a64e600 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.cpp
+++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp
@@ -888,7 +888,7 @@ void K3b::MixedJob::slotWriterNextTrack( int t, int )
emit newSubTask( i18n("Writing track %1 of %2 (%3)",
t,
m_doc->numOfTracks(),
- i18n("ISO9660 data")) );
+ i18n("ISO 9660 data")) );
}
@@ -1353,8 +1353,8 @@ QString K3b::MixedJob::jobDescription() const
QString K3b::MixedJob::jobDetails() const
{
return ( i18ncp("%2 is of form XX:YY:ZZ, no pluralization needed"
- ,"1 track (%2 minutes audio data, %3 ISO9660 data)"
- ,"%1 tracks (%2 minutes audio data, %3 ISO9660 data)"
+ ,"1 track (%2 minutes audio data, %3 ISO 9660 data)"
+ ,"%1 tracks (%2 minutes audio data, %3 ISO 9660 data)"
,m_doc->numOfTracks()
,m_doc->audioDoc()->length().toString()
,KIO::convertSize(m_doc->dataDoc()->size()))
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index af84336..2bd5518 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -197,12 +197,12 @@ void K3b::VcdJob::vcdxBuild()
m_process = new K3b::Process();
m_process->setSplitStdout( true );
- emit infoMessage( i18n( "Creating Cue/Bin files ..." ), K3b::Job::MessageInfo );
+ emit infoMessage( i18n( "Creating Cue/Bin files..." ), K3b::Job::MessageInfo );
const K3b::ExternalBin* bin = k3bcore ->externalBinManager() ->binObject( "vcdxbuild" );
if ( !bin ) {
kDebug() << "(K3b::VcdJob) could not find vcdxbuild executable";
emit infoMessage( i18n( "Could not find %1 executable." , QString("vcdxbuild") ), K3b::Job::MessageError );
- emit infoMessage( i18n( "To create Video CDs you have to install VcdImager Version %1." ,QString( ">= 0.7.12") ), K3b::Job::MessageInfo );
+ emit infoMessage( i18n( "To create Video CDs you have to install VcdImager version %1." ,QString( ">= 0.7.12") ), K3b::Job::MessageInfo );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3b::Job::MessageInfo );
cancelAll();
jobFinished( false );
diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
index 04e9cd0..5e13add 100644
--- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
@@ -64,7 +64,7 @@ QString K3b::VideoDvdJob::jobDescription() const
QString K3b::VideoDvdJob::jobDetails() const
{
- return ( i18n("ISO9660/Udf Filesystem (Size: %1)",KIO::convertSize( doc()->size() ))
+ return ( i18n("ISO 9660/Udf Filesystem (Size: %1)",KIO::convertSize( doc()->size() ))
+ ( m_doc->copies() > 1
? i18np(" - %1 copy", " - %1 copies", m_doc->copies())
: QString() ) );
diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp
index 3046cfe..632d9aa 100644
--- a/libk3b/tools/k3bstdguiitems.cpp
+++ b/libk3b/tools/k3bstdguiitems.cpp
@@ -116,15 +116,15 @@ QCheckBox* K3b::StdGuiItems::onTheFlyCheckbox( QWidget* parent )
QCheckBox* K3b::StdGuiItems::cdTextCheckbox( QWidget* parent )
{
- QCheckBox* c = new QCheckBox( i18n("Write CD-TEXT"), parent );
- c->setToolTip( i18n("Create CD-TEXT entries") );
+ QCheckBox* c = new QCheckBox( i18n("Write CD-Text"), parent );
+ c->setToolTip( i18n("Create CD-Text entries") );
c->setWhatsThis( i18n("<p>If this option is checked K3b uses some otherwise-unused space on the audio "
"CD to store additional information, such as the artist's name, or the CD title."
- "<p>CD-TEXT is an extension to the audio CD standard introduced by Sony."
- "<p>CD-TEXT will only be usable on CD players that support this extension "
+ "<p>CD-Text is an extension to the audio CD standard introduced by Sony."
+ "<p>CD-Text will only be usable on CD players that support this extension "
"(mostly car CD players)."
- "<p>Since a CD-TEXT-enhanced CD will work in any CD player it is never a bad "
- "idea to enable this (if you specify CD-TEXT data.)") );
+ "<p>Since a CD-Text-enhanced CD will work in any CD player it is never a bad "
+ "idea to enable this (if you specify CD-Text data.)") );
return c;
}
diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.desktop b/plugins/decoder/ffmpeg/k3bffmpegdecoder.desktop
index f42cb04..f69f667 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.desktop
+++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.desktop
@@ -54,7 +54,7 @@ Name[uk]=K3b декодувальник FFMpeg
Name[x-test]=xxK3b FFMpeg Decoderxx
Name[zh_CN]=K3b FFMpeg 解码器
Name[zh_TW]=K3b FFMpeg 解碼器
-Comment=Decoding module to decode wma files
+Comment=Decoding module to decode WMA files
Comment[bg]=Декодер за wma файлове
Comment[bs]=Modul dekodiranja za dekodiranje WMA datoteke
Comment[ca]=Mòdul de descodificació per descodificar fitxers wma
diff --git a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
index 8ab3edb..51b60b7 100644
--- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
+++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
@@ -157,7 +157,7 @@
<string>Select the channel mode.</string>
</property>
<property name="whatsThis">
- <string><p>Select the channel mode of the resulting Mp3 file:
+ <string><p>Select the channel mode of the resulting MP3 file:
<p><b>Stereo</b><br>
In this mode, the encoder makes no use of potential correlations between the two input channels; it can, however, negotiate the bit demand between both channel, i.e. give one channel more bits if the other contains silence or needs fewer bits because of a lower complexity.
<p><b>Joint-Stereo</b><br>
diff --git a/plugins/encoder/lame/k3blameencoder.desktop b/plugins/encoder/lame/k3blameencoder.desktop
index a84c114..3939680 100644
--- a/plugins/encoder/lame/k3blameencoder.desktop
+++ b/plugins/encoder/lame/k3blameencoder.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=K3b Lame Mp3 Encoder
+Name=K3b Lame MP3 Encoder
Name[bg]=Lame Mp3 кодиране (K3b)
Name[bs]=Lame Mp3 koder za K3b
Name[ca]=Codificador Mp3 Lame del K3b
@@ -53,7 +53,7 @@ Name[uk]=Кодувальник Lame Mp3 для K3b
Name[x-test]=xxK3b Lame Mp3 Encoderxx
Name[zh_CN]=K3b Lame Mp3 编码器
Name[zh_TW]=K3b Lame MP3 編碼器
-Comment=Encoding module to encode MPEG1 Layer III (mp3) files
+Comment=Encoding module to encode MPEG1 Layer III (MP3) files
Comment[bg]=Кодиращ модул за MPEG1 Layer III (mp3) файлове
Comment[bs]=Modul kodiranja za kodiranje MPEG1 Layer III (mp3) datoteka
Comment[ca]=Mòdul de codificació per codificar fitxers MPEG 1 Layer III (mp3)
diff --git a/plugins/encoder/lame/kcm_k3blameencoder.desktop b/plugins/encoder/lame/kcm_k3blameencoder.desktop
index 5079649..e5ca3c6 100644
--- a/plugins/encoder/lame/kcm_k3blameencoder.desktop
+++ b/plugins/encoder/lame/kcm_k3blameencoder.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=K3b Lame Mp3 Encoder Config Module
+Name=K3b Lame MP3 Encoder Config Module
Name[bg]=Модул за настройване кодирането на Lame Mp3 (K3b)
Name[bs]=Modul za podešavanje Lame MP3 kodera za K3b
Name[ca]=Mòdul de configuració del codificador Mp3 Lame del K3b
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index af5b013..747a0cb 100644
--- a/plugins/encoder/sox/k3bsoxencoder.cpp
+++ b/plugins/encoder/sox/k3bsoxencoder.cpp
@@ -313,7 +313,7 @@ QString K3bSoxEncoder::fileTypeComment( const QString& ext ) const
else if( ext == "voc" )
return i18n("Sound Blaster VOC");
else if( ext == "wav" )
- return i18n("Wave (Sox)");
+ return i18n("Wave (SoX)");
else if( ext == "wve" )
return i18n("Psion 8-bit A-law");
else if( ext == "raw" )
diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
index 4df05f9..2be842c 100644
--- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
+++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
@@ -73,7 +73,7 @@ void K3bAudioProjectCddbPlugin::activate( K3b::Doc* doc, QWidget* parent )
}
else {
if( !m_progress ) {
- m_progress = new K3b::ProgressDialog( i18n("Query Cddb"), parent, i18n("Audio Project") );
+ m_progress = new K3b::ProgressDialog( i18n("Query CDDB"), parent, i18n("Audio Project") );
connect( m_progress, SIGNAL(cancelClicked()),
this, SLOT(slotCancelClicked()) );
}
@@ -122,7 +122,7 @@ void K3bAudioProjectCddbPlugin::slotCddbQueryFinished( KJob* job )
m_doc->writeCdText( true );
}
else {
- KMessageBox::information( m_parentWidget, job->errorString(), i18n("Cddb error") );
+ KMessageBox::information( m_parentWidget, job->errorString(), i18n("CDDB error") );
}
}
diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.desktop b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.desktop
index f7102da..0cb336e 100644
--- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.desktop
+++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=K3b Cddb Audio Plugin
+Name=K3b CDDB Audio Plugin
Name[bg]=Звукова приставка за CDDB (K3b)
Name[bs]=Cddb audio priljučak za K3b
Name[ca]=Connector Cddb d'àudio del K3b
@@ -50,7 +50,7 @@ Name[uk]=Додаток для роботи з CDDB у K3b
Name[x-test]=xxK3b Cddb Audio Pluginxx
Name[zh_CN]=k3b Cddb 音频插件
Name[zh_TW]=K3b Cddb 音效外掛程式
-Comment=Plugin to query a cddb server for information about an audio project.
+Comment=Plugin to query a CDDB server for information about an audio project.
Comment[bg]=Приставка за търсене на информация в CDDB .
Comment[bs]=Priključak za upite CDDB serveru radi podataka o audio projektu.
Comment[ca]=Connector per consultar un servidor cddb informació quant a un projecte d'àudio.
diff --git a/src/k3b.cpp b/src/k3b.cpp
index cfeb555..a7ccc57 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -301,7 +301,7 @@ void K3b::MainWindow::initActions()
d->actionFileSave->setStatusTip( d->actionFileSave->toolTip() );
d->actionFileSaveAs = KStandardAction::saveAs( this, SLOT(slotFileSaveAs()), actionCollection() );
- d->actionFileSaveAs->setToolTip( i18n( "Saves the current project to a new url" ) );
+ d->actionFileSaveAs->setToolTip( i18n( "Saves the current project to a new URL" ) );
d->actionFileSaveAs->setStatusTip( d->actionFileSaveAs->toolTip() );
KAction* actionFileSaveAll = new KAction( KIcon( "document-save-all" ), i18n("Save All"), this );
@@ -403,7 +403,7 @@ void K3b::MainWindow::initActions()
connect( actionToolsFormatMedium, SIGNAL(triggered(bool)), this, SLOT(slotFormatMedium()) );
KAction* actionToolsWriteImage = new KAction( KIcon( "tools-media-optical-burn-image" ), i18n("&Burn Image..."), this );
- actionToolsWriteImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to an optical disc") );
+ actionToolsWriteImage->setToolTip( i18n("Write an ISO 9660, cue/bin, or cdrecord clone image to an optical disc") );
actionToolsWriteImage->setStatusTip( actionToolsWriteImage->toolTip() );
actionCollection()->addAction( "tools_write_image", actionToolsWriteImage );
connect( actionToolsWriteImage, SIGNAL(triggered(bool)), this, SLOT(slotWriteImage()) );
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index 9feb768..50e1790 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -102,7 +102,7 @@ void K3b::DiskInfoView::reloadMedium()
s += createMediaInfoItems( medium() );
if( medium().content() & K3b::Medium::ContentData ) {
- s += sectionHeader( i18n("ISO9660 Filesystem Info") );
+ s += sectionHeader( i18n("ISO 9660 Filesystem Info") );
s += createIso9660InfoItems( medium().iso9660Descriptor() );
}
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index def7443..519c0a4 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -194,7 +194,7 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l
i18n("K3b did not find an optical writing device in your system. Thus, "
"you will not be able to burn CDs or DVDs. However, you can still "
"use other K3b features such as audio track extraction, audio "
- "transcoding or ISO9660 image creation."),
+ "transcoding or ISO 9660 image creation."),
QString() ) );
}
else {
diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp
index c0b1933..52f82be 100644
--- a/src/k3bwritingmodewidget.cpp
+++ b/src/k3bwritingmodewidget.cpp
@@ -48,7 +48,7 @@ static const KLocalizedString s_ovwHelp =
ki18n("Restricted Overwrite allows to use a DVD-RW just like a DVD-RAM "
"or a DVD+RW. The media may just be overwritten. It is not possible "
"to write multisession DVD-RWs in this mode but K3b uses growisofs "
- "to grow an ISO9660 filesystem within the first session, thus allowing "
+ "to grow an ISO 9660 filesystem within the first session, thus allowing "
"new files to be added to an already burned disk.");
diff --git a/src/misc/k3bimagewritingdialog.cpp b/src/misc/k3bimagewritingdialog.cpp
index 436445b..c424c19 100644
--- a/src/misc/k3bimagewritingdialog.cpp
+++ b/src/misc/k3bimagewritingdialog.cpp
@@ -166,7 +166,7 @@ void K3b::ImageWritingDialog::Private::createIso9660InfoItems( K3b::Iso9660* iso
{
QTreeWidgetItem* isoRootItem = new QTreeWidgetItem( infoView );
isoRootItem->setText( 0, i18n("Detected:") );
- isoRootItem->setText( 1, i18n("Iso9660 image") );
+ isoRootItem->setText( 1, i18n("ISO 9660 image") );
isoRootItem->setForeground( 0, infoTextColor );
isoRootItem->setIcon( 1, KIcon( "application-x-cd-image") );
isoRootItem->setTextAlignment( 0, Qt::AlignRight );
@@ -451,7 +451,7 @@ void K3b::ImageWritingDialog::setupGui()
d->editImagePath->setWindowTitle( i18n("Choose Image File") );
d->editImagePath->setFilter( i18n("*.iso *.toc *.ISO *.TOC *.cue *.CUE|Image Files")
+ '\n'
- + i18n("*.iso *.ISO|ISO9660 Image Files")
+ + i18n("*.iso *.ISO|ISO 9660 Image Files")
+ '\n'
+ i18n("*.cue *.CUE|Cue Files")
+ '\n'
@@ -1011,7 +1011,7 @@ void K3b::ImageWritingDialog::calculateMd5Sum( const QString& file )
d->md5SumItem = new QTreeWidgetItem( d->infoView );
}
- d->md5SumItem->setText( 0, i18n("Md5 Sum:") );
+ d->md5SumItem->setText( 0, i18n("MD5 Sum:") );
d->md5SumItem->setForeground( 0, d->infoTextColor );
d->md5SumItem->setTextAlignment( 0, Qt::AlignRight );
diff --git a/src/misc/k3bmediacopydialog.cpp b/src/misc/k3bmediacopydialog.cpp
index ae0cc2e..e5fc9ef 100644
--- a/src/misc/k3bmediacopydialog.cpp
+++ b/src/misc/k3bmediacopydialog.cpp
@@ -222,7 +222,7 @@ K3b::MediaCopyDialog::MediaCopyDialog( QWidget *parent )
"protection based on corrupted sectors.") );
m_checkReadCdText->setWhatsThis( i18n("<p>If this option is checked K3b will search for CD-Text on the source CD. "
"Disable it if your CD drive has problems with reading CD-Text or you want "
- "to stick to Cddb info.") );
+ "to stick to CDDB info.") );
m_checkIgnoreDataReadErrors->setWhatsThis( i18n("<p>If this option is checked and K3b is not able to read a data sector from the "
"source medium it will be replaced with zeros on the resulting copy.") );
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index b4f62da..3d9c967 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -249,7 +249,7 @@ void K3b::DeviceWidget::updateDeviceListViews()
if (!groupNames.contains(m_deviceGroup)) {
QString messageText = i18n("In order to give K3b full access to the writer device the current user needs be added to a group <em>%1</em>.", m_deviceGroup);
#ifndef ENABLE_PERMISSION_HELPER
- messageText += i18n("<br/>The Permission helper that could do this for you was not enabled during build.<br/> "
+ messageText += i18n("<br/>The Permission helper that could do this for you was not enabled during build.<br/>"
"Please rebuild the package with the Permission helper enabled or contact your distribution.");
#endif
m_messageWidget->setMessageType(KMessageWidget::Warning);
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui
index 4bbaeb1..f9c506f 100644
--- a/src/projects/base_k3badvanceddataimagesettings.ui
+++ b/src/projects/base_k3badvanceddataimagesettings.ui
@@ -15,7 +15,7 @@
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3">
<property name="whatsThis">
- <string>Set special ISO9660 Filesystem preferences.</string>
+ <string>Set special ISO 9660 Filesystem preferences.</string>
</property>
<property name="title">
<string>File System Settings</string>
@@ -31,7 +31,7 @@
<item>
<widget class="QGroupBox" name="m_groupIsoSettings">
<property name="title">
- <string>ISO9660 Settings</string>
+ <string>ISO 9660 Settings</string>
</property>
<property name="checked">
<bool>false</bool>
@@ -43,70 +43,70 @@
<string>Force all options below</string>
</property>
<property name="text">
- <string>Allow untranslated ISO9660 filenames</string>
+ <string>Allow untranslated ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkOmitTrailingPeriod">
<property name="text">
- <string>Omit trailing period in ISO9660 filenames</string>
+ <string>Omit trailing period in ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkOmitVersionNumbers">
<property name="text">
- <string>Omit version numbers in ISO9660 filenames</string>
+ <string>Omit version numbers in ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkAllowBeginningPeriod">
<property name="text">
- <string>Allow leading period in ISO9660 filenames</string>
+ <string>Allow leading period in ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkAllow31CharFilenames">
<property name="text">
- <string>Allow 31 character ISO9660 filenames</string>
+ <string>Allow 31 character ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkAllowMultiDot">
<property name="text">
- <string>Allow multiple dots in ISO9660 filenames</string>
+ <string>Allow multiple dots in ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkAllowLowercaseCharacters">
<property name="text">
- <string>Allow lowercase characters in ISO9660 filenames</string>
+ <string>Allow lowercase characters in ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkAllowOther">
<property name="text">
- <string>Allow ~ and # in ISO9660 filenames</string>
+ <string>Allow ~ and # in ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkAllowFullAscii">
<property name="text">
- <string>Allow full ASCII charset for ISO9660 filenames</string>
+ <string>Allow full ASCII charset for ISO 9660 filenames</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_checkAllowMaxLengthFilenames">
<property name="text">
- <string>Allow max length ISO9660 filenames (37 characters)</string>
+ <string>Allow max length ISO 9660 filenames (37 characters)</string>
</property>
</widget>
</item>
@@ -116,16 +116,16 @@
<item>
<widget class="QGroupBox" name="m_groupIsoLevel">
<property name="whatsThis">
- <string><p>Set the ISO-9660 conformance level.
+ <string><p>Set the ISO 9660 conformance level.
<ul>
<li>Level 1: Files may only consist of one section and filenames are restricted to 8.3 characters.</li>
<li>Level 2: Files may only consist of one section.</li>
<li>Level 3: No restrictions.</li>
</ul>
-<p>With all ISO-9660 levels, all filenames are restricted to upper case letters, numbers and the underscore (_). The maximum filename length is 31 characters, the directory nesting level is restricted to 8 and the maximum path length is limited to 255 characters. (These restrictions may be violated with the additional ISO-9660 features K3b offers.)</string>
+<p>With all ISO 9660 levels, all filenames are restricted to upper case letters, numbers and the underscore (_). The maximum filename length is 31 characters, the directory nesting level is restricted to 8 and the maximum path length is limited to 255 characters. (These restrictions may be violated with the additional ISO 9660 features K3b offers.)</string>
</property>
<property name="title">
- <string>ISO9660 Level</string>
+ <string>ISO 9660 Level</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
@@ -234,8 +234,8 @@
</property>
<property name="whatsThis">
<string><p>If this option is checked, K3b will generate the System Use Sharing Protocol records (SUSP) specified by the Rock Ridge Interchange Protocol (IEEE-P1282).
-<p>Rock Ridge extends the ISO-9660 filesystem by features equal to the UNIX filesystems (permissions, symbolic links, very long filenames, ...). It uses ISO-8859 or UTF-16 based characters and allows 255 octets.
-<p>Rock Ridge extensions are located at the end of each ISO-9660 directory record. This makes the Rock Ridge tree closely coupled to the ISO-9660 tree.
+<p>Rock Ridge extends the ISO 9660 filesystem by features equal to the UNIX filesystems (permissions, symbolic links, very long filenames, ...). It uses ISO-8859 or UTF-16 based characters and allows 255 octets.
+<p>Rock Ridge extensions are located at the end of each ISO 9660 directory record. This makes the Rock Ridge tree closely coupled to the ISO 9660 tree.
<p><b>It is highly recommended to use Rock Ridge extensions on every data CD or DVD.</b></string>
</property>
<property name="text">
@@ -252,8 +252,8 @@
<string>Add Joliet extensions to the file system</string>
</property>
<property name="whatsThis">
- <string><p>If this option is checked, K3b will add additional Joliet extensions to the ISO-9660 file system.
-<p>Joliet is not an accepted independent international standard like ISO-9660 or Rock Ridge. It is mainly used on Windows systems.
+ <string><p>If this option is checked, K3b will add additional Joliet extensions to the ISO 9660 file system.
+<p>Joliet is not an accepted independent international standard like ISO 9660 or Rock Ridge. It is mainly used on Windows systems.
<p>Joliet does not allow all characters, so the Joliet filenames are not identical to the filenames on disk (as compared to Rock Ridge). Joliet has a filename length limitation of 64 chars (independent from the character coding and type e.g. European vs. Japanese). This is inconvenient, as modern file systems all allow 255 characters per path name component.
<p>Joliet uses UTF-16 coding.
<p><b>Caution:</b> With the exception of Linux and FreeBSD, there is no POSIX-like OS that supports Joliet. So <b>never create Joliet-only CDs or DVDs</b> for that reason.</string>
@@ -269,7 +269,7 @@
<string>Add UDF structures to the file system</string>
</property>
<property name="whatsThis">
- <string><p>If this option is checked K3b will create UDF filesystem structures in addition to the ISO9660 filesystem.
+ <string><p>If this option is checked K3b will create UDF filesystem structures in addition to the ISO 9660 filesystem.
<p>The UDF (<em><b>U</b>niversal <b>D</b>isk <b>F</b>ormat</em>) is mainly used for DVDs.</string>
</property>
<property name="text">
diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui
index e491508..5a20a22 100644
--- a/src/projects/base_k3bdataimagesettings.ui
+++ b/src/projects/base_k3bdataimagesettings.ui
@@ -87,7 +87,7 @@
<string>Symbolic link handling in the project</string>
</property>
<property name="whatsThis">
- <string><p>K3b can create ISO9660 filesystems that contain symlinks if the Rock Ridge extensions are enabled (they are by default). You can change the way symlinks are handled in a K3b project.
+ <string><p>K3b can create ISO 9660 filesystems that contain symlinks if the Rock Ridge extensions are enabled (they are by default). You can change the way symlinks are handled in a K3b project.
<p><b>No Change</b><br>
Symlinks are used as they have been added to the project.
@@ -100,7 +100,7 @@ K3b will discard all symbolic links that have been added to the project; meaning
<p><b>Follow symlinks</b><br>
Each symbolic link in the project will be replaced with the contents of the file it is pointing to. Thus, the resulting filesystem will not contain any symbolic links.<br>
-Be aware that in case Rock Ridge extensions are disabled (which is not recommended) symbolic links are always followed because ISO9660 does not support symbolic links.
+Be aware that in case Rock Ridge extensions are disabled (which is not recommended) symbolic links are always followed because ISO 9660 does not support symbolic links.
<p><b>Caution:</b> Symbolic links require Rock Ridge extensions.</string>
</property>
diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp
index 33b5df0..76a7598 100644
--- a/src/projects/k3bdataimagesettingswidget.cpp
+++ b/src/projects/k3bdataimagesettingswidget.cpp
@@ -225,7 +225,7 @@ void K3b::DataImageSettingsWidget::slotFilesystemsChanged()
if( m_customFsDlg->m_checkUdf->isChecked() )
s += i18n("UDF");
if( s.isEmpty() )
- m_comboFilesystems->setItemText( FS_CUSTOM,i18n("Custom (ISO9660 only)") );
+ m_comboFilesystems->setItemText( FS_CUSTOM,i18n("Custom (ISO 9660 only)") );
else
m_comboFilesystems->setItemText( FS_CUSTOM,i18n("Custom (%1)", s.join(", ") ) );
@@ -258,7 +258,7 @@ void K3b::DataImageSettingsWidget::slotFilesystemsChanged()
KMessageBox::information( this,
i18n("<p>Be aware that without the Joliet extensions Windows "
"systems will not be able to display long filenames. You "
- "will only see the ISO9660 filenames."
+ "will only see the ISO 9660 filenames."
"<p>If you do not intend to use the CD/DVD on a Windows "
"system it is safe to disable Joliet."),
i18n("Joliet Extensions Disabled"),
diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp
index c48caaf..a521977 100644
--- a/src/projects/k3bdatamultisessioncombobox.cpp
+++ b/src/projects/k3bdatamultisessioncombobox.cpp
@@ -74,8 +74,8 @@ void K3b::DataMultiSessionCombobox::init( bool force )
insertItem( s_noneIndex, i18n("No Multisession") );
if( !m_forceNoMultiSession ) {
insertItem( s_startIndex, i18n("Start Multisession") );
- insertItem( s_continueIndex, i18n("Continue Multisession ") );
- insertItem( s_finishIndex, i18n("Finish Multisession ") );
+ insertItem( s_continueIndex, i18n("Continue Multisession") );
+ insertItem( s_finishIndex, i18n("Finish Multisession") );
}
}
diff --git a/src/projects/k3bdatamultisessionimportdialog.cpp b/src/projects/k3bdatamultisessionimportdialog.cpp
index 06d87ff..5f09054 100644
--- a/src/projects/k3bdatamultisessionimportdialog.cpp
+++ b/src/projects/k3bdatamultisessionimportdialog.cpp
@@ -98,7 +98,7 @@ void K3b::DataMultisessionImportDialog::slotOk()
i18n("<p>K3b found session containing Joliet information for long filenames "
"but no Rock Ridge extensions."
"<p>The filenames in the imported session will be converted to a restricted "
- "character set in the new session. This character set is based on the ISO9660 "
+ "character set in the new session. This character set is based on the ISO 9660 "
"settings in the K3b project. K3b is not able to display these converted filenames yet."),
i18n("Session Import Warning") );
iso.close();
diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp
index 3a0ae3f..81829b7 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -164,7 +164,7 @@ K3b::DataPropertiesDialog::DataPropertiesDialog( const QList<K3b::DataItem*>& da
m_editSortWeight->setToolTip( i18n("Modify the physical sorting") );
m_checkHideOnRockRidge->setWhatsThis( i18n("<p>If this option is checked, the file or folder "
"(and its entire contents) will be hidden on the "
- "ISO9660 and RockRidge filesystem.</p>"
+ "ISO 9660 and RockRidge filesystem.</p>"
"<p>This is useful, for example, for having different README "
"files for RockRidge and Joliet, which can be managed "
"by hiding README.joliet on RockRidge and README.rr "
@@ -177,13 +177,13 @@ K3b::DataPropertiesDialog::DataPropertiesDialog( const QList<K3b::DataItem*>& da
"by hiding README.joliet on RockRidge and README.rr "
"on the Joliet filesystem.</p>") );
m_editSortWeight->setWhatsThis( i18n("<p>This value modifies the physical sort order of the files "
- "in the ISO9660 filesystem. A higher weighting means that the "
+ "in the ISO 9660 filesystem. A higher weighting means that the "
"file will be located closer to the beginning of the image "
"(and the disk)."
"<p>This option is useful in order to optimize the data layout "
"on a medium."
"<p><b>Caution:</b> This does not sort the order of the file "
- "names that appear in the ISO9660 folder. "
+ "names that appear in the ISO 9660 folder. "
"It sorts the order in which the file data is "
"written to the image.") );
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 91a643b..5ad4154 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -194,7 +194,7 @@ void K3b::DataUrlAddingDialog::slotStartAddUrls()
K3b::Iso9660 isoF( m_urls.first().toLocalFile() );
if( isoF.open() ) {
if( KMessageBox::warningYesNo( parentWidget(),
- i18n("<p>The file you are about to add to the project is an ISO9660 image. As such "
+ i18n("<p>The file you are about to add to the project is an ISO 9660 image. As such "
"it can be burned to a medium directly since it already contains a file "
"system.<br>"
"Are you sure you want to add this file to the project?"),
diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp
index 366e0b3..0c38d5e 100644
--- a/src/projects/k3bvcdburndialog.cpp
+++ b/src/projects/k3bvcdburndialog.cpp
@@ -129,7 +129,7 @@ K3b::VcdBurnDialog::VcdBurnDialog( K3b::VcdDoc* _doc, QWidget *parent )
// What's This info
// -------------------------------------------------------------------------
m_radioVcd11->setWhatsThis( i18n( "<p>This is the most basic <b>Video CD</b> specification dating back to 1993, which has the following characteristics:"
- "<ul><li>One mode2 mixed form ISO-9660 track containing file pointers to the information areas.</li>"
+ "<ul><li>One mode2 mixed form ISO 9660 track containing file pointers to the information areas.</li>"
"<li>Up to 98 multiplex-ed MPEG-1 audio/video streams or CD-DA audio tracks.</li>"
"<li>Up to 500 MPEG sequence entry points used as chapter divisions.</li></ul>"
"<p>The Video CD specification requires the multiplex-ed MPEG-1 stream to have a CBR of less than 174300 bytes (1394400 bits) per second in order to accommodate single speed CD-ROM drives.<br>"
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 5f75e99..c108f40 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -386,7 +386,7 @@ void K3b::AudioCdView::slotEditTrackCddb()
void K3b::AudioCdView::slotEditAlbumCddb()
{
KDialog dialog( this);
- dialog.setCaption(i18n("Album Cddb"));
+ dialog.setCaption(i18n("Album CDDB"));
dialog.setModal(true);
dialog.setButtons(KDialog::Ok|KDialog::Cancel);
dialog.setDefaultButton(KDialog::Ok);
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index bc61efc..4428384 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -131,7 +131,7 @@ void K3b::VideoCdRippingDialog::setupContextHelp()
m_labelNecessarySize->setToolTip( i18n("Necessary space for extracted files") );
m_ignoreExt->setToolTip( i18n("Ignore extended PSD") );
- m_ignoreExt->setWhatsThis( i18n("<p>Ignore extended PSD (located in the ISO-9660 filesystem under `/EXT/PSD_X.VCD') and use the <em>standard</em> PSD.</p>") );
+ m_ignoreExt->setWhatsThis( i18n("<p>Ignore extended PSD (located in the ISO 9660 filesystem under `/EXT/PSD_X.VCD') and use the <em>standard</em> PSD.</p>") );
m_sector2336->setToolTip( i18n("Assume a 2336-byte sector mode") );
m_sector2336->setWhatsThis( i18n("<p>This option only makes sense if you are reading from a BIN CD disk image. This indicates to `vcdxrip' to assume a 2336-byte sector mode for image file.</p>"
More information about the kde-doc-english
mailing list