From 52e095819c8953f7fe5a125191ff042c84a40e3d Mon Sep 17 00:00:00 2001 From: "EinvalSledge@gmail.com" Date: Thu, 14 Jun 2012 22:07:43 +0000 Subject: [PATCH 1/1] Fixes for lots of spelling mistakes from vskytta. Closes issue 68. git-svn-id: http://abcde.googlecode.com/svn/trunk@347 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- TODO | 2 +- abcde | 16 ++++++++-------- cddb-tool | 2 +- changelog | 13 +++++++------ debian/changelog | 10 +++++----- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/TODO b/TODO index d231a52..b44d39f 100644 --- a/TODO +++ b/TODO @@ -36,7 +36,7 @@ TODO: * When cdparanoia encounters a problem (disk full, data track) when abcde is run in batch mode, abcde still continues, but batch mode is disabled. I.e. instead of normalizing all tracks together, they are normalized - seperately, instead of running "lame --nogap" on all wavs, lame is + separately, instead of running "lame --nogap" on all wavs, lame is invoked once per wav. Abcde should halt when a problem occurs, so it can be manually resolved. diff --git a/abcde b/abcde index 04c0294..56b0a64 100755 --- a/abcde +++ b/abcde @@ -95,7 +95,7 @@ log () esac } -# Funtions to replace the need of seq, which is too distribution dependant. +# Functions to replace the need of seq, which is too distribution dependent. f_seq_row () { i=$1 @@ -3277,11 +3277,11 @@ MAXPROCS=1 # List of actions to perform - by default, run to completion ACTIONS=cddb,read,encode,tag,move,clean -# This option is basicaly for Debian package dependencies: -# List of prefered outputs - by default, run with whatever we have in the path +# This option is basically for Debian package dependencies: +# List of preferred outputs - by default, run with whatever we have in the path DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:toolame,mp3:lame,mp3:bladeenc,spx:speex,m4a:faac -# List of prefered cdromreaders - by default, run whichever we have in the path +# List of preferred cdromreaders - by default, run whichever we have in the path DEFAULT_CDROMREADERS="cdparanoia icedax cdda2wav" # List of quality levels associated with the encoders: @@ -3290,7 +3290,7 @@ DEFAULT_QUALITY_LO="oggenc:-q 1,lame:-q 7,speex:--quality 5,m4a:" DEFAULT_QUALITY_HI="oggenc:-q 7,lame:--preset standard,speex:--quality 9,m4a:" DEFAULT_QUALITY_XHI="oggenc:-q 10,lame:--preset extreme,speex:--quality 10,m4a:" -# Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for +# Assume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for # Linux/OpenBSD. ftp is user for NetBSD. # Let's use these checkings to determine the OS flavour, which will be used # later @@ -3602,7 +3602,7 @@ if [ X"$CDROM" != "X" ] ; then if [ "$OSFLAVOUR" = "FBSD" ]; then if echo "$CDROMID" | grep "^[0-9],[0-9],[0-9]$" >/dev/null 2>&1 ; then :; else log error "CDROMID not in the right format for $CDROMREADERSYNTAX" - log error "Use \"cdrecord -scanbus\" to obtain a adecuate ID an set CDROMID accordingly" + log error "Use \"cdrecord -scanbus\" to obtain an adequate ID and set CDROMID accordingly" exit 1 fi fi @@ -4057,7 +4057,7 @@ if [ "$DOREAD" = "y" ]; then # - set the CD speed value with eject -x vecho -n "Executing customizable pre-read function... " - pre_read # Execute the user-defined pre-read funtion. Close the CD with it. + pre_read # Execute the user-defined pre-read function. Close the CD with it. vecho "done." fi @@ -4212,7 +4212,7 @@ if [ "$NOGAP" = "y" ] || [ "$BATCHNORM" = "y" ] || [ "$ONETRACK" = "y" ]; then echo NEXTTRACK fi -# Execute the user-defined post_read funtion before ejecting CD +# Execute the user-defined post_read function before ejecting CD post_read # We are now finished with the cdrom - it can be safely ejected. Note that diff --git a/cddb-tool b/cddb-tool index 7544661..2e2c081 100755 --- a/cddb-tool +++ b/cddb-tool @@ -6,7 +6,7 @@ # This code is hereby licensed for public consumption under either the # GNU GPL v2 or greater, or Larry Wall's Artistic License - your choice. # -# You should have recieved a copy of the GNU General Public License +# You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/changelog b/changelog index 8be797f..b1fb954 100644 --- a/changelog +++ b/changelog @@ -21,6 +21,7 @@ abcde 2.5.3 UNRELEASED Thanks to richard.security.consultant for the patch. * Change cddb-tool to use bash to make sure that echo -n works. Closes issue 67. + * Fixes for lots of spelling mistakes from vskytta. Closes issue 68. -- Steve McIntyre <93sam@debian.org> Mon, 30 Apr 2012 16:59:14 +0100 @@ -325,11 +326,11 @@ abcde 2.3.99 * BATCH has been split into two options: BATCHNORM which allows, by using -b, to use the -a normalize in all the files at once, and NOGAP, that by using -g, introduces the lame's --nogap extension. - * Added replygain using the appropiate tags with Ogg/Vorbis and Ogg/FLAC. - * Replaygain is an action, not a flag, since it can be performed individualy + * Added replygain using the appropriate tags with Ogg/Vorbis and Ogg/FLAC. + * Replaygain is an action, not a flag, since it can be performed individually in the chain of events. * debian/{rules,control}: - - Changed the target directory from tmp to abcde, to accomodate to compat + - Changed the target directory from tmp to abcde, to accommodate to compat mode 4. - Bump standards to 3.6.2.1. No changes needed. * Added "decho" as a DEBUG output for some specific debug variables. @@ -836,7 +837,7 @@ abcde 2.1.0 * EXPERIMENTAL multiple output support: + multiple output and error checking + multiple lists support - * Default output file changed to have the $track_number in the begining. + * Default output file changed to have the $track_number in the beginning. * abcde takeover. -- Jesus Climent Fri, 28 Feb 2003 @@ -935,7 +936,7 @@ abcde 1.9.8 * Now defaults to using FreeDB instead of Gracenote. Pricks. * New VAOUTPUTFORMAT variable for those who like their various artists discs named in a different format - * Accomodates the fact that OpenBSD xargs does not eat whitespace, thanks + * Accommodates the fact that OpenBSD xargs does not eat whitespace, thanks to Marcus Daniel for discovering this * New scheduler for distmp3, thanks to David Bergeron * xingmp3enc support, thanks to Brian Gannon @@ -1256,7 +1257,7 @@ cdgrab 0.7.5 If you don't want to touch your lame installation, put the following in your cdgrab.conf: "LAME=lamer" * Omits -w from cdparanoia commands - * Depends on cdparanoia-bin or cdparanoia now - this accomodates the recent + * Depends on cdparanoia-bin or cdparanoia now - this accommodates the recent cdparanoia package namechange. * Fixed a stealth-whitespace typo at line 495. Thanks go to Gregory T. Norris for tracking this down. diff --git a/debian/changelog b/debian/changelog index 2ac3a9b..2a8e6fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -306,11 +306,11 @@ abcde (2.3.99-1) unstable; urgency=low * BATCH has been split into two options: BATCHNORM which allows, by using -b, to use the -a normalize in all the files at once, and NOGAP, that by using -g, introduces the lame's --nogap extension. - * Added replygain using the appropiate tags with Ogg/Vorbis and Ogg/FLAC. - * Replaygain is an action, not a flag, since it can be performed individualy + * Added replygain using the appropriate tags with Ogg/Vorbis and Ogg/FLAC. + * Replaygain is an action, not a flag, since it can be performed individually in the chain of events. * debian/{rules,control}: - - Changed the target directory from tmp to abcde, to accomodate to compat + - Changed the target directory from tmp to abcde, to accommodate to compat mode 4. - Bump standards to 3.6.2.1. No changes needed. * Added "decho" as a DEBUG output for some specific debug variables. @@ -976,7 +976,7 @@ abcde (1.9.8-1) unstable; urgency=low * Now defaults to using FreeDB instead of Gracenote. Pricks. * New VAOUTPUTFORMAT variable for those who like their various artists discs named in a different format - * Accomodates the fact that OpenBSD xargs does not eat whitespace, thanks + * Accommodates the fact that OpenBSD xargs does not eat whitespace, thanks to Marcus Daniel for discovering this * New scheduler for distmp3, thanks to David Bergeron * xingmp3enc support, thanks to Brian Gannon @@ -1271,7 +1271,7 @@ cdgrab (0.8.1-1) unstable; urgency=low cdgrab (0.8-1) unstable; urgency=low * New Release - closes: #43579, #42997, #38325, #42971 - * Removes dependancy for now non-existant cdparanoia-bin package + * Removes dependency for now non-existent cdparanoia-bin package -- Robert Woodcock Thu, 26 Aug 1999 22:34:29 -0700 -- 2.20.1