diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /DOCS/tech | |
parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'DOCS/tech')
-rw-r--r-- | DOCS/tech/codecs.conf.txt | 7 | ||||
-rw-r--r-- | DOCS/tech/translations.txt | 100 |
2 files changed, 70 insertions, 37 deletions
diff --git a/DOCS/tech/codecs.conf.txt b/DOCS/tech/codecs.conf.txt index 989ffa3edb..4a949d0fd5 100644 --- a/DOCS/tech/codecs.conf.txt +++ b/DOCS/tech/codecs.conf.txt @@ -89,10 +89,9 @@ The "driver" keyword associates this codec with an internal MPlayer decoder module. MPlayer has a module named "dshow" that handles data encoded by the codec. See -vfm help / -afm help for the available module list. -The "dll" keyword specifies which Win32/XAnim/Real binary module needs to be -loaded in order to handle the specific media type. This keyword is usually -only used in conjunction with the dshow, vfw, acm, xanim and real drivers since -they all manage communication with binary-only modules. +The "dll" keyword specifies which Win32/XAnim/Real/Quicktime binary +module needs to be loaded. It's also used to specify which FFmpeg codec +to load. The list of FFmpeg codecs can be found in libavcodec/allcodecs.c. The "guid" keyword identifies a 16-byte Microsoft GUID that some media files use to identify codecs. Used only for win32 dshow and DMO codecs. diff --git a/DOCS/tech/translations.txt b/DOCS/tech/translations.txt index 60555852ac..df8ac4321d 100644 --- a/DOCS/tech/translations.txt +++ b/DOCS/tech/translations.txt @@ -8,6 +8,16 @@ in order to be useful. Otherwise they quickly get outdated and become obsolete, useless cruft. That said, we would be happy if you could maintain a new documentation translation. +Experience shows that translations work best when done by teams. Not only +can the workload be shared, but there is also the chance to review the +translation. So if possible try to find more people to help out with +translating. + +Furthermore, if you take over an unmaintained translation, bring the existing +parts up-to-date before translating new ones. Outdated information is worse +than missing information. For console messages and the XML documentation, +missing parts are automatically replaced by the English versions. + Documentation related discussions happen on the MPlayer-DOCS mailing list, while documentation translation related discussions happen on the MPlayer-translations mailing list. If you want to maintain a translation @@ -21,24 +31,64 @@ http://lists.mplayerhq.hu/mailman/listinfo/mplayer-translations Send updates and patches to this mailing list or directly to the translation coordination maintainer, see DOCS/tech/MAINTAINERS for details. -Experience shows that translations work best when done by teams. Not only -can the workload be shared, but there is also the chance to review the -translation. So if possible try to find more people to help out with -translating. - -Furthermore, if you take over an unmaintained translation, bring the existing -parts up-to-date before translating new ones. Outdated information is worse -than missing information. For console messages and the XML documentation -missing parts are automatically replaced by the English versions. - Translations of MPlayer documentation consist of 3 parts in descending order of importance: +0) homepage 1) console messages (help/help_mp-XX.h) 2) man page 3) XML documentation -Please note that only doing 1) or 1) + 2) is perfectly fine. +Not all parts are available in all languages. Keeping existing parts up-to-date +should have precedence over adding newly translated content. It is perfectly +acceptable to work on only a subset of these parts, but please follow the above +order of importance nonetheless. + +Now on to some more detailed instructions... + +general: +~~~~~~~~ + +Please note that the help_mp files and the XML documentation are both encoded +in UTF-8. Editing these files in a program which uses a different encoding +will result in breaking console messages and HTML. + +Translations are for documentation what porting is for code. Many more eyes +see it and get to find mistakes. If you stumble over mistakes, inaccuracies, +clumsy wording, spelling/grammar errors or if you notice that something is +incomplete, please let us know, we'll fix it. Patches are more than welcome, +of course. Do not, however, change the translation first, please get your +update into the English version first. + +If you have Subversion write access and commit a translation update, use +something like "synced with rXXX" as first line of the commit message so +that it is possible to tell with a glance at the Subversion log or ViewVC +if the translation is outdated and which revision of the English master +file it is equivalent to. + +If you make (spelling/wording/consistency/etc) changes to a file without +adapting parts that changed in the English master file, leave the sync +tag as it is. + + +homepage: +~~~~~~~~~ + +Get the homepage from Subversion with + + svn checkout svn://svn.mplayerhq.hu/homepage/trunk/ homepage + +or browse the sources online at + +http://svn.mplayerhq.hu/homepage/trunk/ + +The homepage uses design template files that are combined with the content +files to form the final HTML pages. To build the HTML pages, type 'make' in +the root of the homepage source directory. + + +console messages: +~~~~~~~~~~~~~~~~~ You can find the latest versions of the help_mp-XX.h files in Subversion or here: @@ -55,11 +105,12 @@ TOOLS/mphelp_check.py is a small tool to check translated files. It will report conflicting arguments, strings not present in the master file and (optionally) strings missing from the translation. Running it as - mphelp_check.py help_mp-en.h help_mp-XX.h + TOOLS/mphelp_check.py help/help_mp-en.h help/help_mp-XX.h will output errors to the screen, just substitute XX with your language code. +Adding the -missing option to the command line as in - mphelp_check.py -missing help_mp-en.h help_mp-XX.h + TOOLS/mphelp_check.py -missing help/help_mp-en.h help/help_mp-XX.h will additionally print untranslated messages to the screen. @@ -79,26 +130,9 @@ to the file header, replacing XXX with the revision of help_mp-en.h that your translation is in sync with. This way we can easily tell if the translation is up to date or not. -Please note that the help_mp files and the XML documentation are both encoded -in UTF-8. Editing these files in a program which uses a different encoding -will result in breaking console messages and HTML. - -Translations are for documentation what porting is for code. Many more eyes -see it and get to find mistakes. If you stumble over mistakes, inaccuracies, -clumsy wording, spelling/grammar errors or if you notice that something is -incomplete, please let us know, we'll fix it. Patches are more than welcome, -of course. Do not, however, change the translation first, please get your -update into the English version first. - -If you have Subversion write access and commit a translation update file, -use something like "synced with rXXX" as first line of the commit message -so that it is possible to tell with a glance at the Subversion log or ViewVC -if the translation is outdated and which revision of the English master file -it is equivalent to. -If you make (spelling/wording/consistency/etc) changes to a file without -adapting parts that changed in the English master file, leave the sync -tag as it is. +XML documentation: +~~~~~~~~~~~~~~~~~~ If you make changes to the XML documentation, doublecheck that the -documentation still builds by running make. +documentation still builds by running 'make' in the DOCS/xml/ subdirectory. |