January 2011 - MPlayer-translations

r32827 - in trunk: DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/skin/skin.c
by ib 29 Jan '11

29 Jan '11

Author: ib Date: Sat Jan 29 16:13:55 2011 New Revision: 32827 Log: Remove needless fontid. The parameter fontid isn't used anywhere. The documentation is wrong and very confusing to skin designers. Modified: trunk/DOCS/xml/de/skin.xml Changes in other areas also in this revision: Modified: trunk/DOCS/xml/en/skin.xml trunk/gui/skin/skin.c Modified: trunk/DOCS/xml/de/skin.xml ============================================================================== --- trunk/DOCS/xml/de/skin.xml Fri Jan 28 20:06:27 2011 (r32826) +++ trunk/DOCS/xml/de/skin.xml Sat Jan 29 16:13:55 2011 (r32827) @@ -547,15 +547,15 @@ end <varlistentry> <term> <literal> - <anchor id="skin-font"/>font = fontfile, fontid + <anchor id="skin-font"/>font = fontfile </literal> </term> <listitem> <para> Definiert eine Schrift. <literal>fontfile</literal> ist der Name der Schrift-Beschreibungsdatei mit der Erweiterung <filename>.fnt</filename> - (gieb hier keine Erweiterung an). - <literal>fontid</literal> wird verwendet, um auf die Schrift zu verweisen + (gib hier keine Erweiterung an) und + wird verwendet, um auf die Schrift zu verweisen (siehe <link linkend="skin-dlabel">dlabel</link> und <link linkend="skin-slabel">slabel</link>). Bis zu 25 Schriften können definiert werden. @@ -566,18 +566,18 @@ end <varlistentry> <term> <literal> - <anchor id="skin-slabel"/>slabel = X, Y, fontid, "text" + <anchor id="skin-slabel"/>slabel = X, Y, fontfile, "text" </literal> </term> <listitem> <para> Platziere ein statisches Label an Position <literal>X,Y</literal>. <literal>text</literal> wird mittels der identifizierten - <literal>fontid</literal> angezeigt. Der Text ist einfach ein + <literal>fontfile</literal> angezeigt. Der Text ist einfach ein eine Ausgangszeichenkette (<literal>$x</literal>-Variablen funktionieren nicht), eingeschlossen von doppelten Anführungszeichen (das "-Zeichen kann jedoch nicht Teil des Textes sein). - Das Label wird mittels der über die <literal>fontid</literal> identifizierten + Das Label wird mittels der über die <literal>fontfile</literal> identifizierten Schrift angezeigt. </para> </listitem> @@ -586,7 +586,7 @@ end <varlistentry> <term> <literal> - <anchor id="skin-dlabel"/>dlabel = X, Y, length, align, fontid, "text" + <anchor id="skin-dlabel"/>dlabel = X, Y, length, align, fontfile, "text" </literal> </term> <listitem> @@ -607,7 +607,7 @@ end Der anzuzeigende Text wird mit <literal>text</literal> festgelegt: Er muss zwischen doppelten Anführungszeichen stehen (das "-Zeichen kann jedoch nicht Teil des Textes sein). - Das Label wird mittels der über die <literal>fontid</literal> identifizierten + Das Label wird mittels der über die <literal>fontfile</literal> identifizierten Schrift angezeigt. Du kannst folgende Variablen im Text verwenden: </para>

1 0

r32821 - in trunk: DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/skin/font.c gui/skin/font.h
by ib 27 Jan '11

27 Jan '11

Author: ib Date: Thu Jan 27 19:04:19 2011 New Revision: 32821 Log: Allow character in the font description file to be in UTF-8. A character defined in the font description file can be either an ASCII character, any character in the range of 0x80 to 0xFF or - to avoid character set problems, and that is recommended - a character in UTF-8 encoding now. Non-ASCII characters will be stored in the nonASCIIidx array. The indices 0..127 of this array correspond to the indices 128..255 of the Fnt array. (This also settles the "Translate messages shown in the GUI window(s) from UTF-8" issue.) Modified: trunk/DOCS/xml/de/skin.xml Changes in other areas also in this revision: Modified: trunk/DOCS/xml/en/skin.xml trunk/gui/skin/font.c trunk/gui/skin/font.h Modified: trunk/DOCS/xml/de/skin.xml ============================================================================== --- trunk/DOCS/xml/de/skin.xml Thu Jan 27 18:58:58 2011 (r32820) +++ trunk/DOCS/xml/de/skin.xml Thu Jan 27 19:04:19 2011 (r32821) @@ -882,7 +882,7 @@ end <literal>char</literal>-Zeichens innerhalb der Grafik fest (<literal>0,0</literal> steht für die obere linke Ecke). <literal>width</literal> und <literal>height</literal> sind die Maße der - Zeichen in Pixel. + Zeichen in Pixel. Das Zeichen kann in UTF-8-Kodierung angegeben werden. </para> <para>

1 0

r32817 - in trunk: help/help_mp-bg.h help/help_mp-cs.h help/help_mp-de.h help/help_mp-dk.h help/help_mp-el.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it....
by reimar 26 Jan '11

26 Jan '11

Author: reimar Date: Wed Jan 26 22:24:49 2011 New Revision: 32817 Log: Change MSGTR_Paused definition to allow simplifying some code. Modified: trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ro.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Changes in other areas also in this revision: Modified: trunk/help/help_mp-en.h trunk/mplayer.c Modified: trunk/help/help_mp-bg.h ============================================================================== --- trunk/help/help_mp-bg.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-bg.h Wed Jan 26 22:24:49 2011 (r32817) @@ -119,7 +119,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Наложен аудио кодек: %s\n" #define MSGTR_Video_NoVideo "Видео: няма видео\n" #define MSGTR_NotInitializeVOPorVO "\nФАТАЛНО: Видео филтъра (-vf) или изхода (-vo) не могат да бъдат инициализирани.\n" -#define MSGTR_Paused "\n ===== ПАУЗА =====\r" // no more than 23 characters (status line for audio files) +#define MSGTR_Paused " ===== ПАУЗА =====" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\nPlaylist-ът не може да бъде зареден %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer катастрофира заради 'Невалидна инструкция'.\n"\ Modified: trunk/help/help_mp-cs.h ============================================================================== --- trunk/help/help_mp-cs.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-cs.h Wed Jan 26 22:24:49 2011 (r32817) @@ -118,7 +118,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Vynucen audio kodek: %s\n" #define MSGTR_Video_NoVideo "Video: Žádné video\n" #define MSGTR_NotInitializeVOPorVO "\nKritická chyba: Nemohu inicializovat video filtry (-vf) nebo video výstup (-vo)!\n" -#define MSGTR_Paused "\n===== POZASTAVENO =====\r" +#define MSGTR_Paused "===== POZASTAVENO =====" #define MSGTR_PlaylistLoadUnable "\nNemohu načíst playlist %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer havaroval kvůli 'Illegal Instruction'.\n"\ Modified: trunk/help/help_mp-de.h ============================================================================== --- trunk/help/help_mp-de.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-de.h Wed Jan 26 22:24:49 2011 (r32817) @@ -131,7 +131,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Erzwungener Audiocodec: %s\n" #define MSGTR_Video_NoVideo "Video: kein Video\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Konnte Videofilter (-vf) oder -ausgabetreiber (-vo) nicht initialisieren.\n" -#define MSGTR_Paused "\n ===== PAUSE =====\r" +#define MSGTR_Paused " ===== PAUSE =====" #define MSGTR_PlaylistLoadUnable "\nKann Playlist %s nicht laden.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer stürzte aufgrund einer 'ungültigen Anweisung' ab.\n"\ Modified: trunk/help/help_mp-dk.h ============================================================================== --- trunk/help/help_mp-dk.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-dk.h Wed Jan 26 22:24:49 2011 (r32817) @@ -118,7 +118,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Gennemtvunget lyd-codec: %s\n" #define MSGTR_Video_NoVideo "Video: ingen video\n" #define MSGTR_NotInitializeVOPorVO "\nFATALT: Kunne ikke initialisere videofiltre (-vf) eller videodriver (-vo)!\n" -#define MSGTR_Paused "\n ===== PAUSE =====\r" +#define MSGTR_Paused " ===== PAUSE =====" #define MSGTR_PlaylistLoadUnable "\nKunne ikke indlæse afspilningslisten %s\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer fik en alvorlig fejl af typen 'ulovlig instruktion'.\n"\ Modified: trunk/help/help_mp-el.h ============================================================================== --- trunk/help/help_mp-el.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-el.h Wed Jan 26 22:24:49 2011 (r32817) @@ -116,7 +116,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Εξαναγκασμός χρήσης του codec ήχου: %s\n" #define MSGTR_Video_NoVideo "Βίντεο: δεν υπάρχει βίντεο!!!\n" #define MSGTR_NotInitializeVOPorVO "\n Σφάλμα: Αδύνατη η αρχικοποίηση του φίλτρου βίντεο (-vf) ή της εξόδου βίντεο (-vo)!\n" -#define MSGTR_Paused "\n ===== ΠΑΥΣΗ =====\r" +#define MSGTR_Paused " ===== ΠΑΥΣΗ =====" #define MSGTR_PlaylistLoadUnable "\n Αδύνατη η φόρτωση της λίστας αναπαραγωγής %s\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- Το MPlayer κατέρρευσε από ένα 'Illegal Instruction'.\n"\ Modified: trunk/help/help_mp-es.h ============================================================================== --- trunk/help/help_mp-es.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-es.h Wed Jan 26 22:24:49 2011 (r32817) @@ -129,7 +129,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Codec de audio forzado: %s\n" #define MSGTR_Video_NoVideo "Vídeo: no hay video!\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: No fue posible inicializar los filtros (-vf) o la salida de video (-vo)!\n" -#define MSGTR_Paused "\n ===== PAUSA =====\r" +#define MSGTR_Paused " ===== PAUSA =====" #define MSGTR_PlaylistLoadUnable "\nNo fue posible cargar la lista de reproducción %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer se detuvo por una 'Instrucción Ilegal'.\n"\ Modified: trunk/help/help_mp-fr.h ============================================================================== --- trunk/help/help_mp-fr.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-fr.h Wed Jan 26 22:24:49 2011 (r32817) @@ -123,7 +123,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Codec audio forcé : %s\n" #define MSGTR_Video_NoVideo "Vidéo : pas de vidéo\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL : impossible d'initialiser filtres vidéo (-vf) ou sortie vidéo (-vo).\n" -#define MSGTR_Paused "\n ===== PAUSE =====\r" // pas plus de 23 caractères (ligne pour les fichiers audio) +#define MSGTR_Paused " ===== PAUSE =====" // pas plus de 23 caractères (ligne pour les fichiers audio) #define MSGTR_PlaylistLoadUnable "\nImpossible de charger la liste de lecture %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer a planté à cause d'une 'Instruction Illégale'.\n"\ Modified: trunk/help/help_mp-hu.h ============================================================================== --- trunk/help/help_mp-hu.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-hu.h Wed Jan 26 22:24:49 2011 (r32817) @@ -121,7 +121,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Kényszerített audio codec: %s\n" #define MSGTR_Video_NoVideo "Video: nincs video!!!\n" #define MSGTR_NotInitializeVOPorVO "\nHIBA: Nem sikerült a video filterek (-vf) vagy a video kimenet (-vo) inicializálása!\n" -#define MSGTR_Paused "\n ===== SZÜNET =====\r" +#define MSGTR_Paused " ===== SZÜNET =====" #define MSGTR_PlaylistLoadUnable "\nLejátszási lista (%s) betöltése sikertelen.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- Az MPlayer egy 'illegális utasítást' hajtott végre.\n"\ Modified: trunk/help/help_mp-it.h ============================================================================== --- trunk/help/help_mp-it.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-it.h Wed Jan 26 22:24:49 2011 (r32817) @@ -118,7 +118,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Codec audio forzato: %s\n" #define MSGTR_Video_NoVideo "Video: nessun video!!!\n" #define MSGTR_NotInitializeVOPorVO "\nFATALE: Impossibile inizializzare i filtri video (-vf) o l'output video (-vo)!\n" -#define MSGTR_Paused "\n ===== PAUSA =====\r" +#define MSGTR_Paused " ===== PAUSA =====" #define MSGTR_PlaylistLoadUnable "\nImpossibile caricare la playlist %s\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer è stato interrotto dal segnale 'Istruzione illegale'.\n"\ Modified: trunk/help/help_mp-ja.h ============================================================================== --- trunk/help/help_mp-ja.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-ja.h Wed Jan 26 22:24:49 2011 (r32817) @@ -113,7 +113,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "指定された音声コーデック: %s\n" #define MSGTR_Video_NoVideo "Video: 映像がありません\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: 画像フィルター(-vf)か画像出力(-vo)の初期化に失敗しました.\n" -#define MSGTR_Paused "\n ===== 停止 =====\r" // no more than 23 characters (status line for audio files) +#define MSGTR_Paused " ===== 停止 =====" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\nプレイリストの読み込みが出来ません %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayerは不正な命令(Illegal Instruction)によりクラッシュしました\n"\ Modified: trunk/help/help_mp-ko.h ============================================================================== --- trunk/help/help_mp-ko.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-ko.h Wed Jan 26 22:24:49 2011 (r32817) @@ -115,7 +115,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "강제로 사용된 오디오 코덱: %s\n" #define MSGTR_Video_NoVideo "비디오: 비디오 없음\n" #define MSGTR_NotInitializeVOPorVO "\n치명적 오류: 비디오 필터(-vf) 또는 비디오 출력(-vo)을 초기화할 수 없습니다.\n" -#define MSGTR_Paused "\n ===== 잠시멈춤 =====\r" +#define MSGTR_Paused " ===== 잠시멈춤 =====" #define MSGTR_PlaylistLoadUnable "\n재생목록 %s을(를) 열 수 없습니다.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer가 '잘못된 연산'으로 종료되었습니다.\n"\ Modified: trunk/help/help_mp-mk.h ============================================================================== --- trunk/help/help_mp-mk.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-mk.h Wed Jan 26 22:24:49 2011 (r32817) @@ -116,7 +116,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Присилен аудио кодек: %s\n" #define MSGTR_Video_NoVideo "Видео: нема слика\n" #define MSGTR_NotInitializeVOPorVO "\nФАТАЛНО: Не може да ги иницијализира видео филтерите (-vf) или видео излезот (-vo).\n" -#define MSGTR_Paused "\n ===== ПАУЗА =====\r" // не повеќе од 23 карактери (статус линија за аудио датотеките) +#define MSGTR_Paused " ===== ПАУЗА =====" // не повеќе од 23 карактери (статус линија за аудио датотеките) #define MSGTR_PlaylistLoadUnable "\nНе може да ја вчита плејлистата %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer падна од 'Нелегална Инструкција'.\n"\ Modified: trunk/help/help_mp-nl.h ============================================================================== --- trunk/help/help_mp-nl.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-nl.h Wed Jan 26 22:24:49 2011 (r32817) @@ -116,7 +116,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Gedwongen audio codec: %s\n" #define MSGTR_Video_NoVideo "Video: geen video!!!\n" #define MSGTR_NotInitializeVOPorVO "\nFATAAL: Kon de video filters (-vf) of de video uitvoer (-vo) niet initialiseren!\n" -#define MSGTR_Paused "\n------ GEPAUZEERD -------\r" +#define MSGTR_Paused "------ GEPAUZEERD -------" #define MSGTR_PlaylistLoadUnable "\nKon de playlist %s niet laden\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer crashte door een 'Illegale Instructie'.\n"\ Modified: trunk/help/help_mp-pl.h ============================================================================== --- trunk/help/help_mp-pl.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-pl.h Wed Jan 26 22:24:49 2011 (r32817) @@ -120,7 +120,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Wymuszam kodek audio: %s\n" #define MSGTR_Video_NoVideo "Wideo: brak obrazu\n" #define MSGTR_NotInitializeVOPorVO "\nBłąd krytyczny: Nie mogę zainicjalizować filtrów (-vf) lub wyjścia video (-vo).\n" -#define MSGTR_Paused "\n ===== PAUZA =====\r" // no more than 23 characters (status line for audio files) +#define MSGTR_Paused " ===== PAUZA =====" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\nNie mogę wczytać listy odtwarzania %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer zakończył prace z powodu błędu 'Niedozwolona Instrukcja'.\n"\ Modified: trunk/help/help_mp-pt_BR.h ============================================================================== --- trunk/help/help_mp-pt_BR.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-pt_BR.h Wed Jan 26 22:24:49 2011 (r32817) @@ -124,7 +124,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Codec de audio forçado: %s\n" #define MSGTR_Video_NoVideo "Vídeo: sem vídeo\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Impossível inicializar os filtros de vídeo (-vf) ou a saída de vídeo (-vo)!\n" -#define MSGTR_Paused "\n================= PAUSADO =================\r" +#define MSGTR_Paused "================= PAUSADO =================" #define MSGTR_PlaylistLoadUnable "\nIncapaz de carregar a lista de reprodução %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer falhou por uma 'Instrução Ilegal'.\n"\ Modified: trunk/help/help_mp-ro.h ============================================================================== --- trunk/help/help_mp-ro.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-ro.h Wed Jan 26 22:24:49 2011 (r32817) @@ -120,7 +120,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Codec audio forþat: %s\n" #define MSGTR_Video_NoVideo "Video: nu existã video\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Nu pot iniþializa filtrele video (-vf) sau ieºirea video (-vo).\n" -#define MSGTR_Paused "\n ===== PAUZÃ =====\r" // no more than 23 characters (status line for audio files) +#define MSGTR_Paused " ===== PAUZÃ =====" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\nNu pot sã încarc playlistul %s.\n" #define MSGTR_Exit_SIGCRASH \ "- MPlayer a murit. Nu ar trebui sã se întâmple asta.\n"\ Modified: trunk/help/help_mp-ru.h ============================================================================== --- trunk/help/help_mp-ru.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-ru.h Wed Jan 26 22:24:49 2011 (r32817) @@ -119,7 +119,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Форсирован аудиокодек: %s\n" #define MSGTR_Video_NoVideo "Видео: нет видео\n" #define MSGTR_NotInitializeVOPorVO "\nФАТАЛЬНАЯ ОШИБКА: Не могу инициализировать видеофильтры (-vf) или видеовывод (-vo).\n" -#define MSGTR_Paused "\n=== ПРИОСТАНОВЛЕНО ===\r" // no more than 23 characters (status line for audio files) +#define MSGTR_Paused "=== ПРИОСТАНОВЛЕНО ===" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\nНе могу загрузить список воспроизведения (плейлист) %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer рухнул из-за 'Неправильной Инструкции'.\n"\ Modified: trunk/help/help_mp-sk.h ============================================================================== --- trunk/help/help_mp-sk.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-sk.h Wed Jan 26 22:24:49 2011 (r32817) @@ -119,7 +119,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Vnútený video kodek: %s\n" #define MSGTR_Video_NoVideo "Video: žiadne video!!!\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Nemôžem inicializovať video filtre (-vf) alebo video výstup (-vo)!\n" -#define MSGTR_Paused "\n ===== PAUZA =====\r" +#define MSGTR_Paused " ===== PAUZA =====" #define MSGTR_PlaylistLoadUnable "\nNemôžem načítať playlist %s\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer zhavaroval na 'Illegal Instruction'.\n"\ Modified: trunk/help/help_mp-sv.h ============================================================================== --- trunk/help/help_mp-sv.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-sv.h Wed Jan 26 22:24:49 2011 (r32817) @@ -118,7 +118,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Forcerad audiocodec: %s\n" #define MSGTR_Video_NoVideo "Video: ingen video\n" #define MSGTR_NotInitializeVOPorVO "\nFATALT: Kunde inte initiera videofilter (-vf) eller video-ut (-vo).\n" -#define MSGTR_Paused "\n ===== PAUSE =====\r" // no more than 23 characters (status line for audio files) +#define MSGTR_Paused " ===== PAUSE =====" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\nOförmögen att ladda spellista %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer krachade av en 'Illegal Instruction'.\n"\ Modified: trunk/help/help_mp-tr.h ============================================================================== --- trunk/help/help_mp-tr.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-tr.h Wed Jan 26 22:24:49 2011 (r32817) @@ -121,7 +121,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Ses kodeği zorlandı: %s\n" #define MSGTR_Video_NoVideo "Video: video yok!!!\n" #define MSGTR_NotInitializeVOPorVO "\nHATA: Video filtreleri (-vf) veya video çıkışı (-vo) başlatılamadı!\n" -#define MSGTR_Paused "\n-------- DURAKLADI --------\r" +#define MSGTR_Paused "-------- DURAKLADI --------" #define MSGTR_PlaylistLoadUnable "\n%s çalma listesi yüklenemedi.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- 'Geçersiz Komut' nedeniyle MPlayer çöktü.\n"\ Modified: trunk/help/help_mp-uk.h ============================================================================== --- trunk/help/help_mp-uk.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-uk.h Wed Jan 26 22:24:49 2011 (r32817) @@ -113,7 +113,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "Примусовий аудіо кодек: %s\n" #define MSGTR_Video_NoVideo "Відео: без відео\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Неможливо ініціалізувати відео фільтри (-vf) або відео вивід (-vo).\n" -#define MSGTR_Paused "\n ===== ПАУЗА =====\r" +#define MSGTR_Paused " ===== ПАУЗА =====" #define MSGTR_PlaylistLoadUnable "\nНеможливо завантажити playlist %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- MPlayer зламався через 'Невірні інструкції'.\n"\ Modified: trunk/help/help_mp-zh_CN.h ============================================================================== --- trunk/help/help_mp-zh_CN.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-zh_CN.h Wed Jan 26 22:24:49 2011 (r32817) @@ -120,7 +120,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "强制使用音频编解码器：%s\n" #define MSGTR_Video_NoVideo "视频：没有视频流\n" #define MSGTR_NotInitializeVOPorVO "\n致命错误：无法初始设置视频过滤器（-vf）或视频输出（-vf）。\n" -#define MSGTR_Paused "\n ===== 暂停 =====\r" // no more than 23 characters (status line for audio files) +#define MSGTR_Paused " ===== 暂停 =====" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\n无法装载播放列表 %s\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- “非法指令”导致 MPlayer 崩溃。\n"\ Modified: trunk/help/help_mp-zh_TW.h ============================================================================== --- trunk/help/help_mp-zh_TW.h Wed Jan 26 20:00:17 2011 (r32816) +++ trunk/help/help_mp-zh_TW.h Wed Jan 26 22:24:49 2011 (r32817) @@ -123,7 +123,7 @@ static const char help_text[]= #define MSGTR_ForcedAudioCodec "鎖定的音頻編解碼器: %s\n" #define MSGTR_Video_NoVideo "視頻: 没視頻\n" #define MSGTR_NotInitializeVOPorVO "\n致命錯誤: 無法初始化 (-vf) 視頻過濾器或 (-vo) 視頻輸出。\n" -#define MSGTR_Paused "\n ===== 暫停 =====\r" // no more than 23 characters (status line for audio files) +#define MSGTR_Paused " ===== 暫停 =====" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\n無法裝載播放列表 %s\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ "- “非法指令”導致 MPlayer 崩潰。\n"\

1 0

r32797 - trunk/help/help_mp-de.h
by ib 19 Jan '11

19 Jan '11

Author: ib Date: Wed Jan 19 10:00:40 2011 New Revision: 32797 Log: Fix compiler warning Modified: trunk/help/help_mp-de.h Modified: trunk/help/help_mp-de.h ============================================================================== --- trunk/help/help_mp-de.h Tue Jan 18 12:39:49 2011 (r32796) +++ trunk/help/help_mp-de.h Wed Jan 19 10:00:40 2011 (r32797) @@ -2174,7 +2174,7 @@ static const char help_text[]= #define MSGTR_TVI_DS_UnableTerminateVPPin "tvi_dshow: Kann VideoPort-Pin mit keinem Filter des Graphen terminieren. Fehler:0x%x\n" #define MSGTR_TVI_DS_UnableBuildVideoSubGraph "tvi_dshow: Kann Videokette des Capture-Graphen nicht erstellen. Fehler:0x%x\n" #define MSGTR_TVI_DS_UnableBuildAudioSubGraph "tvi_dshow: Kann Audiokette des Capture-Graphen nicht erstellen. Fehler:0x%x\n" -#define MSGTR_TVI_DS_UnableBuildVBISubGraph "tvi_dshow: Kann VBI-Kette des Capture-Graphen nicht erstellen. Fehler:0x%x\n"" +#define MSGTR_TVI_DS_UnableBuildVBISubGraph "tvi_dshow: Kann VBI-Kette des Capture-Graphen nicht erstellen. Fehler:0x%x\n" #define MSGTR_TVI_DS_GraphInitFailure "tvi_dshow: Initialisierung des Directshow-Graph fehlgeschlagen.\n" #define MSGTR_TVI_DS_NoVideoCaptureDevice "tvi_dshow: Kein Gerät für Videoerfassung gefunden\n" #define MSGTR_TVI_DS_NoAudioCaptureDevice "tvi_dshow: Kein Gerät für Audioerfassung gefunden\n"

1 0

r32788 - trunk/DOCS/man/zh_CN/mplayer.1
by jrash 14 Jan '11

14 Jan '11

Author: jrash Date: Fri Jan 14 14:36:48 2011 New Revision: 32788 Log: sync with en/mplayer.1 rev. 32777 Modified: trunk/DOCS/man/zh_CN/mplayer.1 Modified: trunk/DOCS/man/zh_CN/mplayer.1 ============================================================================== --- trunk/DOCS/man/zh_CN/mplayer.1 Thu Jan 13 18:37:16 2011 (r32787) +++ trunk/DOCS/man/zh_CN/mplayer.1 Fri Jan 14 14:36:48 2011 (r32788) @@ -1,4 +1,4 @@ -.\" sync with en/mplayer.1 rev. 32735 +.\" sync with en/mplayer.1 rev. 32777 .\" Encoding: UTF-8 .\" .\" MPlayer (C) 2000-2010 MPlayer 团队 @@ -1450,10 +1450,10 @@ MPlayer在关闭时将驱动器的速度 . .TP .B \-endpos <[[hh:]mm:]ss[.ms]|size[b|kb|mb]> (也请参见 \-ss 和 \-sb) -停止在给定的时间或字节位置。 +停止在给定的时间或以字节计的位置。 .br -.I 注意: -字节位置仅为了 MEncoder 而启用但不精确, 因为它只会停在帧的边缘。 +.I 注意： +以字节计的位置可能不精确，因为只能暂停在帧数据块的边界上。当与 \-ss 选项组合使用时, \-endpos 的时间会向前移动 \-ss 指定的秒数。 .sp 1 .I 示例:

1 0

r32777 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-pl.h help/help_mp...
by cboesch 10 Jan '11

10 Jan '11

Author: cboesch Date: Mon Jan 10 20:18:51 2011 New Revision: 32777 Log: Add size based support for -endpos in MPlayer. Modified: trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-pl.h trunk/help/help_mp-ru.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 trunk/help/help_mp-en.h trunk/mplayer.c Modified: trunk/help/help_mp-cs.h ============================================================================== --- trunk/help/help_mp-cs.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-cs.h Mon Jan 10 20:18:51 2011 (r32777) @@ -190,7 +190,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "EDL: Vynechání zrušeno, poslední start > stop\n" #define MSGTR_EdloutStartSkip "EDL: Začátek vynechaného bloku, stiskněte znovu 'i' pro ukončení bloku.\n" #define MSGTR_EdloutEndSkip "EDL: Konec vynechaného bloku, řádek zapsán.\n" -#define MSGTR_MPEndposNoSizeBased "Volba -endpos v MPlayeru zatím nepodporuje rozměrové jednotky.\n" // mplayer.c OSD #define MSGTR_OSDenabled "zapnuto" Modified: trunk/help/help_mp-de.h ============================================================================== --- trunk/help/help_mp-de.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-de.h Mon Jan 10 20:18:51 2011 (r32777) @@ -207,7 +207,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "EDL-Sprung abgebrochen, letzter Start > Stop\n" #define MSGTR_EdloutStartSkip "EDL-Sprung begonnen, drücke 'i' erneut, um den Block zu beenden.\n" #define MSGTR_EdloutEndSkip "EDL-Sprung beendet, Zeile geschrieben.\n" -#define MSGTR_MPEndposNoSizeBased "Die Option -endpos unterstützt für MPlayer noch keine Größenangaben.\n" // mplayer.c OSD #define MSGTR_OSDenabled "aktiviert" Modified: trunk/help/help_mp-es.h ============================================================================== --- trunk/help/help_mp-es.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-es.h Mon Jan 10 20:18:51 2011 (r32777) @@ -206,7 +206,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "EDL skip cancelado, último comienzo > parada\n" #define MSGTR_EdloutStartSkip "EDL skip comenzado, presione 'i' denuevo para terminar con el bloque.\n" #define MSGTR_EdloutEndSkip "EDL skip terminado, operación guardada.\n" -#define MSGTR_MPEndposNoSizeBased "La opción -endpos en MPlayer aun no soporta unidades de tamaño.\n" // mplayer.c OSD #define MSGTR_OSDenabled "habilitado" Modified: trunk/help/help_mp-fr.h ============================================================================== --- trunk/help/help_mp-fr.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-fr.h Mon Jan 10 20:18:51 2011 (r32777) @@ -194,7 +194,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "Saut EDL annulé, dernier début > arrêt\n" #define MSGTR_EdloutStartSkip "EDL saute le début, presse 'i' encore une fois pour fin du bloc.\n" #define MSGTR_EdloutEndSkip "EDL saute la fin, ligne écrite.\n" -#define MSGTR_MPEndposNoSizeBased "Option -endpos dans MPlayer ne supporte pas encore les unités de taille.\n" // mplayer.c OSD Modified: trunk/help/help_mp-hu.h ============================================================================== --- trunk/help/help_mp-hu.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-hu.h Mon Jan 10 20:18:51 2011 (r32777) @@ -199,7 +199,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "EDL skip visszavonva, az utolsó start > stop\n" #define MSGTR_EdloutStartSkip "EDL skip eleje, nyomd meg az 'i'-t a blokk befejezéséhez.\n" #define MSGTR_EdloutEndSkip "EDL skip vége, a sor kiírva.\n" -#define MSGTR_MPEndposNoSizeBased "Az MPlayer -endpos opciója jelenleg még nem támogatja a méretbeli megadást.\n" // mplayer.c OSD #define MSGTR_OSDenabled "bekapcsolva" Modified: trunk/help/help_mp-it.h ============================================================================== --- trunk/help/help_mp-it.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-it.h Mon Jan 10 20:18:51 2011 (r32777) @@ -197,7 +197,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "Salto EDL ingnorato, ultimo start > stop\n" #define MSGTR_EdloutStartSkip "Tempo di start EDL impostato, ripremere 'i' per impostare lo stop.\n" #define MSGTR_EdloutEndSkip "Fine del blocco EDL, riga scritta.\n" -#define MSGTR_MPEndposNoSizeBased "L'opzione -endpos in MPlayer non supporta ancora unità di mis. di dimensione.\n" // mplayer.c OSD #define MSGTR_OSDenabled "abilitat" Modified: trunk/help/help_mp-pl.h ============================================================================== --- trunk/help/help_mp-pl.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-pl.h Mon Jan 10 20:18:51 2011 (r32777) @@ -189,7 +189,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "Pominięcie EDL odwołane, ostatni start > stop\n" #define MSGTR_EdloutStartSkip "Pominięcie EDL rozpoczęte, wciśnij ponownie 'i' by zakończyć blok.\n" #define MSGTR_EdloutEndSkip "Pominięcie EDL zakończone, wiersz zapisany.\n" -#define MSGTR_MPEndposNoSizeBased "Opcja MPlayer -endpos nie obsługuje jeszcze jednostek rozmiaru.\n" // mplayer.c OSD Modified: trunk/help/help_mp-ru.h ============================================================================== --- trunk/help/help_mp-ru.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-ru.h Mon Jan 10 20:18:51 2011 (r32777) @@ -191,7 +191,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "EDL пропуск отменён, последний start > stop\n" #define MSGTR_EdloutStartSkip "Начало EDL пропуска, нажмите 'i' ещё раз для завершения блока.\n" #define MSGTR_EdloutEndSkip "Конец EDL пропуска, строка записана.\n" -#define MSGTR_MPEndposNoSizeBased "В MPlayer опция -endpos пока не поддерживает единицы размера.\n" // mplayer.c OSD #define MSGTR_OSDenabled "включено" Modified: trunk/help/help_mp-tr.h ============================================================================== --- trunk/help/help_mp-tr.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-tr.h Mon Jan 10 20:18:51 2011 (r32777) @@ -194,7 +194,6 @@ static const char help_text[]= #define MSGTR_EdloutStartSkip "EDL atlaması başlangıcı, bloğu bitirmek için\n"\ "'i' tuşuna tekrar basın.\n" #define MSGTR_EdloutEndSkip "EDL atlaması sonu, satır yazıldı.\n" -#define MSGTR_MPEndposNoSizeBased "MPlayer'da -endpos seçeneği henüz boyut birimlerini desteklemiyor.\n" // mplayer.c OSD Modified: trunk/help/help_mp-uk.h ============================================================================== --- trunk/help/help_mp-uk.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-uk.h Mon Jan 10 20:18:51 2011 (r32777) @@ -185,7 +185,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "Ігнорування EDL відмінено, останній start > stop\n" #define MSGTR_EdloutStartSkip "Старт EDL пропуску, натисніть 'i' знов, щоб завершити блок.\n" #define MSGTR_EdloutEndSkip "Кінець EDL пропуску, рядок записано.\n" -#define MSGTR_MPEndposNoSizeBased "Опція -endpos у MPlayer ще не підтримує одиниці ромзіру.\n" // mplayer.c OSD #define MSGTR_OSDenabled "увімкнено" Modified: trunk/help/help_mp-zh_CN.h ============================================================================== --- trunk/help/help_mp-zh_CN.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-zh_CN.h Mon Jan 10 20:18:51 2011 (r32777) @@ -196,7 +196,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "取消 EDL 跳跃，上一个开始位置 > 停止位置\n" #define MSGTR_EdloutStartSkip "开始 EDL 跳跃，再按键‘i’以指定跳过内容的结尾。\n" #define MSGTR_EdloutEndSkip "结束 EDL 跳跃，文本行已写入。\n" -#define MSGTR_MPEndposNoSizeBased "MPlayer 的选项 -endpos 还不支持指定尺寸大小的单位。\n" // mplayer.c OSD #define MSGTR_OSDenabled "已启用" Modified: trunk/help/help_mp-zh_TW.h ============================================================================== --- trunk/help/help_mp-zh_TW.h Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/help/help_mp-zh_TW.h Mon Jan 10 20:18:51 2011 (r32777) @@ -193,7 +193,6 @@ static const char help_text[]= #define MSGTR_EdloutBadStop "EDL 跳躍已取消, 上次開始位置 > 停止位置\n" #define MSGTR_EdloutStartSkip "EDL 跳躍開始, 再按鍵 'i' 以停止。\n" #define MSGTR_EdloutEndSkip "EDL 跳躍結束, 綫已寫入。\n" -#define MSGTR_MPEndposNoSizeBased "MPlayer 的選項 -endpos 還不支持大小單位。\n" // mplayer.c OSD

1 0

r32748 - in trunk/DOCS/xml: cs/ports.xml de/ports.xml en/ports.xml fr/ports.xml hu/ports.xml pl/ports.xml ru/ports.xml
by diego 02 Jan '11

02 Jan '11

Author: diego Date: Sun Jan 2 19:52:46 2011 New Revision: 32748 Log: Replace obsolete '--with-extralibdir' configure option by '--extra-ldflags'. Modified: trunk/DOCS/xml/cs/ports.xml trunk/DOCS/xml/de/ports.xml trunk/DOCS/xml/fr/ports.xml trunk/DOCS/xml/hu/ports.xml trunk/DOCS/xml/pl/ports.xml trunk/DOCS/xml/ru/ports.xml Changes in other areas also in this revision: Modified: trunk/DOCS/xml/en/ports.xml Modified: trunk/DOCS/xml/cs/ports.xml ============================================================================== --- trunk/DOCS/xml/cs/ports.xml Sun Jan 2 13:21:59 2011 (r32747) +++ trunk/DOCS/xml/cs/ports.xml Sun Jan 2 19:52:46 2011 (r32748) @@ -417,7 +417,7 @@ Níže uvádíme řešení některých b </para> <para> Řešení: Použijte volbu extralibdir v configure - <option>--with-extralibdir="/usr/lib -lrt"</option> + <option>--extra-ldflags="/usr/lib -lrt"</option> </para> </listitem> Modified: trunk/DOCS/xml/de/ports.xml ============================================================================== --- trunk/DOCS/xml/de/ports.xml Sun Jan 2 13:21:59 2011 (r32747) +++ trunk/DOCS/xml/de/ports.xml Sun Jan 2 19:52:46 2011 (r32748) @@ -391,7 +391,7 @@ ctl <emphasis role="bold">1</emphasi <para> Lösung: Benutze die Option extralibdir von configure - <option>--with-extralibdir="/usr/lib -lrt"</option> + <option>--extra-ldflags="/usr/lib -lrt"</option> </para> </listitem> Modified: trunk/DOCS/xml/fr/ports.xml ============================================================================== --- trunk/DOCS/xml/fr/ports.xml Sun Jan 2 13:21:59 2011 (r32747) +++ trunk/DOCS/xml/fr/ports.xml Sun Jan 2 19:52:46 2011 (r32748) @@ -433,7 +433,7 @@ Plante à la lecture avec le message d'e <para> Solution : Utiliser l'option extralibdir lors de configure -<option>--with-extralibdir="/usr/lib -lrt"</option> +<option>--extra-ldflags="/usr/lib -lrt"</option> </para> </listitem> Modified: trunk/DOCS/xml/hu/ports.xml ============================================================================== --- trunk/DOCS/xml/hu/ports.xml Sun Jan 2 13:21:59 2011 (r32747) +++ trunk/DOCS/xml/hu/ports.xml Sun Jan 2 19:52:46 2011 (r32748) @@ -394,7 +394,7 @@ Itt van pár gyakori probléma megoldás </para> <para> Megoldás: Használd a configure extralibdir opcióját - <option>--with-extralibdir="/usr/lib -lrt"</option> + <option>--extra-ldflags="/usr/lib -lrt"</option> </para> </listitem> Modified: trunk/DOCS/xml/pl/ports.xml ============================================================================== --- trunk/DOCS/xml/pl/ports.xml Sun Jan 2 13:21:59 2011 (r32747) +++ trunk/DOCS/xml/pl/ports.xml Sun Jan 2 19:52:46 2011 (r32748) @@ -393,7 +393,7 @@ Wysypanie się programu przy odtwarzaniu <para> Rozwiązanie: Skorzystaj z opcji extralibdir skryptu configure -<option>--with-extralibdir="/usr/lib -lrt"</option> +<option>--extra-ldflags="/usr/lib -lrt"</option> </para> </listitem> Modified: trunk/DOCS/xml/ru/ports.xml ============================================================================== --- trunk/DOCS/xml/ru/ports.xml Sun Jan 2 13:21:59 2011 (r32747) +++ trunk/DOCS/xml/ru/ports.xml Sun Jan 2 19:52:46 2011 (r32748) @@ -410,7 +410,7 @@ ln -s /dev/rdsk/c<replaceable><SCSI b </para> <para> Решение: Используйте опцию extralibdir программы configure - <option>--with-extralibdir="/usr/lib -lrt"</option> + <option>--extra-ldflags="/usr/lib -lrt"</option> </para> </listitem>

1 0

r32742 - in trunk/DOCS/xml: cs/install.xml de/install.xml en/install.xml es/install.xml fr/install.xml hu/install.xml it/install.xml pl/install.xml ru/install.xml
by diego 01 Jan '11

01 Jan '11

Author: diego Date: Sat Jan 1 15:40:02 2011 New Revision: 32742 Log: Remove AAC/FAAD2 installation instructions. There is nothing special about building and installing FAAD2, so there is no longer a need to keep maintaining instructions for it. Modified: trunk/DOCS/xml/cs/install.xml trunk/DOCS/xml/de/install.xml trunk/DOCS/xml/es/install.xml trunk/DOCS/xml/fr/install.xml trunk/DOCS/xml/hu/install.xml trunk/DOCS/xml/it/install.xml trunk/DOCS/xml/pl/install.xml trunk/DOCS/xml/ru/install.xml Changes in other areas also in this revision: Modified: trunk/DOCS/xml/en/install.xml Modified: trunk/DOCS/xml/cs/install.xml ============================================================================== --- trunk/DOCS/xml/cs/install.xml Sat Jan 1 15:27:41 2011 (r32741) +++ trunk/DOCS/xml/cs/install.xml Sat Jan 1 15:40:02 2011 (r32742) @@ -432,43 +432,6 @@ Now rerun <filename>./configure</filenam  -<sect2 id="aac"> -<title>Kodek AAC</title> - -<para> -AAC (Advanced Audio Coding) je audio kodek, který lze občas nalézt v MOV a -MP4 souborech. Open source dekodér jménem FAAD je k dispozici na -<ulink url="http://www.audiocoding.com"/>. -<application>MPlayer</application> obsahuje CVS obraz libfaad 2.1 beta, -takže jej nemusíte stahovat dodatečně. -</para> - -<para> -Pokud používáte gcc 3.2 které nedokáže zkompilovat naši zabudovanou FAAD, -nebo chcete použít externí knihovnu z jiných důvodů, stáhněte si ji z -<ulink url="http://www.audiocoding.com/modules/mydownloads/">download stránky</ulink> -a předejte volbu <option>--enable-faad-external</option> skriptu -<filename>./configure</filename>. -Pro dekódování AAC souborů nepotřebujete celou faad2, libfaad stačí. -Zkompilujete ji takto: -<screen> -cd faad2/ -sh bootstrap -./configure -cd libfaad -make -make install -</screen> -Binárky na audiocoding.com nenajdete, ale můžete si je opatřit v balíčcích pro -Debian z -<ulink url="http://www.debian-multimedia.org/">domácí stránky Christiana Marillata</ulink>, -Mandrake/Mandriva RPM z <ulink url="http://plf.zarb.org">P.L.F</ulink> -a Fedora RPM ze stránek <ulink url="http://rpm.livna.org/">Livna</ulink>. -</para> -</sect2> - - - <sect2 id="amr"> <title>AMR kodeky</title> Modified: trunk/DOCS/xml/de/install.xml ============================================================================== --- trunk/DOCS/xml/de/install.xml Sat Jan 1 15:27:41 2011 (r32741) +++ trunk/DOCS/xml/de/install.xml Sat Jan 1 15:40:02 2011 (r32742) @@ -472,43 +472,6 @@ make install</screen> </sect2> - <sect2 id="aac"> - <title>AAC Codec</title> - <para> - AAC (Advanced Audio Coding) ist ein Audiocodec, der vorwiegend - in MOV- und MP4-Dateien vorkommt. Ein Open-Source-Decoder namens - FAAD ist auf <ulink url="http://www.audiocoding.com"/> - verfügbar. <application>MPlayer</application> enthält - eine CVS Version von libfaad 2.1 beta, so dass es nicht extra - installiert werden muss. - </para> - - <para> - Um die externe FAAD-Bibliothek verwenden zu können (z.B. um mit gcc 3.2 - compilieren zu können, der die interne Version nicht übersetzt), muss - die Bibliothek von der - <ulink url="http://www.audiocoding.com/modules/mydownloads/">Download Seite</ulink> - heruntergeladen und installiert werden. Anschließend muss die Option - <option>--enable-faad-external</option> an <filename>./configure</filename> - übergeben werden, damit die externe Bibliothek erkannt wird. - Es ist lediglich erforderlich, vorher libfaad zu installieren, und zwar so: - <screen> -cd faad2/ -sh bootstrap -./configure -cd libfaad -make -make install</screen> - Binärpakete sind auf audiocoding.com nicht erhältlich, Debian-Pakete - können aber mit (apt-)get von - <ulink url="http://www.debian-multimedia.org/">Christian Marillat's Homepage</ulink>, Mandrake/Mandriva RPMs von - <ulink url="http://plf.zarb.org">P.L.F</ulink> und RedHat RPMs - von <ulink url="http://greysector.rangers.eu.org/">Grey Sector</ulink> - heruntergeladen werden. - </para> - </sect2> - <sect2 id="amr"> <title>AMR Codecs</title> <para> Modified: trunk/DOCS/xml/es/install.xml ============================================================================== --- trunk/DOCS/xml/es/install.xml Sat Jan 1 15:27:41 2011 (r32741) +++ trunk/DOCS/xml/es/install.xml Sat Jan 1 15:40:02 2011 (r32742) @@ -648,32 +648,6 @@ tengan el mismo origen. </procedure> </sect2> - - -<sect2 id="aac"> -<title>AAC</title> -<para> -Un decodificador AAC open source está disponible en -<ulink url="http://www.audiocoding.com/downloads.html"/>. -No hay binarios FAAD2 disponibles en audiocoding.com, pero puede apetegetear paquetes Debian -de <ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>, -paquetes RPM para Mandrake desde la <ulink url="http://plf.zarb.org">P.L.F.</ulink> y RPMs -para Fedora/CentOS/RHEL en <ulink url="http://rpmfusion.org/">RPMFusion</ulink>. -</para> -<para> -Si decide compilar las fuentes, no necesita todoFAAD2 para decodificar archivos AAC, -libfaad es suficiente. Constrúyalo como sigue: -<screen> -cd faad2/ -sh bootstrap -./configure -cd libfaad -make -make install -</screen> -</para> -</sect2> - </sect1> Modified: trunk/DOCS/xml/fr/install.xml ============================================================================== --- trunk/DOCS/xml/fr/install.xml Sat Jan 1 15:27:41 2011 (r32741) +++ trunk/DOCS/xml/fr/install.xml Sat Jan 1 15:40:02 2011 (r32742) @@ -422,34 +422,6 @@ Now rerun <filename>./configure</filenam <systemitem class="library">x264</systemitem> support. </para> </sect2> - - -<sect2 id="aac"> -<title>Codec AAC</title> -<para> -Un décodeur open source appelé FAAD est disponible sur -<ulink url="http://www.audiocoding.com/downloads.html"/>. -<application>MPlayer</application> inclus une copie, vous n'avez donc pas -à l'obtenir séparemment. -Si vous voulez utiliser une librairie externe, passez -<option>--enable-faad-external</option> à <filename>./configure</filename>. -Vous n'avez pas besoin de tout faad2 pour décoder les fichiers AAC, libfaad suffit. -Construisez comme ceci : -<screen> -cd faad2/ -sh bootstrap -./configure -cd libfaad -make -make install -</screen> -Les binaires ne sont pas disponibles sur audiocoding.com, mais vous pouvez -obtenir les paquets Debian sur la -<ulink url="http://www.debian-multimedia.org/">page web de Christian Marillat</ulink>, -les RPMs Mandrake/Mandriva sur le <ulink url="http://plf.zarb.org">P.L.F</ulink> et les RPMS -Fedora sur <ulink url="http://rpm.livna.org/">Livna</ulink>. -</para> -</sect2>  Modified: trunk/DOCS/xml/hu/install.xml ============================================================================== --- trunk/DOCS/xml/hu/install.xml Sat Jan 1 15:27:41 2011 (r32741) +++ trunk/DOCS/xml/hu/install.xml Sat Jan 1 15:40:02 2011 (r32742) @@ -434,39 +434,6 @@ az <application>MPlayer</application>be  -<sect2 id="aac"> -<title>AAC</title> - -<para> -Egy FAAD2-nek hívott nyílt forráskódú AAC dekódoló elérhető itt: -<ulink url="http://www.audiocoding.com/downloads.html"/>. -Az <application>MPlayer</application> tartalmaz egy másolatot a forrásfájában. -Ha inkább a külső függvénykönyvtárat használnád, telepítsd és add meg a -<option>--enable-faad-external</option> kapcsolót a <filename>./configure</filename>-nak. -</para> - -<para> -FAAD2 binárisok nem tölthetőek le az audiocoding.com-ról, de (apt-)get-tel -telepítheted <ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink> Debian csomagjait, -vagy Mandrake/Mandriva RPM-et a <ulink url="http://plf.zarb.org">P.L.F</ulink>-ről, -Fedora/CentOS/RHEL RPM-et pedig az <ulink url="http://rpmfusion.org/">RPMFusion</ulink>-ról. -</para> -<para> -Ha úgy döntesz, hogy forrásból fordítasz, nem kell a teljes FAAD2 az AAC fájlok -dekódolásához, elég a libfaad. Így készítsd el: -<screen> -cd faad2/ -sh bootstrap -./configure -cd libfaad -make -make install -</screen> -</para> -</sect2> - - - <sect2 id="amr"> <title>AMR</title> Modified: trunk/DOCS/xml/it/install.xml ============================================================================== --- trunk/DOCS/xml/it/install.xml Sat Jan 1 15:27:41 2011 (r32741) +++ trunk/DOCS/xml/it/install.xml Sat Jan 1 15:40:02 2011 (r32742) @@ -435,40 +435,6 @@ Poi riesegui <filename>./configure</file  -<sect2 id="aac"> -<title>AAC</title> - -<para> -E' disponibile da <ulink url="http://www.audiocoding.com/downloads.html"/> un -decodificatore open source che si chiama FAAD2. -<application>MPlayer</application> ne include una copia nei suoi sorgenti. -Se vuoi usare la libreria esterna per qualche altra ragione, installala e passa -<option>--enable-faad-external</option> a <filename>./configure</filename>. -</para> - -<para> -Gli eseguibili di FAAD2 non sono disponibili da audiocoding.com, ma puoi -ottenere con apt(-get) i pacchetti Debian da -<ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>, -gli RPM per Mandrake/Mandriva da <ulink url="http://plf.zarb.org">P.L.F</ulink> -e quelli per Fedora da <ulink url="http://rpm.livna.org/">Livna</ulink>. -</para> -<para> -Se decidi di compilarli dai sorgenti, non ti serve tutto di faad2 per -decodificare i file AAC, ti basta libfaad. Compilala così: -<screen> -cd faad2/ -sh bootstrap -./configure -cd libfaad -make -make install -</screen> -</para> -</sect2> - - - <sect2 id="amr"> <title>AMR</title> Modified: trunk/DOCS/xml/pl/install.xml ============================================================================== --- trunk/DOCS/xml/pl/install.xml Sat Jan 1 15:27:41 2011 (r32741) +++ trunk/DOCS/xml/pl/install.xml Sat Jan 1 15:40:02 2011 (r32742) @@ -462,44 +462,6 @@ Now rerun <filename>./configure</filenam  -<sect2 id="aac"> -<title>Kodek AAC</title> - -<para> -AAC (Advanced Audio Coding) jest kodekiem audio spotykanym czasami w plikach -MOV i MP4. Otwarty dekoder nazywany FAAD dostępny jest na stronie -<ulink url="http://www.audiocoding.com"/>. -<application>MPlayer</application> zawiera migawkę CVS z -libfaad 2.1beta, więc nie musisz ściągać go oddzielnie. -</para> - -<para> -Jeżeli używasz gcc 3.2, który ma kłopoty z kompilacją wbudowanej wersji -FAAD lub chcesz z jakichś powodów użyć zewnętrznej biblioteki, -ściągnij ją z -<ulink url="http://www.audiocoding.com/modules/mydownloads/">tej strony</ulink> -i dodaj opcję <option>--enable-external-faad</option> do -<filename>./configure</filename>. Nie potrzebujesz całego faad2 do dekodowanie -plików AAC. Wystarczy użyć samej biblioteki libfaad. Zbudujesz ją w następujący -sposób -<screen> -cd faad2/ -sh bootstrap -./configure -cd libfaad -make -make install -</screen> -Wersje binarne nie są dostępne na stronie audiocoding.com, ale możesz -ściągnąć (apt-getem) Debianowe paczki ze -<ulink url="http://www.debian-multimedia.org/">strony domowej Christiana Marillata</ulink>, -RPM-y dla Mandrake/Mandriva ze strony <ulink url="http://plf.zarb.org">P.L.F</ulink>, -a RPM-y dla Fedory z <ulink url="http://rpm.livna.org/">Livna</ulink>. -</para> -</sect2> - - - <sect2 id="amr"> <title>Kodeki AMR</title> Modified: trunk/DOCS/xml/ru/install.xml ============================================================================== --- trunk/DOCS/xml/ru/install.xml Sat Jan 1 15:27:41 2011 (r32741) +++ trunk/DOCS/xml/ru/install.xml Sat Jan 1 15:40:02 2011 (r32742) @@ -436,40 +436,6 @@ Now rerun <filename>./configure</filenam  -<sect2 id="aac"> -<title>AAC кодек</title> -<para> -AAC (Advanced Audio Coding) - это кодек, иногда обнаруживаемый в MOV и MP4 -файлах. Декодер с открытым исходным кодом, называемый FAAD, доступен с -<ulink url="http://www.audiocoding.com"/>. -<application>MPlayer</application> включает в себя CVS версию libfaad 2.1 beta, поэтому -Вам ничего не нужно дополнительно скачивать. -</para> - -<para> -Если Вы используете gcc 3.2, который не может скомпилировать встроенный FAAD, -или просто хотите использовать внешнюю библиотеку, скачаете её с -<ulink url="http://www.audiocoding.com/download.php">страницы загрузок</ulink> -и укажите <filename>./configure</filename> <option>--enable-faad-external</option>. -Вам не нужен весь faad2, чтобы декодировать AAC файлы, достаточно libfaad. -Вот как Вы можете её собрать: -<screen> -cd faad2/ -sh bootstrap -./configure -cd libfaad -make -make install -</screen> -Бинарники отсутствуют на audiocoding.com, но вы можете скачать (apt-get) Debian -пакеты с <ulink url="http://marillat.free.fr">домашней страницы Christian Marillat</ulink>, -Mandrake RPM'ники с <ulink url="http://plf.zarb.org">P.L.F</ulink> и RedHat RPM'ники -с <ulink url="http://rpm.livna.org/">Livna</ulink>. -</para> -</sect2> - - - <sect2 id="amr"> <title>AMR кодеки</title> <para>

1 0

r32741 - in trunk: Changelog Copyright DOCS/tech/MAINTAINERS DOCS/tech/TODO DOCS/tech/binary-packaging.txt DOCS/xml/en/install.xml DOCS/xml/es/install.xml Makefile configure debian/copyright libfaa...
by diego 01 Jan '11

01 Jan '11

Author: diego Date: Sat Jan 1 15:27:41 2011 New Revision: 32741 Log: Remove forked internal libfaad2 copy. The FFmpeg AAC decoder is default now and surpasses libfaad2 in all regards, so there is no longer a reason to keep a forked library copy. Modified: trunk/DOCS/xml/es/install.xml Changes in other areas also in this revision: Deleted: trunk/libfaad2/ Modified: trunk/Changelog trunk/Copyright trunk/DOCS/tech/MAINTAINERS trunk/DOCS/tech/TODO trunk/DOCS/tech/binary-packaging.txt trunk/DOCS/xml/en/install.xml trunk/Makefile trunk/configure trunk/debian/copyright trunk/libmpcodecs/ad_faad.c trunk/rpm/mplayer.spec Modified: trunk/DOCS/xml/es/install.xml ============================================================================== --- trunk/DOCS/xml/es/install.xml Sat Jan 1 15:06:21 2011 (r32740) +++ trunk/DOCS/xml/es/install.xml Sat Jan 1 15:27:41 2011 (r32741) @@ -653,33 +653,24 @@ tengan el mismo origen. <sect2 id="aac"> <title>AAC</title> <para> -AAC (Codificación Avanzada de Audio) es un codec de audio que algunas veces -se encuentra en archivos MOV y MP4. Un decodificador llamado FAAD de código -abierto está disponible en -<ulink url="http://www.audiocoding.com"/>. -<application>MPlayer</application> incluye libfaad 2.0RC1, por lo que no -necesita obtenerlo por separado. +Un decodificador AAC open source está disponible en +<ulink url="http://www.audiocoding.com/downloads.html"/>. +No hay binarios FAAD2 disponibles en audiocoding.com, pero puede apetegetear paquetes Debian +de <ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>, +paquetes RPM para Mandrake desde la <ulink url="http://plf.zarb.org">P.L.F.</ulink> y RPMs +para Fedora/CentOS/RHEL en <ulink url="http://rpmfusion.org/">RPMFusion</ulink>. </para> - <para> -Si usa gcc 3.2 y falla al compilar nuestro FAAD interno o desea usar la -biblioteca externa por alguna otra razón, descargue la biblioteca desde la -<ulink url="http://www.audiocoding.com/download.php">página de descargas</ulink> -y pase la opción <option>--enable-external-faad</option> a <filename>configure</filename>. -No necesita todo el faad2 para decodificar archivos AAC, libfaad es suficiente. -Constrúyalo como sigue: -<screen>cd faad2/ -chmod +x bootstrap -./bootstrap +Si decide compilar las fuentes, no necesita todoFAAD2 para decodificar archivos AAC, +libfaad es suficiente. Constrúyalo como sigue: +<screen> +cd faad2/ +sh bootstrap ./configure cd libfaad make make install </screen> -No hay binarios disponibles en audiocoding.com, pero puede apetegetear paquetes Debian -desde <ulink url="http://marillat.free.fr">la página personal de Christian Marillat</ulink>, -paquetes RPM para Mandrake desde la <ulink url="http://plf.zarb.org">P.L.F.</ulink> y RPMs -para Red Hat en <ulink url="http://greysector.rangers.eu.org/">Grey Sector</ulink>. </para> </sect2>

1 0