summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Klauer <ulrich@chirlu.de>2013-05-26 22:53:43 +0200
committerErik de Castro Lopo <erikd@mega-nerd.com>2013-05-27 18:08:57 +1000
commitcd4ddabe0fa956d1266d4bc433f879840b3d1c28 (patch)
tree83680b0e5bdfd1557d281e553fe7a0fd27866bc4
parent5999d81f0ea9f2ccda7e06be70e0ab6db43a3615 (diff)
downloadflac-cd4ddabe0fa956d1266d4bc433f879840b3d1c28.tar.gz
Language fix: "difference licenses"
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
-rw-r--r--AUTHORS2
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.deps2
-rw-r--r--Makefile.lite2
-rw-r--r--README2
-rw-r--r--build/Makefile.am2
-rw-r--r--build/compile.mk2
-rw-r--r--build/config.mk2
-rw-r--r--build/exe.mk2
-rw-r--r--build/lib.mk2
-rw-r--r--configure.ac2
-rw-r--r--doc/html/Makefile.am2
-rw-r--r--doc/html/images/Makefile.am2
-rw-r--r--doc/html/images/hw/Makefile.am2
-rw-r--r--doc/html/ru/Makefile.am2
-rw-r--r--examples/Makefile.am2
-rw-r--r--examples/Makefile.lite2
-rw-r--r--examples/c/Makefile.am2
-rw-r--r--examples/c/decode/Makefile.am2
-rw-r--r--examples/c/encode/Makefile.am2
-rw-r--r--examples/cpp/Makefile.am2
-rw-r--r--examples/cpp/decode/Makefile.am2
-rw-r--r--examples/cpp/encode/Makefile.am2
-rw-r--r--include/Makefile.am2
-rw-r--r--m4/Makefile.am2
-rw-r--r--objs/Makefile.am2
-rw-r--r--objs/debug/Makefile.am2
-rw-r--r--objs/debug/bin/Makefile.am2
-rw-r--r--objs/debug/lib/Makefile.am2
-rw-r--r--objs/release/Makefile.am2
-rw-r--r--objs/release/bin/Makefile.am2
-rw-r--r--objs/release/lib/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.lite2
-rw-r--r--src/monkeys_audio_utilities/Makefile.am2
-rw-r--r--src/share/Makefile.am2
-rw-r--r--src/share/Makefile.lite2
-rw-r--r--src/share/utf8/Makefile.am2
-rw-r--r--src/test_grabbag/Makefile.am2
-rw-r--r--src/utils/Makefile.am2
-rw-r--r--test/Makefile.am2
-rw-r--r--test/Makefile.lite2
-rw-r--r--test/cuesheets/Makefile.am2
-rw-r--r--test/flac-to-flac-metadata-test-files/Makefile.am2
-rw-r--r--test/metaflac-test-files/Makefile.am2
-rw-r--r--test/pictures/Makefile.am2
-rwxr-xr-xtest/test_bins.sh2
-rwxr-xr-xtest/test_compression.sh2
-rwxr-xr-xtest/test_flac.sh2
-rwxr-xr-xtest/test_grabbag.sh2
-rwxr-xr-xtest/test_libFLAC++.sh2
-rwxr-xr-xtest/test_libFLAC.sh2
-rwxr-xr-xtest/test_metaflac.sh2
-rwxr-xr-xtest/test_seeking.sh2
-rwxr-xr-xtest/test_streams.sh2
55 files changed, 55 insertions, 55 deletions
diff --git a/AUTHORS b/AUTHORS
index fb35d241..fe3d3b4a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,7 +3,7 @@
* Copyright (C) 2011-2013 Xiph.Org Foundation
*
* This file is part the FLAC project. FLAC is comprised of several
- * components distributed under difference licenses. The codec libraries
+ * components distributed under different licenses. The codec libraries
* are distributed under Xiph.Org's BSD-like license (see the file
* COPYING.Xiph in this distribution). All other programs, libraries, and
* plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/Makefile.am b/Makefile.am
index 5de85df6..451921da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/Makefile.deps b/Makefile.deps
index 8fc53524..a3e2d39b 100644
--- a/Makefile.deps
+++ b/Makefile.deps
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/Makefile.lite b/Makefile.lite
index 83927f64..29b34ad2 100644
--- a/Makefile.lite
+++ b/Makefile.lite
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/README b/README
index c751da2f..3d0d4d44 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@
* Copyright (C) 2011-2013 Xiph.Org Foundation
*
* This file is part the FLAC project. FLAC is comprised of several
- * components distributed under difference licenses. The codec libraries
+ * components distributed under different licenses. The codec libraries
* are distributed under Xiph.Org's BSD-like license (see the file
* COPYING.Xiph in this distribution). All other programs, libraries, and
* plugins are distributed under the LGPL or GPL (see COPYING.LGPL and
diff --git a/build/Makefile.am b/build/Makefile.am
index bc0048bb..1db1db44 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/build/compile.mk b/build/compile.mk
index d5cb9d5c..205cb304 100644
--- a/build/compile.mk
+++ b/build/compile.mk
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/build/config.mk b/build/config.mk
index 6d1d1d8f..64161935 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/build/exe.mk b/build/exe.mk
index 0fe610f2..8c52f8a8 100644
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/build/lib.mk b/build/lib.mk
index af20aec7..d5645b7f 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/configure.ac b/configure.ac
index 2f3824cf..50ef80e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index 823b0a93..e8e5589b 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/doc/html/images/Makefile.am b/doc/html/images/Makefile.am
index 02e94070..37a77f85 100644
--- a/doc/html/images/Makefile.am
+++ b/doc/html/images/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/doc/html/images/hw/Makefile.am b/doc/html/images/hw/Makefile.am
index 65a0c7e3..489dd433 100644
--- a/doc/html/images/hw/Makefile.am
+++ b/doc/html/images/hw/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/doc/html/ru/Makefile.am b/doc/html/ru/Makefile.am
index 6ddea330..9483583d 100644
--- a/doc/html/ru/Makefile.am
+++ b/doc/html/ru/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 454cc675..57ece139 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/examples/Makefile.lite b/examples/Makefile.lite
index d941de7b..3c62a960 100644
--- a/examples/Makefile.lite
+++ b/examples/Makefile.lite
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
index a7a20fa5..318570c7 100644
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/examples/c/decode/Makefile.am b/examples/c/decode/Makefile.am
index 93ff3147..917ead4c 100644
--- a/examples/c/decode/Makefile.am
+++ b/examples/c/decode/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/examples/c/encode/Makefile.am b/examples/c/encode/Makefile.am
index 93ff3147..917ead4c 100644
--- a/examples/c/encode/Makefile.am
+++ b/examples/c/encode/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index a7a20fa5..318570c7 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/examples/cpp/decode/Makefile.am b/examples/cpp/decode/Makefile.am
index 93ff3147..917ead4c 100644
--- a/examples/cpp/decode/Makefile.am
+++ b/examples/cpp/decode/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/examples/cpp/encode/Makefile.am b/examples/cpp/encode/Makefile.am
index 93ff3147..917ead4c 100644
--- a/examples/cpp/encode/Makefile.am
+++ b/examples/cpp/encode/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/include/Makefile.am b/include/Makefile.am
index 9c8c780f..79d94f08 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/m4/Makefile.am b/m4/Makefile.am
index a16211ca..b9d24dbd 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/objs/Makefile.am b/objs/Makefile.am
index 1a26778f..5a30696d 100644
--- a/objs/Makefile.am
+++ b/objs/Makefile.am
@@ -2,7 +2,7 @@
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/objs/debug/Makefile.am b/objs/debug/Makefile.am
index 1974c41c..cd8c26f1 100644
--- a/objs/debug/Makefile.am
+++ b/objs/debug/Makefile.am
@@ -2,7 +2,7 @@
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/objs/debug/bin/Makefile.am b/objs/debug/bin/Makefile.am
index 1092f939..c0a1ea65 100644
--- a/objs/debug/bin/Makefile.am
+++ b/objs/debug/bin/Makefile.am
@@ -2,7 +2,7 @@
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/objs/debug/lib/Makefile.am b/objs/debug/lib/Makefile.am
index 1092f939..c0a1ea65 100644
--- a/objs/debug/lib/Makefile.am
+++ b/objs/debug/lib/Makefile.am
@@ -2,7 +2,7 @@
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/objs/release/Makefile.am b/objs/release/Makefile.am
index 1974c41c..cd8c26f1 100644
--- a/objs/release/Makefile.am
+++ b/objs/release/Makefile.am
@@ -2,7 +2,7 @@
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/objs/release/bin/Makefile.am b/objs/release/bin/Makefile.am
index 1092f939..c0a1ea65 100644
--- a/objs/release/bin/Makefile.am
+++ b/objs/release/bin/Makefile.am
@@ -2,7 +2,7 @@
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/objs/release/lib/Makefile.am b/objs/release/lib/Makefile.am
index 1092f939..c0a1ea65 100644
--- a/objs/release/lib/Makefile.am
+++ b/objs/release/lib/Makefile.am
@@ -2,7 +2,7 @@
# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/src/Makefile.am b/src/Makefile.am
index a6ce4133..2bd7981e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/src/Makefile.lite b/src/Makefile.lite
index 0f149fc3..3027e6f9 100644
--- a/src/Makefile.lite
+++ b/src/Makefile.lite
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/src/monkeys_audio_utilities/Makefile.am b/src/monkeys_audio_utilities/Makefile.am
index 1c01e151..5a0156e7 100644
--- a/src/monkeys_audio_utilities/Makefile.am
+++ b/src/monkeys_audio_utilities/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index 47318cf7..4abaac91 100644
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/src/share/Makefile.lite b/src/share/Makefile.lite
index 9bc89b9f..a9b56408 100644
--- a/src/share/Makefile.lite
+++ b/src/share/Makefile.lite
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/src/share/utf8/Makefile.am b/src/share/utf8/Makefile.am
index 9c57f1b2..cda7dc50 100644
--- a/src/share/utf8/Makefile.am
+++ b/src/share/utf8/Makefile.am
@@ -2,7 +2,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/src/test_grabbag/Makefile.am b/src/test_grabbag/Makefile.am
index 169e9cc8..faf6590b 100644
--- a/src/test_grabbag/Makefile.am
+++ b/src/test_grabbag/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index c323c876..45daadc5 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/Makefile.am b/test/Makefile.am
index dbe5d0d0..b71eec2c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/Makefile.lite b/test/Makefile.lite
index 487179cd..7f3f83cf 100644
--- a/test/Makefile.lite
+++ b/test/Makefile.lite
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/cuesheets/Makefile.am b/test/cuesheets/Makefile.am
index f3df81b9..5d6a7706 100644
--- a/test/cuesheets/Makefile.am
+++ b/test/cuesheets/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/flac-to-flac-metadata-test-files/Makefile.am b/test/flac-to-flac-metadata-test-files/Makefile.am
index 4d6c9651..74f847ec 100644
--- a/test/flac-to-flac-metadata-test-files/Makefile.am
+++ b/test/flac-to-flac-metadata-test-files/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/metaflac-test-files/Makefile.am b/test/metaflac-test-files/Makefile.am
index a3835a3c..900f4947 100644
--- a/test/metaflac-test-files/Makefile.am
+++ b/test/metaflac-test-files/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/pictures/Makefile.am b/test/pictures/Makefile.am
index e4f6a18a..53a83ca9 100644
--- a/test/pictures/Makefile.am
+++ b/test/pictures/Makefile.am
@@ -3,7 +3,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_bins.sh b/test/test_bins.sh
index 68e47c72..a345b6eb 100755
--- a/test/test_bins.sh
+++ b/test/test_bins.sh
@@ -5,7 +5,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_compression.sh b/test/test_compression.sh
index b3a200c4..073f4411 100755
--- a/test/test_compression.sh
+++ b/test/test_compression.sh
@@ -4,7 +4,7 @@
# Copyright (C) 2012 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_flac.sh b/test/test_flac.sh
index 29d8ddcf..662262c1 100755
--- a/test/test_flac.sh
+++ b/test/test_flac.sh
@@ -5,7 +5,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_grabbag.sh b/test/test_grabbag.sh
index bc7d776c..2d2faed6 100755
--- a/test/test_grabbag.sh
+++ b/test/test_grabbag.sh
@@ -5,7 +5,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_libFLAC++.sh b/test/test_libFLAC++.sh
index 7ecf5ee8..faa6203b 100755
--- a/test/test_libFLAC++.sh
+++ b/test/test_libFLAC++.sh
@@ -5,7 +5,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_libFLAC.sh b/test/test_libFLAC.sh
index 9af76b8c..1be373dd 100755
--- a/test/test_libFLAC.sh
+++ b/test/test_libFLAC.sh
@@ -5,7 +5,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_metaflac.sh b/test/test_metaflac.sh
index 85ef006a..86970a6d 100755
--- a/test/test_metaflac.sh
+++ b/test/test_metaflac.sh
@@ -5,7 +5,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_seeking.sh b/test/test_seeking.sh
index d33ef2a6..ce76de07 100755
--- a/test/test_seeking.sh
+++ b/test/test_seeking.sh
@@ -5,7 +5,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
diff --git a/test/test_streams.sh b/test/test_streams.sh
index 1fff1e40..78497820 100755
--- a/test/test_streams.sh
+++ b/test/test_streams.sh
@@ -5,7 +5,7 @@
# Copyright (C) 2011-2013 Xiph.Org Foundation
#
# This file is part the FLAC project. FLAC is comprised of several
-# components distributed under difference licenses. The codec libraries
+# components distributed under different licenses. The codec libraries
# are distributed under Xiph.Org's BSD-like license (see the file
# COPYING.Xiph in this distribution). All other programs, libraries, and
# plugins are distributed under the GPL (see COPYING.GPL). The documentation