From cd4ddabe0fa956d1266d4bc433f879840b3d1c28 Mon Sep 17 00:00:00 2001 From: Ulrich Klauer Date: Sun, 26 May 2013 22:53:43 +0200 Subject: [PATCH] Language fix: "difference licenses" Signed-off-by: Erik de Castro Lopo --- AUTHORS | 2 +- Makefile.am | 2 +- Makefile.deps | 2 +- Makefile.lite | 2 +- README | 2 +- build/Makefile.am | 2 +- build/compile.mk | 2 +- build/config.mk | 2 +- build/exe.mk | 2 +- build/lib.mk | 2 +- configure.ac | 2 +- doc/html/Makefile.am | 2 +- doc/html/images/Makefile.am | 2 +- doc/html/images/hw/Makefile.am | 2 +- doc/html/ru/Makefile.am | 2 +- examples/Makefile.am | 2 +- examples/Makefile.lite | 2 +- examples/c/Makefile.am | 2 +- examples/c/decode/Makefile.am | 2 +- examples/c/encode/Makefile.am | 2 +- examples/cpp/Makefile.am | 2 +- examples/cpp/decode/Makefile.am | 2 +- examples/cpp/encode/Makefile.am | 2 +- include/Makefile.am | 2 +- m4/Makefile.am | 2 +- objs/Makefile.am | 2 +- objs/debug/Makefile.am | 2 +- objs/debug/bin/Makefile.am | 2 +- objs/debug/lib/Makefile.am | 2 +- objs/release/Makefile.am | 2 +- objs/release/bin/Makefile.am | 2 +- objs/release/lib/Makefile.am | 2 +- src/Makefile.am | 2 +- src/Makefile.lite | 2 +- src/monkeys_audio_utilities/Makefile.am | 2 +- src/share/Makefile.am | 2 +- src/share/Makefile.lite | 2 +- src/share/utf8/Makefile.am | 2 +- src/test_grabbag/Makefile.am | 2 +- src/utils/Makefile.am | 2 +- test/Makefile.am | 2 +- test/Makefile.lite | 2 +- test/cuesheets/Makefile.am | 2 +- test/flac-to-flac-metadata-test-files/Makefile.am | 2 +- test/metaflac-test-files/Makefile.am | 2 +- test/pictures/Makefile.am | 2 +- test/test_bins.sh | 2 +- test/test_compression.sh | 2 +- test/test_flac.sh | 2 +- test/test_grabbag.sh | 2 +- test/test_libFLAC++.sh | 2 +- test/test_libFLAC.sh | 2 +- test/test_metaflac.sh | 2 +- test/test_seeking.sh | 2 +- test/test_streams.sh | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/AUTHORS b/AUTHORS index fb35d24..fe3d3b4 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 5de85df..451921d 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 8fc5352..a3e2d39 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 83927f6..29b34ad 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 c751da2..3d0d4d4 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 bc0048b..1db1db4 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 d5cb9d5..205cb30 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 6d1d1d8..6416193 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 0fe610f..8c52f8a 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 af20aec..d5645b7 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 2f3824c..50ef80e 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 823b0a9..e8e5589 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 02e9407..37a77f8 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 65a0c7e..489dd43 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 6ddea33..9483583 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 454cc67..57ece13 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 d941de7..3c62a96 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 a7a20fa..318570c 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 93ff314..917ead4 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 93ff314..917ead4 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 a7a20fa..318570c 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 93ff314..917ead4 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 93ff314..917ead4 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 9c8c780..79d94f0 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 a16211c..b9d24db 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 1a26778..5a30696 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 1974c41..cd8c26f 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 1092f93..c0a1ea6 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 1092f93..c0a1ea6 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 1974c41..cd8c26f 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 1092f93..c0a1ea6 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 1092f93..c0a1ea6 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 a6ce413..2bd7981 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 0f149fc..3027e6f 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 1c01e15..5a0156e 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 47318cf..4abaac9 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 9bc89b9..a9b5640 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 9c57f1b..cda7dc5 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 169e9cc..faf6590 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 c323c87..45daadc 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 dbe5d0d..b71eec2 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 487179c..7f3f83c 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 f3df81b..5d6a770 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 4d6c965..74f847e 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 a3835a3..900f494 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 e4f6a18..53a83ca 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 68e47c7..a345b6e 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 b3a200c..073f441 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 29d8ddc..662262c 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 bc7d776..2d2faed 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 7ecf5ee..faa6203 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 9af76b8..1be373d 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 85ef006..86970a6 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 d33ef2a..ce76de0 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 1fff1e4..7849782 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 -- 2.7.4