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

List:       kde-commits
Subject:    extragear/multimedia/k3b/src
From:       Markus Meik Slopianka <kamikazow () web ! de>
Date:       2009-11-30 21:13:15
Message-ID: 1259615595.599031.26597.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1056788 by markuss:

Konqui is no longer the default file manager ;-)

 M  +5 -5      k3bfirstrun.cpp  
 M  +4 -4      option/base_k3bmiscoptiontab.ui  
 M  +1 -1      projects/k3bdatapropertiesdialog.cpp  


--- trunk/extragear/multimedia/k3b/src/k3bfirstrun.cpp #1056787:1056788
@@ -58,17 +58,17 @@
     setButtons(Ok|Cancel);
     setDefaultButton(Ok);
 
-    setButtonText(Ok, i18n("Enable Konqueror integration") );
-    setButtonText(Cancel, i18n("No Konqueror integration") );
+    setButtonText(Ok, i18n("Enable KDE file manager integration") );
+    setButtonText(Cancel, i18n("No KDE file manager integration") );
 
     QFrame* plain = new QFrame();
     setMainWidget(plain);
-    QLabel* label = new QLabel( i18n("<p>K3b can integrate itself into Konqueror. \
This integration " +    QLabel* label = new QLabel( i18n("<p>K3b can integrate itself \
                into KDE file managers like Dolphin or Konqueror. This integration "
                                      "allows K3b to be started from the context menu \
                in the file manager."
-                                     "<p><em>Konqueror integration can always be \
disabled and " +                                     "<p><em>File manager integration \
                can always be disabled and "
                                      "enabled again from the K3b settings.</em>"), \
plain );  QLabel* pixLabel = new QLabel( plain );
-    pixLabel->setPixmap( DesktopIcon( "konqueror" ) );
+    pixLabel->setPixmap( DesktopIcon( "system-file-manager" ) );
 
     QHBoxLayout* lay = new QHBoxLayout( plain );
     lay->setMargin( 0 );
--- trunk/extragear/multimedia/k3b/src/option/base_k3bmiscoptiontab.ui \
#1056787:1056788 @@ -121,15 +121,15 @@
       <item>
        <widget class="QCheckBox" name="m_checkKonqiIntegration" >
         <property name="toolTip" >
-         <string>Enable integration of K3b actions into Konqueror menus</string>
+         <string>Enable integration of K3b actions into KDE file manager \
menus</string>  </property>
         <property name="whatsThis" >
-         <string>&lt;p>K3b can integrate itself into Konqueror. This integration \
allows to start K3b from the context menu in the file manager. +         \
<string>&lt;p>K3b can integrate itself into KDE file managers like Dolphin or \
Konqueror. This integration allows to start K3b from the context menu in the file \
manager.  &lt;p>A typical example is: in order to burn a folder to a data CD one \
clicks on the folder using the right mouse button. In the appearing context menu one \
selects "Create Data CD with K3b..." and a new K3b project containing the folder is \
                created.
-&lt;p>&lt;em>Konqueror integration is not enabled by default to prevent unwanted \
cluttering of the Konqueror menus.&lt;/em></string> +&lt;p>&lt;em>File manager \
integration is not enabled by default to prevent unwanted cluttering of the \
menus.&lt;/em></string>  </property>
         <property name="text" >
-         <string>E&amp;nable Konqueror integration</string>
+         <string>E&amp;nable KDE file manager integration</string>
         </property>
        </widget>
       </item>
--- trunk/extragear/multimedia/k3b/src/projects/k3bdatapropertiesdialog.cpp \
#1056787:1056788 @@ -180,7 +180,7 @@
                                          "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 CD/DVD."
+                                         "on a medium."
                                          "<p><b>Caution:</b> This does not sort the \
                order of the file "
                                          "names that appear in the ISO9660 \
                directory. "
                                          "It sorts the order in which the file data \
is "


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