summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/help_mp-cs.h2
-rw-r--r--help/help_mp-de.h2
-rw-r--r--help/help_mp-en.h2
-rw-r--r--help/help_mp-es.h2
-rw-r--r--help/help_mp-fr.h2
-rw-r--r--help/help_mp-hu.h2
-rw-r--r--help/help_mp-it.h2
-rw-r--r--help/help_mp-pl.h2
-rw-r--r--help/help_mp-ru.h2
-rw-r--r--help/help_mp-tr.h2
-rw-r--r--help/help_mp-zh_CN.h2
-rw-r--r--help/help_mp-zh_TW.h2
-rw-r--r--libmenu/menu_console.c4
13 files changed, 14 insertions, 14 deletions
diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h
index 32a1669bb7..e9d8febf26 100644
--- a/help/help_mp-cs.h
+++ b/help/help_mp-cs.h
@@ -1573,7 +1573,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-de.h b/help/help_mp-de.h
index 6fab9e10e4..633a6e47c8 100644
--- a/help/help_mp-de.h
+++ b/help/help_mp-de.h
@@ -1634,7 +1634,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 93a61a4a38..1d08fb2810 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -1596,7 +1596,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index 982f0967af..d1cdb7a55d 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -1568,7 +1568,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h
index 441dd264ca..1a12f6d078 100644
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@@ -1565,7 +1565,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h
index c3c09d50c5..3316e20089 100644
--- a/help/help_mp-hu.h
+++ b/help/help_mp-hu.h
@@ -1595,7 +1595,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index 7ac8d71e28..5e67ad331c 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -1593,7 +1593,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h
index 5dec0f9e0b..8c6867b8a4 100644
--- a/help/help_mp-pl.h
+++ b/help/help_mp-pl.h
@@ -1476,7 +1476,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h
index 880f86bcd2..4a9dcc8a3b 100644
--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@@ -1707,7 +1707,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h
index 76b9f66d0a..8b4f9be437 100644
--- a/help/help_mp-tr.h
+++ b/help/help_mp-tr.h
@@ -1465,7 +1465,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h
index d52ff719f7..69b13b4334 100644
--- a/help/help_mp-zh_CN.h
+++ b/help/help_mp-zh_CN.h
@@ -1588,7 +1588,7 @@ static char help_text[]=
// 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"
diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h
index f738d35127..62bc7736f6 100644
--- a/help/help_mp-zh_TW.h
+++ b/help/help_mp-zh_TW.h
@@ -1573,7 +1573,7 @@ static char help_text[]=
// 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"
diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c
index a6788dd682..c29062a7d8 100644
--- a/libmenu/menu_console.c
+++ b/libmenu/menu_console.c
@@ -255,7 +255,7 @@ static void check_child(menu_t* menu) {
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 @@ static void check_child(menu_t* menu) {
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);