summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog2
-rw-r--r--Copyright6
-rw-r--r--DOCS/tech/MAINTAINERS28
-rw-r--r--DOCS/tech/encoding-tips.txt6
-rw-r--r--TOOLS/README12
-rw-r--r--drivers/mga_vid.c2
-rw-r--r--gui/mplayer/gtk/menu.c8
-rw-r--r--libao2/ao_jack.c6
-rw-r--r--libao2/ao_nas.c2
-rw-r--r--libao2/ao_openal.c4
-rw-r--r--libao2/ao_sdl.c2
-rw-r--r--libmpcodecs/ad_hwac3.c2
-rw-r--r--libmpcodecs/ad_mpc.c4
-rw-r--r--loader/pe_image.c2
-rw-r--r--stream/stream_cddb.c2
-rw-r--r--vidix/cyberblade_vid.c2
-rw-r--r--vidix/dha.c2
-rw-r--r--vidix/pci.c2
-rw-r--r--vidix/pm2_vid.c4
-rw-r--r--vidix/pm3_vid.c4
20 files changed, 51 insertions, 51 deletions
diff --git a/Changelog b/Changelog
index 6efdb00b53..4b54e964a8 100644
--- a/Changelog
+++ b/Changelog
@@ -2312,7 +2312,7 @@ MPlayer v0.11-pre16: Feb 4, 2001
at low bitrates (usually used for ASF files with DivX audio)
Input and output buffer sizes are now queryed, problem solved :)
- SDL support compiling hint by Michael Durller added to the FAQ
- - opendivx support in ASF files [Grard Lantau]
+ - opendivx support in ASF files [Gérard Lantau]
- ./configure & Makefiles patch by Aaron Hope applied.
(adds --with-win32libdir and fixes --with-x11libdir)
- ./configure fixed, now it defaults to /usr/lib/win32 if detection failed
diff --git a/Copyright b/Copyright
index eb9ba8cfa5..a697be3222 100644
--- a/Copyright
+++ b/Copyright
@@ -1,4 +1,4 @@
-MPlayer was originally written by rpd Gereffy and has been extended and
+MPlayer was originally written by Árpád Gereöffy and has been extended and
worked on by many more since then, see the AUTHORS file for an (incomplete)
list. You are free to use it under the terms of the GNU General Public License,
as described in the LICENSE file.
@@ -56,8 +56,8 @@ Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com>
1999 Christian Wolff for convergence integrated media
2000-2001 Billy Biggs <vektor@dumbterm.net>,
2001-2002 Samuel Hocevar <sam@zoy.org>,
- 2000-2003 Bjrn Englund <d4bjorn@dtek.chalmers.se>,
- 2000-2003 Hkan Hjort <d95hjort@dtek.chalmers.se>
+ 2000-2003 Björn Englund <d4bjorn@dtek.chalmers.se>,
+ 2000-2003 Håkan Hjort <d95hjort@dtek.chalmers.se>
License: GNU General Public License
Name: libmpeg2
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 835549bef9..c79e8825d5 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -30,7 +30,7 @@ Documentation:
* MPlayer: Diego Biurrun
* MEncoder: Guillaume Poirier
* man page: Diego Biurrun
- * translation coordination: Sebastian Krmer
+ * translation coordination: Sebastian Krämer
* input layer, LIRC, slave mode docs: Alban Bedel
* tech/* docs: None
* tech/* documentation docs: Diego Biurrun
@@ -38,7 +38,7 @@ Documentation:
Man page translations:
* Czech: Jiri Heryan
* French: Guillaume Poirier
- * German: Sebastian Krmer
+ * German: Sebastian Krämer
* Hungarian: Gabor Mizda
* Italian: Daniele Forghieri
* Polish: Waclaw Schiller
@@ -50,7 +50,7 @@ Man page translations:
Documentation translations:
* Czech: Jiri Heryan
* French: Guillaume Poirier
- * German: Sebastian Krmer
+ * German: Sebastian Krämer
* Hungarian: Gabor Mizda
* Italian: Paolo Tresoldi
* Polish: Waclaw Schiller
@@ -65,7 +65,7 @@ Platforms/ports:
* FreeBSD: Vladimir Kushnir, Nexus
* BSD/OS: Steven Schultz
* NetBSD: Bernd Ernesti
- * OpenBSD: Bjrn Sandell
+ * OpenBSD: Björn Sandell
* Solaris: Derek Lewis
* Win32/Cygwin/MinGW: Sascha Sommer, Joey Parrish, Diego Biurrun
* Mac OS X: Nicolas Plourde
@@ -113,8 +113,8 @@ demuxers:
* demux_realaud.c - Roberto Togni
* demux_rtp* - Ross Finlayson
* demux_mpg and demux_ts - Nico Sabbi
- * demux_mpc.c - Reimar Dffinger
- * demux_nuv.c - Reimar Dffinger
+ * demux_mpc.c - Reimar Döffinger
+ * demux_nuv.c - Reimar Döffinger
muxers:
* muxer_lavf.c - Michael Niedermayer
@@ -134,7 +134,7 @@ codec support:
* FFmpeg: Michael Niedermayer
* XviD: Ivan Kalvachev
* x264: Loren Merritt
- * musepack, speex: Reimar Dffinger
+ * musepack, speex: Reimar Döffinger
video filters:
* general: Richard Felker, Michael Niedermayer
@@ -159,7 +159,7 @@ libvo drivers:
* vo_bl.c - Rik Snel
* vo_cvidix.c - Sascha Sommer
* vo_dga.c - None
- * vo_dfbmga.c - Ville Syrjl
+ * vo_dfbmga.c - Ville Syrjälä
* vo_directfb[2].c - Jiri Svoboda
* vo_directx.c - Sascha Sommer
* vo_dxr2.c - Alban Bedel
@@ -168,8 +168,8 @@ libvo drivers:
* vo_fbdev2.c - Joey Parrish
* vo_ggi.c - Christoph Egger
* vo_gif89a.c - Joey Parrish
- * vo_gl.c - Reimar Dffinger
- * vo_gl2.c - Reimar Dffinger
+ * vo_gl.c - Reimar Döffinger
+ * vo_gl2.c - Reimar Döffinger
* vo_ivtv.c - Benjamin Zores
* vo_jpeg.c - Ivo van Poorten
* vo_macosx.m - Nicolas Plourde
@@ -177,10 +177,10 @@ libvo drivers:
* vo_mga.c - Attila Kinali
* vo_mpegpes.c - None
* vo_null.c - None
- * vo_png.c - Felix Bnemann
+ * vo_png.c - Felix Bünemann
* vo_pnm.c - Ivo van Poorten
* vo_quartz.c - Nicolas Plourde
- * vo_sdl.c - Felix Bnemann
+ * vo_sdl.c - Felix Bünemann
* vo_svga.c - Ivan Kalvachev
* vo_tdfxfb.c - Alban Bedel
* vo_tga.c - Daniele Forghieri
@@ -197,7 +197,7 @@ libvo drivers:
* vo_zr2.c - Rik Snel
* x11_common.c - Alexander Strasser
- * w32_common.c - Reimar Dffinger
+ * w32_common.c - Reimar Döffinger
libao2 drivers:
* ao_alsa5.c - None
@@ -207,7 +207,7 @@ libao2 drivers:
* ao_dxr2.c - None
* ao_esd.c - None
* ao_ivtv.c - Benjamin Zores
- * ao_jack.c - Reimar Dffinger
+ * ao_jack.c - Reimar Döffinger
* ao_mpegpes.c - None
* ao_nas.c - Tobias Diedrich
* ao_null.c - None
diff --git a/DOCS/tech/encoding-tips.txt b/DOCS/tech/encoding-tips.txt
index baf866e715..ed85d65186 100644
--- a/DOCS/tech/encoding-tips.txt
+++ b/DOCS/tech/encoding-tips.txt
@@ -342,7 +342,7 @@ In my experience, don't try to go below a width of 576 without closely
watching what's going on.
--
-Rmi
+Rémi
===========
TIPS FOR ENCODING
@@ -602,7 +602,7 @@ done
(and yes, I've a DVD with 12 subtitles)
--
-Rmi
+Rémi
================================================================================
@@ -644,7 +644,7 @@ a red/yellow cloud (explosion, cloud of fire). But may not with a grey and
very fuzzy cloud like in the chocolat scene. Note that I don't know exactly
why ;)
-A = Rmi
+A = Rémi
================================================================================
diff --git a/TOOLS/README b/TOOLS/README
index d8463a6a72..b783b89460 100644
--- a/TOOLS/README
+++ b/TOOLS/README
@@ -18,7 +18,7 @@ MPlayer scripts in the TOOLS dir
edgedetect.fp, emboss.fp
-Author: Reimar Dffinger
+Author: Reimar Döffinger
Description: Examples of custom fragment program for OpenGL video out driver
@@ -47,7 +47,7 @@ Usage: mpconsole [mplayer options]
mplmult.sh
-Author: Reimar Dffinger
+Author: Reimar Döffinger
Description: Example how to output video on multiple windows in sync. Might
be even more useful in combination with -vo ggi to distribute
@@ -103,7 +103,7 @@ Usage: divx2svcd <input_avi> [options]
mencvcd
-Author: Jrgen Hammelmann
+Author: Jürgen Hammelmann
Description: Converts DVD (or anything else that MPlayer plays) to (S)VCD
@@ -349,7 +349,7 @@ Note: Compares MPlayer translation files against a master file and
cpuinfo
-Author: Jrgen Keil
+Author: Jürgen Keil
Description: the prototype ../cpuinfo.c
@@ -365,7 +365,7 @@ Description: MPEG4-ES stream inspector, dumps the stream startcodes.
fastmemcpybench
-Author: Felix Bnemann
+Author: Felix Bünemann
Description: benchmark/testbed for fastmemcpy stuff
@@ -442,7 +442,7 @@ Usage: install-w32codecs.sh install
vobshift.py
-Author: Gbor Farkas
+Author: Gábor Farkas
Description: Adjust the time-info in vobsub files
diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c
index ffc12bf3fe..36d4c7fa31 100644
--- a/drivers/mga_vid.c
+++ b/drivers/mga_vid.c
@@ -1147,7 +1147,7 @@ static void mga_handle_irq(int irq, void *dev_id, struct pt_regs *pregs) {
#ifdef CRTC2
// sem pridat vyber obrazku !!!!
-// i han echt kei ahnig was das obe heisse sll
+// i han echt kei ahnig was das obe heisse söll
crtc2_frame_sel(card->next_frame);
#endif
diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c
index fc8e38c2ce..2a75dbd7e8 100644
--- a/gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
@@ -292,10 +292,10 @@ static Languages_t Languages[] =
{ lng( 'n','e' ), "Nepali" },
{ lng( 's','e' ), "NorthernSami" },
{ lng( 'n','o' ), "Norwegian" },
- { lng( 'n','b' ), "NorwegianBokml" },
+ { lng( 'n','b' ), "NorwegianBokmål" },
{ lng( 'n','n' ), "NorwegianNynorsk" },
{ lng( 'n','y' ), "Nyanja;Chichewa" },
- { lng( 'o','c' ), "Occitan(post1500;Provenal" },
+ { lng( 'o','c' ), "Occitan(post1500;Provençal" },
{ lng( 'o','r' ), "Oriya" },
{ lng( 'o','m' ), "Oromo" },
{ lng( 'o','s' ), "Ossetian;Ossetic" },
@@ -304,7 +304,7 @@ static Languages_t Languages[] =
{ lng( 'f','a' ), "Persian" },
{ lng( 'p','l' ), "Polish" },
{ lng( 'p','t' ), "Portuguese" },
- { lng( 'o','c' ), "Provenal;Occitan(post1500" },
+ { lng( 'o','c' ), "Provençal;Occitan(post1500" },
{ lng( 'p','s' ), "Pushto" },
{ lng( 'q','u' ), "Quechua" },
{ lng( 'r','m' ), "Raeto-Romance" },
@@ -348,7 +348,7 @@ static Languages_t Languages[] =
{ lng( 'u','r' ), "Urdu" },
{ lng( 'u','z' ), "Uzbek" },
{ lng( 'v','i' ), "Vietnamese" },
- { lng( 'v','o' ), "Volapk" },
+ { lng( 'v','o' ), "Volapük" },
{ lng( 'c','y' ), "Welsh" },
{ lng( 'w','o' ), "Wolof" },
{ lng( 'x','h' ), "Xhosa" },
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c
index 1e9dbff8c8..6860810249 100644
--- a/libao2/ao_jack.c
+++ b/libao2/ao_jack.c
@@ -4,8 +4,8 @@
* This driver is under the same license as MPlayer.
* (http://www.mplayerhq.hu)
*
- * Copyleft 2001 by Felix Bnemann (atmosfear@users.sf.net)
- * and Reimar Dffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de)
+ * Copyleft 2001 by Felix Bünemann (atmosfear@users.sf.net)
+ * and Reimar Döffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de)
*/
#include <stdio.h>
@@ -31,7 +31,7 @@ static ao_info_t info =
{
"JACK audio output",
"jack",
- "Reimar Dffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>",
+ "Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>",
"based on ao_sdl.c"
};
diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c
index 0ef32ab7f6..4888cfc366 100644
--- a/libao2/ao_nas.c
+++ b/libao2/ao_nas.c
@@ -6,7 +6,7 @@
*
* xmms plugin by Willem Monsuwe
* adapted for libaudiooss by Jon Trulson
- * further modified by Erik Inge Bols
+ * further modified by Erik Inge Bolsø
* largely rewritten and used for this
* plugin by Tobias Diedrich
*
diff --git a/libao2/ao_openal.c b/libao2/ao_openal.c
index 9319a5f005..d9509c0eb6 100644
--- a/libao2/ao_openal.c
+++ b/libao2/ao_openal.c
@@ -4,7 +4,7 @@
* This driver is under the same license as MPlayer.
* (http://www.mplayerhq.hu)
*
- * Copyleft 2006 by Reimar Dffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de)
+ * Copyleft 2006 by Reimar Döffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de)
*/
#include "config.h"
@@ -33,7 +33,7 @@ static ao_info_t info =
{
"OpenAL audio output",
"openal",
- "Reimar Dffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>",
+ "Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>",
""
};
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 0da9bb338f..d46e4fa9bd 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -4,7 +4,7 @@
* This driver is under the same license as MPlayer.
* (http://www.mplayerhq.hu)
*
- * Copyleft 2001 by Felix Bnemann (atmosfear@users.sf.net)
+ * Copyleft 2001 by Felix Bünemann (atmosfear@users.sf.net)
*
* Thanks to Arpi for nice ringbuffer-code!
*
diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c
index 229d5593af..268b55a6e6 100644
--- a/libmpcodecs/ad_hwac3.c
+++ b/libmpcodecs/ad_hwac3.c
@@ -28,7 +28,7 @@ static ad_info_t info =
{
"AC3/DTS pass-through S/PDIF",
"hwac3",
- "Nick Kurshev/Peter Schller",
+ "Nick Kurshev/Peter Schüller",
"???",
""
};
diff --git a/libmpcodecs/ad_mpc.c b/libmpcodecs/ad_mpc.c
index 435a6cb0e5..97ffdfed44 100644
--- a/libmpcodecs/ad_mpc.c
+++ b/libmpcodecs/ad_mpc.c
@@ -1,7 +1,7 @@
/**
* Musepack audio files decoder for MPlayer
* by Reza Jelveh <reza.jelveh@tuhh.de> and
- * Reimar Dffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>
+ * Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>
* License: GPL
* This code may be be relicensed under the terms of the GNU LGPL when it
* becomes part of the FFmpeg project (ffmpeg.org)
@@ -20,7 +20,7 @@ static ad_info_t info =
{
"Musepack audio decoder",
"mpcdec",
- "Reza Jelveh and Reimar Dffinger",
+ "Reza Jelveh and Reimar Döffinger",
"",
""
};
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 3894a10317..225d0146f0 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -1,6 +1,6 @@
/*
* Copyright 1994 Eric Youndale & Erik Bos
- * Copyright 1995 Martin von Lwis
+ * Copyright 1995 Martin von Löwis
* Copyright 1996-98 Marcus Meissner
*
* based on Eric Youndale's pe-test and:
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index 1679651bb0..b74ae48873 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -595,7 +595,7 @@ cddb_create_hello(cddb_data_t *cddb_data) {
char *user_name;
if( cddb_data->anonymous ) { // Default is anonymous
- /* Note from Eduardo Prez Ureta <eperez@it.uc3m.es> :
+ /* Note from Eduardo Pérez Ureta <eperez@it.uc3m.es> :
* We don't send current user/host name in hello to prevent spam.
* Software that sends this is considered spyware
* that most people don't like.
diff --git a/vidix/cyberblade_vid.c b/vidix/cyberblade_vid.c
index 2e56cb8d09..7ba20d819e 100644
--- a/vidix/cyberblade_vid.c
+++ b/vidix/cyberblade_vid.c
@@ -19,7 +19,7 @@
* along with MPlayer; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * Based on Permedia 3 driver by Mns Rullgrd
+ * Based on Permedia 3 driver by Måns Rullgård
* Thanks to Gilles Frattini for bugfixes.
*
* Changes:
diff --git a/vidix/dha.c b/vidix/dha.c
index 28011cb1a2..6d14816568 100644
--- a/vidix/dha.c
+++ b/vidix/dha.c
@@ -20,7 +20,7 @@
*
* 1996/10/27 - Robin Cutshaw (robin@xfree86.org)
* XFree86 3.3.3 implementation
- * 1999 - yvind Aabling.
+ * 1999 - Øyvind Aabling.
* Modified for GATOS/win/gfxdump.
*
* 2002 - library implementation by Nick Kurshev
diff --git a/vidix/pci.c b/vidix/pci.c
index b1067876f0..5f1e0343c3 100644
--- a/vidix/pci.c
+++ b/vidix/pci.c
@@ -1,6 +1,6 @@
/*
(C) 2002 - library implementation by Nick Kyrshev
- XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by yvind Aabling.
+ XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling.
*/
/* $XConsortium: scanpci.c /main/25 1996/10/27 11:48:40 kaleb $ */
/*
diff --git a/vidix/pm2_vid.c b/vidix/pm2_vid.c
index 262685fe88..d1f5de0e58 100644
--- a/vidix/pm2_vid.c
+++ b/vidix/pm2_vid.c
@@ -1,6 +1,6 @@
/*
* VIDIX driver for 3DLabs Permedia 2 chipsets.
- * Copyright (C) 2002 Mns Rullgrd
+ * Copyright (C) 2002 Måns Rullgård
*
* This file is part of MPlayer.
*
@@ -63,7 +63,7 @@ static int pm2_vidmem = PM2_VIDMEM;
static vidix_capability_t pm2_cap =
{
"3DLabs Permedia2 driver",
- "Mns Rullgrd <mru@users.sf.net>",
+ "Måns Rullgård <mru@users.sf.net>",
TYPE_OUTPUT,
{ 0, 0, 0, 0 },
2048,
diff --git a/vidix/pm3_vid.c b/vidix/pm3_vid.c
index 6bdfd33e57..b67e167bbb 100644
--- a/vidix/pm3_vid.c
+++ b/vidix/pm3_vid.c
@@ -1,6 +1,6 @@
/*
* VIDIX driver for 3DLabs Glint R3 and Permedia 3 chipsets.
- * Copyright (C) 2002 Mns Rullgrd
+ * Copyright (C) 2002 Måns Rullgård
*
* This file is part of MPlayer.
*
@@ -52,7 +52,7 @@ static void *pm3_mem;
static vidix_capability_t pm3_cap =
{
"3DLabs GLINT R3/Permedia3 driver",
- "Mns Rullgrd <mru@users.sf.net>",
+ "Måns Rullgård <mru@users.sf.net>",
TYPE_OUTPUT,
{ 0, 0, 0, 0 },
2048,