[kwave] /: Fix the name of K3b (not K3B)

Luigi Toscano null at kde.org
Sun May 7 22:20:19 UTC 2017


Git commit f123f6046c3a831cf996ae53bc3d884fdbe78fad by Luigi Toscano.
Committed on 07/05/2017 at 22:18.
Pushed by ltoscano into branch 'master'.

Fix the name of K3b (not K3B)

Change the name to the correct name of the burning program:
- in user visible strings;
- in the comments.

Code entities (classes, methods, properties) have not been touched
(no need).

M  +1    -1    CHANGES
M  +7    -7    doc/en/index.docbook
M  +1    -1    plugins/export_k3b/K3BExportDialog.cpp
M  +1    -1    plugins/export_k3b/K3BExportDialog.h
M  +12   -12   plugins/export_k3b/K3BExportPlugin.cpp
M  +3    -3    plugins/export_k3b/K3BExportPlugin.h
M  +2    -2    plugins/export_k3b/K3BExportWidget.cpp
M  +1    -1    plugins/export_k3b/K3BExportWidget.h
M  +1    -1    plugins/export_k3b/K3BExportWidgetBase.ui
M  +1    -1    plugins/export_k3b/kwaveplugin_export_k3b.desktop.in
M  +1    -1    scripts/screenshots.kwave

https://commits.kde.org/kwave/f123f6046c3a831cf996ae53bc3d884fdbe78fad

diff --git a/CHANGES b/CHANGES
index ad4d8090..473f1b08 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 
 xx.xx.x [xxxx-xx-xx]
 
-  * new plugin: export to K3B project file
+  * new plugin: export to K3b project file
   * reduced flicker of position widget
   * bugfix: deleting labels per menu did not work
   * bugfix: wrong text in file progress dialog when saving
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 4079b4fc..b5aec0da 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -5361,7 +5361,7 @@
     </sect1>
 
     <!-- @PLUGIN@ export_k3b -->
-    <sect1 id="plugin_sect_export_k3b"><title id="plugin_title_export_k3b">&no-i18n-plugin_export_k3b; (Export to K3B Project)</title>
+    <sect1 id="plugin_sect_export_k3b"><title id="plugin_title_export_k3b">&no-i18n-plugin_export_k3b; (Export to K3b Project)</title>
 	<screenshot>
 	    <screeninfo>Screenshot</screeninfo>
 	    <mediaobject>
@@ -5369,7 +5369,7 @@
 		    <imagedata fileref="kwave-plugin-export_k3b.png" format="PNG"/>
 		</imageobject>
 		<textobject>
-		    <phrase>Screenshot of the K3B Export Plugin</phrase>
+		    <phrase>Screenshot of the K3b Export Plugin</phrase>
 		</textobject>
 	    </mediaobject>
 	</screenshot>
@@ -5387,8 +5387,8 @@
 		<listitem>
 		    <para>
 			Saves all sections between markers into a separate file and creates
-			a K3B project file. After having successfully written all files it
-			is possible to start <ulink url="&url_k3b;">K3B</ulink> and
+			a K3b project file. After having successfully written all files it
+			is possible to start <ulink url="&url_k3b;">K3b</ulink> and
 			burn the result to an audio CD.
 			This is useful for splitting a file with a recording that consists
 			of several parts, which are separated by labels, and then burn it
@@ -5410,7 +5410,7 @@
 			    <term><replaceable>filename</replaceable></term>
 			    <listitem>
 				<para>
-				    The name of the K3B project file, will be used as
+				    The name of the K3b project file, will be used as
 				    base name for the exported file names.
 				</para>
 			    </listitem>
@@ -5520,14 +5520,14 @@
 						    <entry>&no-i18n-tag;<command>0</command></entry>
 						    <entry>
 							Save to the same directory as the
-							K3B project file.
+							K3b project file.
 						    </entry>
 						</row>
 						<row>
 						    <entry>&no-i18n-tag;<command>1</command></entry>
 						    <entry>
 							Save into a sub directory of the directory
-							of the K3B project file, using the K3B
+							of the K3b project file, using the K3b
 							project file name as base and appending
 							<quote><command><literal>.dir</literal></command></quote>.
 						    </entry>
diff --git a/plugins/export_k3b/K3BExportDialog.cpp b/plugins/export_k3b/K3BExportDialog.cpp
index 47f276b5..66189a82 100644
--- a/plugins/export_k3b/K3BExportDialog.cpp
+++ b/plugins/export_k3b/K3BExportDialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *    K3BExportDialog.cpp  -  Extended KwaveFileDialog for exporting to K3B
+ *    K3BExportDialog.cpp  -  Extended KwaveFileDialog for exporting to K3b
  *                             -------------------
  *    begin                : Thu Apr 13 2017
  *    copyright            : (C) 2017 by Thomas Eschenbacher
diff --git a/plugins/export_k3b/K3BExportDialog.h b/plugins/export_k3b/K3BExportDialog.h
index 70805145..1a04c734 100644
--- a/plugins/export_k3b/K3BExportDialog.h
+++ b/plugins/export_k3b/K3BExportDialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *      K3BExportDialog.h  -  Extended KwaveFileDialog for exporting to K3B
+ *      K3BExportDialog.h  -  Extended KwaveFileDialog for exporting to K3b
  *                             -------------------
  *    begin                : Thu Apr 13 2017
  *    copyright            : (C) 2017 by Thomas Eschenbacher
diff --git a/plugins/export_k3b/K3BExportPlugin.cpp b/plugins/export_k3b/K3BExportPlugin.cpp
index 46a6712d..f71085c0 100644
--- a/plugins/export_k3b/K3BExportPlugin.cpp
+++ b/plugins/export_k3b/K3BExportPlugin.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************
- *     K3BExportPlugin.cpp -  export of K3B project files
+ *     K3BExportPlugin.cpp -  export of K3b project files
  *                             -------------------
  *    begin                : Thu Apr 13 2017
  *    copyright            : (C) 2017 by Thomas Eschenbacher
@@ -54,10 +54,10 @@
 
 KWAVE_PLUGIN(export_k3b, K3BExportPlugin)
 
-/** mime type of K3B project files */
+/** mime type of K3b project files */
 #define K3B_PROJECT_MIME_TYPE "application/x-k3b"
 
-/** file suffix of K3B project files */
+/** file suffix of K3b project files */
 #define K3B_FILE_SUFFIX _("*.k3b")
 
 /** number of digits to use for out files */
@@ -267,8 +267,8 @@ void Kwave::K3BExportPlugin::load(QStringList &params)
     Q_UNUSED(params);
 
     QString menu_path = _("File/Save/%1").arg(i18nc(
-	"menu: /File/Save/Export to K3B Project...",
-	"Export to K3B Project..."
+	"menu: /File/Save/Export to K3b Project...",
+	"Export to K3b Project..."
     ));
     emitCommand(_("menu(plugin:setup(export_k3b),%1%2)").arg(
 	menu_path).arg(_("/#group(@SIGNAL)")));
@@ -298,8 +298,8 @@ QStringList *Kwave::K3BExportPlugin::setup(QStringList &params)
 	new(std::nothrow) Kwave::K3BExportDialog(
 	    _("kfiledialog:///kwave_export_k3b"),
 	    K3B_FILE_SUFFIX + _("|") + i18nc(
-		"file type filter when exporting to K3B",
-		"K3B project file (*.k3b)"
+		"file type filter when exporting to K3b",
+		"K3b project file (*.k3b)"
 	    ),
 	    parentWidget(),
 	    QUrl::fromUserInput(signalName()),
@@ -366,7 +366,7 @@ QStringList *Kwave::K3BExportPlugin::setup(QStringList &params)
 
 //***************************************************************************
 /*
- * taken from K3B, libk3b/projects/k3bdoc.cpp
+ * taken from K3b, libk3b/projects/k3bdoc.cpp
  *
  * Copyright (C) 2003-2008 Sebastian Trueg <trueg at k3b.org>
  *
@@ -401,7 +401,7 @@ void Kwave::K3BExportPlugin::saveGeneralDocumentData(QDomElement *part)
 
 //***************************************************************************
 /*
- * taken from K3B, libk3b/projects/audiocd/k3baudiodoc.cpp
+ * taken from K3b, libk3b/projects/audiocd/k3baudiodoc.cpp
  *
  * Copyright (C) 2003-2008 Sebastian Trueg <trueg at k3b.org>
  * Copyright (C)      2009 Gustavo Pichorim Boiko <gustavo.boiko at kdemail.net>
@@ -603,7 +603,7 @@ int Kwave::K3BExportPlugin::start(QStringList &params)
 
     // check: only mono or stereo files are supported
     if ((tracks.count() != 1) && (tracks.count() != 2)) {
-	qWarning("sorry, K3B can not handle %u tracks", tracks.count());
+	qWarning("sorry, K3b can not handle %u tracks", tracks.count());
 	Kwave::MessageBox::sorry(parentWidget(), i18n(
 	    "Only mono and stereo files can be used for an audio CD. "
 	    "You can either deselect some channels or export the file "
@@ -667,9 +667,9 @@ int Kwave::K3BExportPlugin::start(QStringList &params)
 	return result; // aborted or failed -> do not ask about starting k3b
 
     if (Kwave::MessageBox::questionYesNo(parentWidget(), i18n(
-	"A K3B project file has been created and audio files have "
+	"A K3b project file has been created and audio files have "
 	"been exported.\n"
-	"Should I start K3B and open the audio CD project now?"
+	"Should I start K3b and open the audio CD project now?"
     )) == KMessageBox::Yes) {
 	// call k3b and pass the project file name (must be full path)
 	QStringList args;
diff --git a/plugins/export_k3b/K3BExportPlugin.h b/plugins/export_k3b/K3BExportPlugin.h
index 12137e82..dd86f203 100644
--- a/plugins/export_k3b/K3BExportPlugin.h
+++ b/plugins/export_k3b/K3BExportPlugin.h
@@ -1,5 +1,5 @@
 /*************************************************************************
- *      K3BExportPlugin.h  -  export of K3B project files
+ *      K3BExportPlugin.h  -  export of K3b project files
  *                             -------------------
  *    begin                : Thu Apr 13 2017
  *    copyright            : (C) 2017 by Thomas Eschenbacher
@@ -72,7 +72,7 @@ namespace Kwave
 	virtual QStringList *setup(QStringList &params);
 
 	/**
-	 * Saves the K3B project file, using the settings made in "setup()"
+	 * Saves the K3b project file, using the settings made in "setup()"
 	 * @see Kwave::Plugin::start()
 	 */
 	virtual int start(QStringList &params);
@@ -129,7 +129,7 @@ namespace Kwave
 	/** save the "general" section */
 	void saveGeneralDocumentData(QDomElement *part);
 
-	/** save the K3B project document data */
+	/** save the K3b project document data */
 	void saveDocumentData(QDomElement *docElem);
 
 	/**
diff --git a/plugins/export_k3b/K3BExportWidget.cpp b/plugins/export_k3b/K3BExportWidget.cpp
index d2aae300..6d8c5a67 100644
--- a/plugins/export_k3b/K3BExportWidget.cpp
+++ b/plugins/export_k3b/K3BExportWidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * K3BExportWidget.cpp -  widget for K3B export options in the file open dlg
+ * K3BExportWidget.cpp -  widget for K3b export options in the file open dlg
  *                             -------------------
  *    begin                : Thu Apr 13 2017
  *    copyright            : (C) 2017 by Thomas Eschenbacher
@@ -41,7 +41,7 @@ Kwave::K3BExportWidget::K3BExportWidget(
 
     cbLabelPattern->addItem(i18nc(
 	"default entry of the list of placeholder patterns in "
-	"the K3B export plugin (used for detecting title and artist "
+	"the K3b export plugin (used for detecting title and artist "
 	"from a label description)",
 	"(auto detect)"
     ));
diff --git a/plugins/export_k3b/K3BExportWidget.h b/plugins/export_k3b/K3BExportWidget.h
index 5495e89b..ef65709f 100644
--- a/plugins/export_k3b/K3BExportWidget.h
+++ b/plugins/export_k3b/K3BExportWidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * K3BExportWidget.h  -  widget for K3B export options in the file open dlg
+ * K3BExportWidget.h  -  widget for K3b export options in the file open dlg
  *                             -------------------
  *    begin                : Thu Apr 13 2017
  *    copyright            : (C) 2017 by Thomas Eschenbacher
diff --git a/plugins/export_k3b/K3BExportWidgetBase.ui b/plugins/export_k3b/K3BExportWidgetBase.ui
index 5569473f..6d7b6fa4 100644
--- a/plugins/export_k3b/K3BExportWidgetBase.ui
+++ b/plugins/export_k3b/K3BExportWidgetBase.ui
@@ -128,7 +128,7 @@
         </property>
         <item>
          <property name="text">
-          <string>Same Directory as K3B File</string>
+          <string>Same Directory as K3b File</string>
          </property>
         </item>
         <item>
diff --git a/plugins/export_k3b/kwaveplugin_export_k3b.desktop.in b/plugins/export_k3b/kwaveplugin_export_k3b.desktop.in
index 994628bd..ef44faab 100644
--- a/plugins/export_k3b/kwaveplugin_export_k3b.desktop.in
+++ b/plugins/export_k3b/kwaveplugin_export_k3b.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=K3B Project Export
+Name=K3b Project Export
 Name[ca]=Exporta un projecte del K3b
 Name[ca at valencia]=Exporta un projecte del K3b
 Name[cs]=Export projektu K3B
diff --git a/scripts/screenshots.kwave b/scripts/screenshots.kwave
index 5fcfab99..1d2ac960 100644
--- a/scripts/screenshots.kwave
+++ b/scripts/screenshots.kwave
@@ -173,7 +173,7 @@ plugin-codec_mp3:
     sync()
 
 #
-# screenshot of the K3B export setup dialog
+# screenshot of the K3b export setup dialog
 #
 plugin-export_k3b:
     selectall()


More information about the kde-doc-english mailing list