diff -ur kmidi/TIMIDITY/xaw_i.c kmidi/TIMIDITY/xaw_i.c --- kmidi/TIMIDITY/xaw_i.c 2003-05-07 13:46:49.000000000 +0200 +++ kmidi/TIMIDITY/xaw_i.c 2003-10-03 20:21:50.000000000 +0200 @@ -2670,9 +2670,9 @@ XtNbackingStore,NotUseful,XtNsaveUnder,False, XtNwidth,menu_width, NULL); - snprintf(sbuf,sizeof(sbuf), ": popdownSubmenu(%d) notify() unhighlight()\n\ - : unhighlight()\n\ - : leaveSubmenu(%d) unhighlight()",submenu_n,submenu_n); + snprintf(sbuf,sizeof(sbuf), ": popdownSubmenu(%d) notify() unhighlight()\n"\ + ": unhighlight()\n"\ + ": leaveSubmenu(%d) unhighlight()",submenu_n,submenu_n); XtOverrideTranslations(psmenu[submenu_n],XtParseTranslationTable(sbuf)); tmpw = psmenu[submenu_n++]; psmenu[submenu_n] = NULL; j = 0; @@ -3078,9 +3078,9 @@ #endif "*Command.font: -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*", "*Toggle.font: -adobe-helvetica-medium-o-*-*-12-*-*-*-*-*-*-*", - "*MenuButton.translations:: highlight()\\n\ - : reset()\\n\ - Any: reset() fix-menu() PopupMenu()", + "*MenuButton.translations:: highlight()\\n"\ + ": reset()\\n"\ + "Any: reset() fix-menu() PopupMenu()", "*menu_box.borderWidth: 0", "*button_box.borderWidth: 0", "*button_box.horizDistance: 4", @@ -3177,8 +3177,8 @@ #ifndef WIDGET_IS_LABEL_WIDGET "*lyric_text.height: 120", "*lyric_text.scrollVertical: WhenNeeded", - "*lyric_text.translations: #override\\n\ - : do-deltext()", + "*lyric_text.translations: #override\\n"\ + ": do-deltext()", #else "*lyric_text.height: 30", "*lyric_text.label: MessageWindow", @@ -3230,33 +3230,33 @@ "*time_label.font: -adobe-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*", "*BitmapDir: " XAW_BITMAP_DIR "/", #ifdef XAW3D - "*volume_bar.translations: #override\\n\ - ~Ctrl Shift: do-volupdown(-50)\\n\ - ~Ctrl Shift: do-volupdown(50)\\n\ - Ctrl ~Shift: do-volupdown(-5)\\n\ - Ctrl ~Shift: do-volupdown(5)\\n\ - : MoveThumb()\\n\ - : NotifyScroll(FullLength) EndScroll()", - "*tune_bar.translations: #override\\n\ - : do-tuneset()\\n\ - : do-tuneslide()\\n\ - : MoveThumb()\\n\ - : NotifyScroll(FullLength) EndScroll()", + "*volume_bar.translations: #override\\n"\ + "~Ctrl Shift: do-volupdown(-50)\\n"\ + "~Ctrl Shift: do-volupdown(50)\\n"\ + "Ctrl ~Shift: do-volupdown(-5)\\n"\ + "Ctrl ~Shift: do-volupdown(5)\\n"\ + ": MoveThumb()\\n"\ + ": NotifyScroll(FullLength) EndScroll()", + "*tune_bar.translations: #override\\n"\ + ": do-tuneset()\\n"\ + ": do-tuneslide()\\n"\ + ": MoveThumb()\\n"\ + ": NotifyScroll(FullLength) EndScroll()", #else - "*volume_bar.translations: #override\\n\ - ~Ctrl Shift: do-volupdown(-50)\\n\ - ~Ctrl Shift: do-volupdown(50)\\n\ - Ctrl ~Shift: do-volupdown(-5)\\n\ - Ctrl ~Shift: do-volupdown(5)\\n\ - : StartScroll(Forward) MoveThumb()\\n\ - : StartScroll(Backward) MoveThumb()\\n\ - : NotifyScroll(FullLength) EndScroll()", - "*tune_bar.translations: #override\\n\ - : do-tuneset()\\n\ - : do-tuneslide()\\n\ - : StartScroll(Forward) MoveThumb()\\n\ - : StartScroll(Backward) MoveThumb()\\n\ - : NotifyScroll(FullLength) EndScroll()", + "*volume_bar.translations: #override\\n"\ + "~Ctrl Shift: do-volupdown(-50)\\n"\ + "~Ctrl Shift: do-volupdown(50)\\n"\ + "Ctrl ~Shift: do-volupdown(-5)\\n"\ + "Ctrl ~Shift: do-volupdown(5)\\n"\ + ": StartScroll(Forward) MoveThumb()\\n"\ + ": StartScroll(Backward) MoveThumb()\\n"\ + ": NotifyScroll(FullLength) EndScroll()", + "*tune_bar.translations: #override\\n"\ + ": do-tuneset()\\n"\ + ": do-tuneslide()\\n"\ + ": StartScroll(Forward) MoveThumb()\\n"\ + ": StartScroll(Backward) MoveThumb()\\n"\ + ": NotifyScroll(FullLength) EndScroll()", #endif "*file_simplemenu.load.label: Load (Meta-N)", "*file_simplemenu.saveconfig.label: Save Config (Meta-S)", @@ -3285,92 +3285,92 @@ "*chpressure_box.chpressure_lbl.label: Channel Pressure control", "*overlapvoice_box.overlapv_lbl.label: Allow Multiple Same Notes", "*txtmeta_box.txtmeta_lbl.label: Tracing All Text Meta Events", - "*base_form.translations: #override\\n\ - ~Ctrl Metan: do-load()\\n\ - ~Ctrl Metas: do-menu(" IDS_SAVECONFIG ")\\n\ - Ctrl r: do-menu(" IDS_REPEAT ")\\n\ - Ctrl s: do-menu(" IDS_SHUFFLE ")\\n\ - Ctrlt: do-menu(" IDS_HIDETRACE ")\\n\ - Ctrlm: do-menu(" IDS_HIDETXT ")\\n\ - ~Ctrlq: do-quit()\\n\ - ~Ctrlr: do-play()\\n\ - Return: do-play()\\n\ - KP_Enter: do-play()\\n\ - ~Ctrlg: do-sndspec()\\n\ - ~Ctrlspace: do-pause()\\n\ - ~Ctrls: do-stop()\\n\ - p: do-prev()\\n\ - Left: do-prev()\\n\ - ~Metan: do-next()\\n\ - Right: do-next()\\n\ - ~Ctrlf: do-forward()\\n\ - ~Ctrlb: do-back()\\n\ - ~Ctrlplus: do-key()\\n\ - ~Shift-: do-key(1)\\n\ - KP_Add: do-key()\\n\ - KP_Subtract: do-key(1)\\n\ - ~Ctrlgreater: do-speed()\\n\ - ~Ctrlless: do-speed(1)\\n\ - ~Ctrl ~Shifto: do-voice()\\n\ - ~Ctrl Shifto: do-voice(1)\\n\ - Ctrlo: do-options()\\n\ - Ctrlf: do-filelist()\\n\ - l: do-filelist()\\n\ - a: do-about()\\n\ - ~Ctrl ~Shiftv: do-volupdown(-10)\\n\ - ~Ctrl Shiftv: do-volupdown(10)\\n\ - Down: do-volupdown(-10)\\n\ - Up: do-volupdown(10)\\n\ - ~Ctrlx: do-exchange()\\n\ - ~Ctrlt: do-toggletrace()\\n\ - : do-resize()", - - "*load_dialog.value.translations: #override\\n\ - ~CtrlReturn: do-chgdir() end-of-line()\\n\ - ~CtrlKP_Enter: do-chgdir() end-of-line()\\n\ - ~Ctrl ~MetaTab: do-complete() end-of-line()\\n\ - Ctrl ~Shiftg: do-dialog-button(1)\\n\ - BackSpace: do-backspace() delete-previous-character()\\n\ - Delete: do-backspace() delete-previous-character()\\n\ - CtrlH: do-backspace() delete-previous-character()\\n\ - Escape: do-dialog-button(1)", - "*trace.translations: #override\\n\ - : do-toggletrace()\\n\ - : do-revcaption()\\n\ - : do-revcaption()\\n\ - : draw-trace()", - "*time_label.translations: #override\\n\ - : do-menu(" IDS_HIDETRACE ")\\n\ - : do-exchange()", - "*popup_optbox.translations: #override\\n\ - ~Ctrlc: do-closeparent()\\n\ - ~Ctrlq: do-quit()", - "*popup_fbox.translations: #override\\n\ - ~Ctrlc: do-closeparent()\\n\ - Up: do-flistmove(-1)\\n\ - p: do-flistmove(-1)\\n\ - Prior: do-flistmove(-5)\\n\ - Right: do-flistmove(-5)\\n\ - ~Ctrlr: do-fselect()\\n\ - Return: do-fselect()\\n\ - KP_Enter: do-fselect()\\n\ - Ctrlm: do-fselect()\\n\ - space: do-pause()\\n\ - s: do-stop()\\n\ - Down: do-flistmove(1)\\n\ - n: do-flistmove(1)\\n\ - Next: do-flistmove(5)\\n\ - Left: do-flistmove(5)\\n\ - d: do-fdelete()\\n\ - ~Shiftv: do-volupdown(-10)\\n\ - Shiftv: do-volupdown(10)\\n\ - ~Ctrlf: do-forward()\\n\ - ~Ctrlb: do-back()\\n\ - ~Ctrlq: do-quit()", - "*popup_abox.translations: #override\\n\ - ~Ctrlc: do-closeparent()\\n\ - KP_Enter: do-closeparent()\\n\ - Return: do-closeparent()", + "*base_form.translations: #override\\n"\ + "~Ctrl Metan: do-load()\\n"\ + "~Ctrl Metas: do-menu(" IDS_SAVECONFIG ")\\n"\ + "Ctrl r: do-menu(" IDS_REPEAT ")\\n"\ + "Ctrl s: do-menu(" IDS_SHUFFLE ")\\n"\ + "Ctrlt: do-menu(" IDS_HIDETRACE ")\\n"\ + "Ctrlm: do-menu(" IDS_HIDETXT ")\\n"\ + "~Ctrlq: do-quit()\\n"\ + "~Ctrlr: do-play()\\n"\ + "Return: do-play()\\n"\ + "KP_Enter: do-play()\\n"\ + "~Ctrlg: do-sndspec()\\n"\ + "~Ctrlspace: do-pause()\\n"\ + "~Ctrls: do-stop()\\n"\ + "p: do-prev()\\n"\ + "Left: do-prev()\\n"\ + "~Metan: do-next()\\n"\ + "Right: do-next()\\n"\ + "~Ctrlf: do-forward()\\n"\ + "~Ctrlb: do-back()\\n"\ + "~Ctrlplus: do-key()\\n"\ + "~Shift-: do-key(1)\\n"\ + "KP_Add: do-key()\\n"\ + "KP_Subtract: do-key(1)\\n"\ + "~Ctrlgreater: do-speed()\\n"\ + "~Ctrlless: do-speed(1)\\n"\ + "~Ctrl ~Shifto: do-voice()\\n"\ + "~Ctrl Shifto: do-voice(1)\\n"\ + "Ctrlo: do-options()\\n"\ + "Ctrlf: do-filelist()\\n"\ + "l: do-filelist()\\n"\ + "a: do-about()\\n"\ + "~Ctrl ~Shiftv: do-volupdown(-10)\\n"\ + "~Ctrl Shiftv: do-volupdown(10)\\n"\ + "Down: do-volupdown(-10)\\n"\ + "Up: do-volupdown(10)\\n"\ + "~Ctrlx: do-exchange()\\n"\ + "~Ctrlt: do-toggletrace()\\n"\ + ": do-resize()", + + "*load_dialog.value.translations: #override\\n"\ + "~CtrlReturn: do-chgdir() end-of-line()\\n"\ + "~CtrlKP_Enter: do-chgdir() end-of-line()\\n"\ + "~Ctrl ~MetaTab: do-complete() end-of-line()\\n"\ + "Ctrl ~Shiftg: do-dialog-button(1)\\n"\ + "BackSpace: do-backspace() delete-previous-character()\\n"\ + "Delete: do-backspace() delete-previous-character()\\n"\ + "CtrlH: do-backspace() delete-previous-character()\\n"\ + "Escape: do-dialog-button(1)", + "*trace.translations: #override\\n"\ + ": do-toggletrace()\\n"\ + ": do-revcaption()\\n"\ + ": do-revcaption()\\n"\ + ": draw-trace()", + "*time_label.translations: #override\\n"\ + ": do-menu(" IDS_HIDETRACE ")\\n"\ + ": do-exchange()", + "*popup_optbox.translations: #override\\n"\ + "~Ctrlc: do-closeparent()\\n"\ + "~Ctrlq: do-quit()", + "*popup_fbox.translations: #override\\n"\ + "~Ctrlc: do-closeparent()\\n"\ + "Up: do-flistmove(-1)\\n"\ + "p: do-flistmove(-1)\\n"\ + "Prior: do-flistmove(-5)\\n"\ + "Right: do-flistmove(-5)\\n"\ + "~Ctrlr: do-fselect()\\n"\ + "Return: do-fselect()\\n"\ + "KP_Enter: do-fselect()\\n"\ + "Ctrlm: do-fselect()\\n"\ + "space: do-pause()\\n"\ + "s: do-stop()\\n"\ + "Down: do-flistmove(1)\\n"\ + "n: do-flistmove(1)\\n"\ + "Next: do-flistmove(5)\\n"\ + "Left: do-flistmove(5)\\n"\ + "d: do-fdelete()\\n"\ + "~Shiftv: do-volupdown(-10)\\n"\ + "Shiftv: do-volupdown(10)\\n"\ + "~Ctrlf: do-forward()\\n"\ + "~Ctrlb: do-back()\\n"\ + "~Ctrlq: do-quit()", + "*popup_abox.translations: #override\\n"\ + "~Ctrlc: do-closeparent()\\n"\ + "KP_Enter: do-closeparent()\\n"\ + "Return: do-closeparent()", NULL, }; XtAppContext app_con; diff -ur krec/main.cpp krec/main.cpp --- krec/main.cpp 2002-09-07 02:12:08.000000000 +0200 +++ krec/main.cpp 2003-10-03 20:35:49.000000000 +0200 @@ -30,11 +30,11 @@ using namespace std; static const char *description = - I18N_NOOP("Description for KRec.\n\n\ -This is a recording tool for KDE.\n\ -It uses aRts, just look at the audiomanager\n\ -and you will find it there accepting sound\n\ -for recording." + I18N_NOOP("Description for KRec.\n\n"\ +"This is a recording tool for KDE.\n"\ +"It uses aRts, just look at the audiomanager\n"\ +"and you will find it there accepting sound\n"\ +"for recording." ); static KCmdLineOptions options[] = diff -ur mpeglib/lib/tplay/au.cpp mpeglib/lib/tplay/au.cpp --- mpeglib/lib/tplay/au.cpp 2000-07-04 21:22:46.000000000 +0200 +++ mpeglib/lib/tplay/au.cpp 2003-10-03 22:45:10.924746440 +0200 @@ -31,8 +31,8 @@ channels = read_big_endian_long(buffer + 0x14); #ifdef DEBUG - printf("Sun audio file.\nspeed: %ld, start: %ld, end: %ld, \ -encoding: %X, channels: %ld\n", + printf("Sun audio file.\nspeed: %ld, start: %ld, end: %ld, "\ +"encoding: %X, channels: %ld\n", speed, start, end, encoding, channels); fflush(stdout); #endif @@ -61,8 +61,8 @@ die("64-bit IEEE floating point Sun audio file not supported"); break; case 23: - die("8-bit ISDN u-law compressed(G.721 ADPCM) Sun audio file \ -not supported"); + die("8-bit ISDN u-law compressed(G.721 ADPCM) Sun audio file "\ +"not supported"); break; default: errdie("Unknown Sun audio file");