- unified usage of "SoundFont" term (bnc#548898)

- 2.19.0 svn path=/trunk/sound/; revision=59676
yast · Nov 20, 2009 · 94d9e94 · 94d9e94
1 parent f6533cb
commit 94d9e94
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.18.4
+2.19.0
diff --git a/package/yast2-sound.changes b/package/yast2-sound.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 20 15:44:03 CET 2009 - lslezak@suse.cz
+
+- unified usage of "SoundFont" term (bnc#548898)
+- 2.19.0
+
 -------------------------------------------------------------------
 Wed Oct 14 19:09:43 CEST 2009 - lslezak@suse.cz
 

diff --git a/sound/src/complex.ycp b/sound/src/complex.ycp
@@ -468,8 +468,8 @@ define map HardwareDialog() {
 
     if (show_fonts)
     {
-	// menu item
-	extra_buttons = add(extra_buttons, [ `fonts, _("&Install soundfonts...") ]);
+	// menu item, do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font)
+	extra_buttons = add(extra_buttons, [ `fonts, _("&Install SoundFonts...") ]);
     }
 
     // dialog title

diff --git a/sound/src/routines.ycp b/sound/src/routines.ycp
@@ -835,7 +835,7 @@ module parameters, including invalid IO or IRQ parameters."), modname);
     }
 
     /**
-     *  checks whether sound fonts have already been installed
+     *  checks whether SoundFonts have already been installed
      *	@return boolean already installed/not installed
      *
      */
@@ -845,15 +845,15 @@ module parameters, including invalid IO or IRQ parameters."), modname);
     }
 
     /**
-     * return true if the sound card supports sound fonts
+     * return true if the sound card supports SoundFonts
      * @param save_entry save entry
      * @return boolean	card supports fonts/it doesn't
      */
 
     define boolean HasFonts(map save_entry) ``{
 	if (Mode::config())
 	{
-	    // don't install sound fonts during autoinstallation config
+	    // don't install SoundFonts during autoinstallation config
 	    return false;
 	}
 
@@ -865,7 +865,7 @@ module parameters, including invalid IO or IRQ parameters."), modname);
     }
 
     /**
-     *  this small wizard will install sound fonts for soundblaster live/awe
+     *  this small wizard will install SoundFonts for soundblaster live/awe
      *  @param symlink is path to default.sf2 that is to be created
      *  @param dontask if true, skip the first messagebox
      *  @return void
@@ -933,7 +933,7 @@ module parameters, including invalid IO or IRQ parameters."), modname);
 	    string mpoint = mount_device(cdrom_device);
 	    y2milestone("Device mounted: %1", mpoint);
 
-	    // number of found sound font files
+	    // number of found SoundFont files
 	    integer cnt = 0;
 	    if (mpoint != nil)
 	    {
@@ -946,7 +946,7 @@ module parameters, including invalid IO or IRQ parameters."), modname);
 
 		y2milestone("Device unmounted: %1", umount_device(mpoint));
 
-		// restart ALSA after sound font copy
+		// restart ALSA after SoundFont copy
 		y2milestone("Restarting ALSA: %1",
 		    SCR::Execute(.target.bash, "/etc/init.d/alsasound reload"));
 	    }

diff --git a/sound/src/texts.ycp b/sound/src/texts.ycp
@@ -211,10 +211,12 @@ _("The sound configuration will be saved now."),
 	    ],
 
 	    "soundFontTitle":
-	    _("Install Soundfonts"),
+	    // do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font)
+	    _("Install SoundFonts"),
 
 	    "soundFontQuestion":
-_("Should YaST2 install the wavetable sound fonts from 
+	    // do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font)
+_("Should YaST2 install the wavetable SoundFont-files from 
 your Soundblaster Live! or AWE driver CD?\n"),
 
 	    "soundFontAppeal":
@@ -223,11 +225,13 @@ in the CD-ROM drive.
 "),
 
 	    "soundFontFinal":
-	    // To translators: the messaage below will look like this: "14 soundfont-files have been installed in /usr/lli/asdf"
-_("%1 soundfont-files have been installed in %2."),
+	    // To translators: the message below will look like this: "14 SoundFont-files have been installed in /usr/share/..."
+	    // do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font)
+_("%1 SoundFont-files have been installed in %2."),
 
 	    "soundFontNotFound":
-_("No Soundfont-files found."),
+// do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font)
+_("No SoundFont-files found."),
 
 	    "soundFontRetry":
 _("Would you like to change the CD and retry ?"),

diff --git a/sound/src/volume.ycp b/sound/src/volume.ycp
@@ -132,7 +132,7 @@
 
 	if (HasFonts(save_entry) && !FontsInstalled())
 	{
-	    /* Sound fonts installation */
+	    /* SoundFonts installation */
 	    InstallFonts("", false);
 	}