← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to src/text/iso-639_def.h

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/text/iso-639_def.h
2
2
 * iso_lang.h: languages codes and abbreviations
3
3
 *****************************************************************************
4
4
 * Copyright (C) 1998-2004 the VideoLAN team
5
 
 * $Id: f3511c36b43242491801e4dfb5a9f5daa7998d58 $
 
5
 * $Id: ac90dc39cf4a6ddafbdb1428a5ae31d59bd5fb9f $
6
6
 *
7
7
 * This is used in iso_lang.cpp and is taken from the GNU glibc 2.2.5
8
8
 * tarball. It has been partially completed with native language names.
201
201
    { N_( "Yoruba" ),           "",            "yo", "yor", "yor" },
202
202
    { N_( "Zhuang" ),           "",            "za", "zha", "zha" },
203
203
    { N_( "Zulu" ),             "",            "zu", "zul", "zul" },
204
 
    { NULL, NULL, NULL, NULL, NULL }
 
204
 
 
205
    /* XXX psz_eng_name MUST be NULL on the last item as it is the stop condition */
 
206
    { NULL,                   NULL,            "",   "",    "" }
205
207
};
206
208