Mercurial > mplayer.hg
changeset 33306:37e215798390
Fix output of "No bind found for key" to actually make sense for
key combinations and match the binding you'd have to add to input.conf
also for these.
Previously the extra keys would end up appended at the end, resulting
in output like
> No bind found for key 'MOUSE_BTN0'.-MOUSE_BTN2
and even worse for some translations.
| author | reimar |
|---|---|
| date | Sat, 07 May 2011 11:11:07 +0000 |
| parents | ddb45e9443ec |
| children | 552f1f7731c8 |
| 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-sk.h help/help_mp-tr.h help/help_mp-zh_CN.h help/help_mp-zh_TW.h input/input.c |
| diffstat | 14 files changed, 20 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/help/help_mp-cs.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-cs.h Sat May 07 11:11:07 2011 +0000 @@ -1422,7 +1422,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg: detekováno 24000/1001 fps progresivní NTSC, přepínám frekvenci snímků.\n" #define MSGTR_CacheFill "\rNaplnění cache: %5.2f%% (%"PRId64" bajtů) " -#define MSGTR_NoBindFound "Tlačítko '%s' nemá přiřazenu žádnou funkci." +#define MSGTR_NoBindFound "Tlačítko '%s' nemá přiřazenu žádnou funkci.\n" #define MSGTR_FailedToOpen "Selhalo otevření %s.\n" #define MSGTR_VideoID "Nalezen video proud [%s], -vid %d\n"
--- a/help/help_mp-de.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-de.h Sat May 07 11:11:07 2011 +0000 @@ -654,7 +654,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg: 24000/1001fps progressiver NTSC-Inhalt erkannt, wechsele Framerate.\n" #define MSGTR_CacheFill "\rFülle Zwischenpuffer: %5.2f%% (%"PRId64" Bytes) " -#define MSGTR_NoBindFound "Bindung für Taste '%s' nicht gefunden." +#define MSGTR_NoBindFound "Bindung für Taste '%s' nicht gefunden.\n" #define MSGTR_FailedToOpen "Konnte '%s' nicht öffnen.\n" #define MSGTR_VideoID "[%s] Videostream gefunden, -vid %d\n"
--- a/help/help_mp-en.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-en.h Sat May 07 11:11:07 2011 +0000 @@ -1440,7 +1440,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg: 24000/1001fps progressive NTSC content detected, switching framerate.\n" #define MSGTR_CacheFill "\rCache fill: %5.2f%% (%"PRId64" bytes) " -#define MSGTR_NoBindFound "No bind found for key '%s'." +#define MSGTR_NoBindFound "No bind found for key '%s'.\n" #define MSGTR_FailedToOpen "Failed to open %s.\n" #define MSGTR_VideoID "[%s] Video stream found, -vid %d\n"
--- a/help/help_mp-es.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-es.h Sat May 07 11:11:07 2011 +0000 @@ -1432,7 +1432,7 @@ #define MSGTR_LeaveTelecineMode "\ndemux_mpg: contenido NTSC de 30000/1001cps detectado, cambiando cuadros por segundo.\n" #define MSGTR_EnterTelecineMode "\ndemux_mpg: contenido NTSC progresivo de 24000/1001cps detectado, cambiando cuadros por segundo.\n" #define MSGTR_CacheFill "\rLlenando cache: %5.2f%% (%"PRId64" bytes) " -#define MSGTR_NoBindFound "No se econtró una asignación para la tecla '%s'" +#define MSGTR_NoBindFound "No se econtró una asignación para la tecla '%s'\n" #define MSGTR_FailedToOpen "No se pudo abrir %s\n" #define MSGTR_VideoID "[%s] Stream de video encontrado, -vid %d\n" #define MSGTR_AudioID "[%s] Stream de audio encontrado, -aid %d\n"
--- a/help/help_mp-fr.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-fr.h Sat May 07 11:11:07 2011 +0000 @@ -628,7 +628,7 @@ #define MSGTR_LeaveTelecineMode "\ndemux_mpg : contenu NTSC 30000/1001fps détecté, ajustement du débit.\n" #define MSGTR_EnterTelecineMode "\ndemux_mpg : contenu NTSC 24000/1001fps progressif détecté, ajustement du débit.\n" #define MSGTR_CacheFill "\rRemplissage du cache : %5.2f%% (%"PRId64" octets) " -#define MSGTR_NoBindFound "Aucune action attachée à la touche '%s'" +#define MSGTR_NoBindFound "Aucune action attachée à la touche '%s'\n" #define MSGTR_FailedToOpen "Échec à l'ouverture de '%s'\n" #define MSGTR_VideoID "[%s] Flux vidéo trouvé, -vid %d\n"
--- a/help/help_mp-hu.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-hu.h Sat May 07 11:11:07 2011 +0000 @@ -1433,7 +1433,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg: 24000/1001fps progresszív NTSC formátumot találtam, frameráta váltás.\n" #define MSGTR_CacheFill "\rCache feltöltés: %5.2f%% (%"PRId64" bájt) " -#define MSGTR_NoBindFound "Nincs semmi sem összerendelve a(z) '%s' gombbal." +#define MSGTR_NoBindFound "Nincs semmi sem összerendelve a(z) '%s' gombbal.\n" #define MSGTR_FailedToOpen "Nem lehet megnyitni: %s.\n" #define MSGTR_VideoID "[%s] Megtalált videó folyam, -vid %d\n"
--- a/help/help_mp-it.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-it.h Sat May 07 11:11:07 2011 +0000 @@ -1429,7 +1429,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg: Rilevato formato NTSC 24000/1001fps progressivo, cambio framerate.\n" #define MSGTR_CacheFill "\rRiempio cache: %5.2f%% (%"PRId64" byte) " -#define MSGTR_NoBindFound "Nessun controllo legato al tasto '%s'." +#define MSGTR_NoBindFound "Nessun controllo legato al tasto '%s'.\n" #define MSGTR_FailedToOpen "Apertura di '%s' fallita.\n" // #define MSGTR_VideoID "[%s] Trovato flusso video, -vid %d\n"
--- a/help/help_mp-pl.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-pl.h Sat May 07 11:11:07 2011 +0000 @@ -596,7 +596,7 @@ // Coś na temat było w encoding-guide.xml albo mencoder.xml #define MSGTR_CacheFill "\rWypełnienie pamięci cache: %5.2f%% (%"PRId64" bajtów) " -#define MSGTR_NoBindFound "Brak akcji dla klawisza '%s'." +#define MSGTR_NoBindFound "Brak akcji dla klawisza '%s'.\n" #define MSGTR_FailedToOpen "Otwieranie %s nie powiodło się.\n" // dec_video.c & dec_audio.c:
--- a/help/help_mp-ru.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-ru.h Sat May 07 11:11:07 2011 +0000 @@ -1423,7 +1423,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg: обнаружено 24000/1001 кадра/сек NTSC содержимое с построчной развёрткой,\nпереключаю частоту кадров.\n" #define MSGTR_CacheFill "\rЗаполнение кэша: %5.2f%% (%"PRId64" байт(а)) " -#define MSGTR_NoBindFound "Не найдена привязка к клавише '%s'." +#define MSGTR_NoBindFound "Не найдена привязка к клавише '%s'.\n" #define MSGTR_FailedToOpen "Не могу открыть %s.\n" #define MSGTR_VideoID "[%s] Найден видео поток, -vid %d\n"
--- a/help/help_mp-sk.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-sk.h Sat May 07 11:11:07 2011 +0000 @@ -580,7 +580,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg: detekovaný 24000/1001 fps progresívny NTSC, prepínam frekvenciu snímkov.\n" #define MSGTR_CacheFill "\rNaplnenie cache: %5.2f%% (%"PRId64" bajtov) " -#define MSGTR_NoBindFound "Tlačidlo '%s' nemá priradenú žiadnu funkciu." +#define MSGTR_NoBindFound "Tlačidlo '%s' nemá priradenú žiadnu funkciu.\n" #define MSGTR_FailedToOpen "Zlyhalo otvorenie %s\n" // dec_video.c & dec_audio.c:
--- a/help/help_mp-tr.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-tr.h Sat May 07 11:11:07 2011 +0000 @@ -636,7 +636,7 @@ #define MSGTR_EnterTelecineMode "\nBulunan içerik demux_mpg: 24000/1001fps progressive NTSC, kare oranı değiştirliyor.\n" #define MSGTR_CacheFill "\rÖnbellek doyumu: %5.2f%% (%"PRId64" bayt) " -#define MSGTR_NoBindFound "'%s' tuşu için bağ bulunamadı " +#define MSGTR_NoBindFound "'%s' tuşu için bağ bulunamadı.\n" #define MSGTR_FailedToOpen "%s açılamadı\n" #define MSGTR_VideoID "[%s] Görüntü akışı bulundu, -vid %d\n"
--- a/help/help_mp-zh_CN.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-zh_CN.h Sat May 07 11:11:07 2011 +0000 @@ -1420,7 +1420,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg：检测到 24000/1001fps 的逐行扫描 NTSC 内容，切换帧率。\n" #define MSGTR_CacheFill "\r缓冲已填充：%5.2f%%（%"PRId64" 字节）" -#define MSGTR_NoBindFound "按键‘%s’未绑定功能。" +#define MSGTR_NoBindFound "按键‘%s’未绑定功能。\n" #define MSGTR_FailedToOpen "未能打开 %s。\n" #define MSGTR_VideoID "[%s] 找到视频流，-vid %d\n"
--- a/help/help_mp-zh_TW.h Sat May 07 10:59:11 2011 +0000 +++ b/help/help_mp-zh_TW.h Sat May 07 11:11:07 2011 +0000 @@ -614,7 +614,7 @@ #define MSGTR_EnterTelecineMode "\ndemux_mpg: 檢測到 24fps 漸進的 NTSC 内容, 改變幀率中。\n" #define MSGTR_CacheFill "\r緩存填充: %5.2f%% (%"PRId64" 字節) " -#define MSGTR_NoBindFound "找不到鍵 '%s' 的鍵綁定。" +#define MSGTR_NoBindFound "找不到鍵 '%s' 的鍵綁定。\n" #define MSGTR_FailedToOpen "打開 %s 失敗。\n" // dec_video.c & dec_audio.c:
--- a/input/input.c Sat May 07 10:59:11 2011 +0000 +++ b/input/input.c Sat May 07 11:11:07 2011 +0000 @@ -1090,13 +1090,14 @@ cmd = mp_input_find_bind_for_key(def_cmd_binds,n,keys); if(cmd == NULL) { - mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_NoBindFound,mp_input_get_key_name(keys[0])); - if(n > 1) { - int s; - for(s=1; s < n; s++) - mp_msg(MSGT_INPUT,MSGL_WARN,"-%s",mp_input_get_key_name(keys[s])); + char key_name[100]; + int i; + av_strlcpy(key_name, mp_input_get_key_name(keys[0]), sizeof(key_name)); + for (i = 1; i < n; i++) { + av_strlcat(key_name, "-", sizeof(key_name)); + av_strlcat(key_name, mp_input_get_key_name(keys[i]), sizeof(key_name)); } - mp_msg(MSGT_INPUT,MSGL_WARN," \n"); + mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_NoBindFound,key_name); return NULL; } if (strcmp(cmd, "ignore") == 0) return NULL;