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 (2011-05-07) |
| 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;