Mercurial > mplayer.hg
changeset 23871:426c20bcfddf
typo fix: childs --> children
| author | diego |
|---|---|
| date | Sat, 28 Jul 2007 14:27:04 +0000 |
| parents | f8b5286f1df6 |
| children | 4d936284a5ec |
| files | 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-ru.h help/help_mp-tr.h help/help_mp-zh_CN.h help/help_mp-zh_TW.h libmenu/menu_console.c |
| diffstat | 13 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/help/help_mp-cs.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-cs.h Sat Jul 28 14:27:04 2007 +0000 @@ -1573,7 +1573,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Chyba při čekání na PID: %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Chyba výběru.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Chyba čtení na popisovači souboru potomka: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Chyba čtení na popisovači souboru potomka: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Spuštění v konsoli: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Potomek už běží.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Forkování selhalo!!!\n"
--- a/help/help_mp-de.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-de.h Sat Jul 28 14:27:04 2007 +0000 @@ -1634,7 +1634,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Waitpid-Fehler: %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Fehler bei der Auswahl.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Lesefehler bei child-Dateideskriptor: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Lesefehler bei child-Dateideskriptor: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Konsolenaufruf: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Es läuft schon ein Child.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Fork fehlgeschlagen!!!\n"
--- a/help/help_mp-en.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-en.h Sat Jul 28 14:27:04 2007 +0000 @@ -1596,7 +1596,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Waitpid error: %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Select error.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Read error on child's file descriptor: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Read error on child's file descriptor: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Console run: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] A child is already running.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Fork failed !!!\n"
--- a/help/help_mp-es.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-es.h Sat Jul 28 14:27:04 2007 +0000 @@ -1568,7 +1568,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Error Waitpid: %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Error en Select.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Error de lectura en el descriptor de archivo hijo: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Error de lectura en el descriptor de archivo hijo: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Consola corriendo: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Ya hay un hijo/child corriendo.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Falló el Fork!!!\n"
--- a/help/help_mp-fr.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-fr.h Sat Jul 28 14:27:04 2007 +0000 @@ -1565,7 +1565,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Erreur attente identificateur processus : %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Erreur sélection.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Erreur lecture sur processus enfant : %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Erreur lecture sur processus enfant : %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Console run : %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Processus enfant déjà en cours.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Échec branchement !!!\n"
--- a/help/help_mp-hu.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-hu.h Sat Jul 28 14:27:04 2007 +0000 @@ -1595,7 +1595,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Waitpid hiba: %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Kiválasztási hiba.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Olvasási hiba a gyerek fájlleírójában: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Olvasási hiba a gyerek fájlleírójában: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Konzol futtatás: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Egy gyermek már fut.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Fork sikertelen !!!\n"
--- a/help/help_mp-it.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-it.h Sat Jul 28 14:27:04 2007 +0000 @@ -1593,7 +1593,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Errore di attesa pid: %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Errore di selezione.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Errore di lettura sul descrittore file del processo figlio: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Errore di lettura sul descrittore file del processo figlio: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Esecuzione in console: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Un processo figlio è già in esecuzione.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Fork fallito !!!\n"
--- a/help/help_mp-pl.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-pl.h Sat Jul 28 14:27:04 2007 +0000 @@ -1476,7 +1476,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] błąd waitpid: %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Błąd wyboru.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Błąd odczytu deskryptora pliku potomnego: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Błąd odczytu deskryptora pliku potomnego: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Uruchom: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Proces potomny już działa.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Fork nie powiodło się !!!\n"
--- a/help/help_mp-ru.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-ru.h Sat Jul 28 14:27:04 2007 +0000 @@ -1707,7 +1707,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[МЕНЮ] Ошибка вызова waitpid: %s.\n" #define MSGTR_LIBMENU_SelectError "[МЕНЮ] Ошибка вызова select.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[МЕНЮ] Ошибка чтения дочернего файлового описателя: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[МЕНЮ] Ошибка чтения дочернего файлового описателя: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[МЕНЮ] Запуск консоли: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[МЕНЮ] Дочерний процесс уже запущен.\n" #define MSGTR_LIBMENU_ForkFailed "[МЕНЮ] Вызов fork не удался !!!\n"
--- a/help/help_mp-tr.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-tr.h Sat Jul 28 14:27:04 2007 +0000 @@ -1465,7 +1465,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Waitpid hatası: %s.\n" #define MSGTR_LIBMENU_SelectError "[MENU] Seçim hatası.\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] Alt süreçte okuma hatası: %s.\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] Alt süreçte okuma hatası: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Console işlemi: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Bir alt süreç zaten çalışıyor.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Çatallama başarısız !!!\n"
--- a/help/help_mp-zh_CN.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-zh_CN.h Sat Jul 28 14:27:04 2007 +0000 @@ -1588,7 +1588,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Waitpid 错误: %s。\n" #define MSGTR_LIBMENU_SelectError "[MENU] Select 错误。\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] 子进程的文件描述符读取错误: %s。\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] 子进程的文件描述符读取错误: %s。\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] 终端运行: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] 子进程已经运行。\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Fork 失败!!!\n"
--- a/help/help_mp-zh_TW.h Sat Jul 28 14:23:18 2007 +0000 +++ b/help/help_mp-zh_TW.h Sat Jul 28 14:27:04 2007 +0000 @@ -1573,7 +1573,7 @@ // libmenu/menu_console.c #define MSGTR_LIBMENU_WaitPidError "[MENU] Waitpid 錯誤: %s。\n" #define MSGTR_LIBMENU_SelectError "[MENU] Select 錯誤。\n" -#define MSGTR_LIBMENU_ReadErrorOnChilds "[MENU] 子進程的文件描述符讀取錯誤: %s。\n" +#define MSGTR_LIBMENU_ReadErrorOnChildren "[MENU] 子進程的文件描述符讀取錯誤: %s。\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] 終端運行: %s ...\n" #define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] 子進程已經運行。\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Fork 失敗!!!\n"
--- a/libmenu/menu_console.c Sat Jul 28 14:23:18 2007 +0000 +++ b/libmenu/menu_console.c Sat Jul 28 14:27:04 2007 +0000 @@ -255,7 +255,7 @@ if(r == 0) { r = waitpid(mpriv->child,&child_status,WNOHANG); if(r < 0){ - if(errno==ECHILD){ ///exiting childs get handled in mplayer.c + if(errno==ECHILD){ ///exiting children get handled in mplayer.c for(i = 0 ; i < 3 ; i++) close(mpriv->child_fd[i]); mpriv->child = 0; @@ -275,7 +275,7 @@ if(w) mpriv->add_line = 1; r = read(mpriv->child_fd[i],buffer,255); if(r < 0) - mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_ReadErrorOnChilds, i == 1 ? "stdout":"stderr"); + mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_ReadErrorOnChildren, i == 1 ? "stdout":"stderr"); else if(r>0) { buffer[r] = '\0'; add_string(mpriv,buffer);