* modules/video_output/directx/directx.c,glwin32.c: revert backport of 13050 for...

[vlc] / src / misc / iso-639_def.h

diff --git a/src/misc/iso-639_def.h b/src/misc/iso-639_def.h
index cb2d951248e751e6f5b36e7e63867d79b8a79d4a..965eb3b597e42b3f320f33ea37da04bf1a641457 100644 (file)
--- a/src/misc/iso-639_def.h
+++ b/src/misc/iso-639_def.h
@@ -1,12 +1,12 @@
 /*****************************************************************************
  * iso_lang.h: languages codes and abbreviations
  *****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 1998-2004 the VideoLAN team
  * $Id$
  *
  * This is used in iso_lang.cpp and is taken from the GNU glibc 2.2.5
  * tarball. It has been partially completed with native language names.
- * Authors: Stéphane Borel <stef@via.ecp.fr>
+ * Authors: St�hane Borel <stef@via.ecp.fr>
  *          Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,9 +29,9 @@
  * If you find something missing or wrong contact <bug-glibc@gnu.org> */
 
 /* Some spellings were converted to pure ASCII:
- *  Provençal -> Provencal
- *  Volapük -> Volapuk
- *  Bokmål -> Bokmaal */
+ *  Proven�l -> Provencal
+ *  Volapk -> Volapuk
+ *  Bokm� -> Bokmaal */
 
 static const iso639_lang_t p_languages[] =
 {
@@ -140,6 +140,7 @@ static const iso639_lang_t p_languages[] =
     { N_( "Occitan (post 1500); Provencal" ), "", "oc", "oci", "oci" },
     { N_( "Oriya" ),            "",            "or", "ori", "ori" },
     { N_( "Oromo" ),            "",            "om", "orm", "orm" },
+    { N_( "On Screen Display" ),"On Screen Display", "od", "osd", "osd" },
     { N_( "Ossetian; Ossetic" ), "",           "os", "oss", "oss" },
     { N_( "Panjabi" ),          "",            "pa", "pan", "pan" },
     { N_( "Persian" ),          "",            "fa", "fas", "per" },