[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/k3b
From:       Michal Malek <michalm () jabster ! pl>
Date:       2010-10-15 20:12:29
Message-ID: 20101015201229.E5A04AC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1186326 by mmalek:

Fixed too early i18n() usage. Patch by Christoph Feck. Thanks a lot!
CCMAIL: christoph@maxiom.de
BUG: 254221

 M  +1 -4      libk3b/projects/datacd/k3bisooptions.cpp  
 M  +18 -12    src/k3bwritingmodewidget.cpp  
 M  +9 -0      src/projects/k3bdataimagesettingswidget.cpp  


--- trunk/extragear/multimedia/k3b/libk3b/projects/datacd/k3bisooptions.cpp \
#1186325:1186326 @@ -24,10 +24,7 @@
 
 
 K3b::IsoOptions::IsoOptions()
-    : m_volumeID( i18nc( "This is the default volume identifier of a data project \
                created by K3b. "
-                         "The string should not be longer than 16 characters to \
                avoid warnings regarding "
-                         "Joiliet extensions which induce this restriction.",
-                         "K3b data project" ) ),
+    : m_volumeID( "K3b data project" ),
       m_applicationID( QString("K3B THE CD KREATOR (C) 1998-2010 SEBASTIAN TRUEG AND \
MICHAL MALEK") ),  m_systemId( K3b::systemName().toUpper() ),
       m_whiteSpaceTreatmentReplaceString( "_" )
--- trunk/extragear/multimedia/k3b/src/k3bwritingmodewidget.cpp #1186325:1186326
@@ -23,23 +23,29 @@
 
 #include <QToolTip>
 
-static const QString s_autoHelp = i18n("Let K3b select the best-suited mode. This is \
                the recommended selection.");
-static const QString s_daoHelp = i18n("<em>Disk At Once</em> or more properly \
<em>Session At Once</em>. " +static const KLocalizedString s_autoHelp =
+    ki18n("Let K3b select the best-suited mode. This is the recommended \
selection."); +static const KLocalizedString s_daoHelp =
+    ki18n("<em>Disk At Once</em> or more properly <em>Session At Once</em>. "
                                       "The laser is never turned off while writing \
                the CD or DVD. "
                                       "This is the preferred mode to write audio CDs \
                since it allows "
                                       "pregaps other than 2 seconds. Not all writers \
                support DAO.<br>"
                                       "DVD-R(W)s written in DAO provide the best \
                DVD-Video compatibility.");
-static const QString s_taoHelp = i18n("<em>Track At Once</em> should be supported by \
every CD writer. " +static const KLocalizedString s_taoHelp =
+    ki18n("<em>Track At Once</em> should be supported by every CD writer. "
                                       "The laser will be turned off after every \
                track.<br>"
                                       "Most CD writers need this mode for writing \
multisession CDs.");  // TODO: add something like: "No CD-TEXT writing in TAO mode."
 
-static const QString s_rawHelp = i18n("RAW writing mode. The error correction data \
is created by the " +static const KLocalizedString s_rawHelp =
+    ki18n("RAW writing mode. The error correction data is created by the "
                                       "software instead of the writer device.<br>"
                                       "Try this if your CD writer fails to write in \
                DAO and TAO.");
-static const QString s_seqHelp = i18n("Incremental sequential is the default writing \
mode for DVD-R(W). " +static const KLocalizedString s_seqHelp =
+    ki18n("Incremental sequential is the default writing mode for DVD-R(W). "
                                       "It allows multisession DVD-R(W)s. It only \
                applies to DVD-R(W).");
-static const QString s_ovwHelp = i18n("Restricted Overwrite allows to use a DVD-RW \
just like a DVD-RAM " +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 " @@ -154,17 +160,17 @@
     else
         d->selectedModes = d->supportedModes;
 
-    insertItem( WritingModeAuto, i18n("Auto"), s_autoHelp );
+    insertItem( WritingModeAuto, i18n("Auto"), s_autoHelp.toString() );
     if( d->selectedModes & WritingModeSao )
-        insertItem( WritingModeSao, i18n("DAO"), s_daoHelp );
+        insertItem( WritingModeSao, i18n("DAO"), s_daoHelp.toString() );
     if( d->selectedModes & WritingModeTao )
-        insertItem( WritingModeTao, i18n("TAO"), s_taoHelp );
+        insertItem( WritingModeTao, i18n("TAO"), s_taoHelp.toString() );
     if( d->selectedModes & WritingModeRaw )
-        insertItem( WritingModeRaw, i18n("RAW"), s_rawHelp );
+        insertItem( WritingModeRaw, i18n("RAW"), s_rawHelp.toString() );
     if( d->selectedModes & WritingModeRestrictedOverwrite )
-        insertItem( WritingModeRestrictedOverwrite, i18n("Restricted Overwrite"), \
s_ovwHelp ); +        insertItem( WritingModeRestrictedOverwrite, i18n("Restricted \
Overwrite"), s_ovwHelp.toString() );  if( d->selectedModes & \
                WritingModeIncrementalSequential )
-        insertItem( WritingModeIncrementalSequential, i18n("Incremental"), s_seqHelp \
); +        insertItem( WritingModeIncrementalSequential, i18n("Incremental"), \
s_seqHelp.toString() );  
     setWritingMode( currentMode != -1 ? WritingMode( currentMode ) : WritingModeAuto \
);  }
--- trunk/extragear/multimedia/k3b/src/projects/k3bdataimagesettingswidget.cpp \
#1186325:1186326 @@ -92,6 +92,15 @@
 
 static void initializePresets()
 {
+    QString vid = i18nc( "This is the default volume identifier of a data project \
created by K3b. " +                         "The string should not be longer than 16 \
characters to avoid warnings regarding " +                         "Joiliet \
extensions which induce this restriction.", +                         "K3b data \
project" ); +
+    for ( int i = 0; i < FS_CUSTOM; ++i ) {
+        s_fsPresets[i].setVolumeID( vid );
+    }
+
     // Linux-only
     s_fsPresets[FS_LINUX_ONLY].setCreateJoliet( false );
     s_fsPresets[FS_LINUX_ONLY].setISOallow31charFilenames( true );


[prev in list] [next in list] [prev in thread] [next in thread]