diff -urN soundtracker-0.5.0/AUTHORS soundtracker-0.5.1/AUTHORS --- soundtracker-0.5.0/AUTHORS Mon Mar 13 13:49:07 2000 +++ soundtracker-0.5.1/AUTHORS Sat Mar 25 11:30:29 2000 @@ -9,9 +9,11 @@ ============== Niklas Beisert -Tammo Hinrichs +Tammo Hinrichs (xm-player.c derived from OpenCP-kb980717) Check out: http://www.cubic.org/player/ +Tammo Hinrichs + Assembly code for kb-x86 mixer The GIMP Team (tips-dialog.c from the GIMP) Simon Kågedal @@ -20,8 +22,6 @@ (recode.c derived from the recode-3.4.1 package) Free Software Foundation, Inc. (poll.c quickly c&p'ed from libc-5.4.46 source) -The LibMikMod Team - (reverb code. ripped and hacked a bit by giles) Fredrik Huss (XM cheat sheet from ft2 archive) @@ -29,8 +29,6 @@ Contributions ============== -Giles Constant - (added player effects/master reverb) Jon Forsberg (bug fix in keys.c) Arthibus Gissehel @@ -53,8 +51,9 @@ (the SoundTracker logo) Conrad Parker ("Reverse" function in sample editor; bug fixes) -Tomasz Maka - ("Save region" function, insert / delete row stuff) +Tomasz Maka + ("Save region" function, insert / delete row stuff, + status bar, timer) Nicolas Leveille (track editor IT-style stuff) Jason Nunn @@ -77,3 +76,5 @@ (es) Michael Shigorin (ru) +Saïd Bougribate + (fr) diff -urN soundtracker-0.5.0/ChangeLog soundtracker-0.5.1/ChangeLog --- soundtracker-0.5.0/ChangeLog Mon Mar 13 14:02:00 2000 +++ soundtracker-0.5.1/ChangeLog Sat Mar 25 11:30:45 2000 @@ -1,3 +1,46 @@ +2000-03-25 Michael Krause + + * Released v0.5.1 + + * po: Updated it.po. Added fr.po from Saïd Bougribate + . + + * app/instrument-editor.c (instrument_editor_update): Disable + "Save XI" button if no instrument loaded. + + * app/sample-editor.c: Remove all references to + mixer_sample_word_length(). Assume 16bit. + + * app/sample-editor.c (sample_editor_reverse_clicked): Don't + access sample pointed to by sample end, only the one before. + + * app/menubar.c: Added "Tracker" submenu to "Settings" menu, + containing the 'cycle font' functions. + + * app/tracker-settings.[ch]: Tracker font selection - you can fill + a list with your favourite fonts and then cycle through them with + Keypad-Plus/Minus from within the tracker. You should use only + fixed-width fonts for now.. + +2000-03-22 Michael Krause + + * Applied patch from Tomasz Maka for status + bar, timer, "show zeroes" and "channel numbering" options. + +2000-03-19 Michael Krause + + * app/mixers/kb-x86.c (kb_x86_mix_sub): Optimizing for the + non-filtered case. Gives a speed-up of roughly 15% on plain XMs. + I expected more, though :) + + * app/mixers/kb-x86-asm.S: Created a big 'gasp' macro which can + generate various versions of the mixer core routine without having + to c'n'p eight different versions. + +2000-03-14 Michael Krause + + * po: Updated ja.po. + 2000-03-13 Michael Krause * Released v0.5.0 diff -urN soundtracker-0.5.0/FAQ soundtracker-0.5.1/FAQ --- soundtracker-0.5.0/FAQ Mon Mar 13 13:57:32 2000 +++ soundtracker-0.5.1/FAQ Sat Mar 25 10:14:44 2000 @@ -68,3 +68,14 @@ it to edit any module format, it just needs tuning and (of course) a new player routine. But this is not in scope for Version 1.0 of SoundTracker. + +------------------------------------------------------------------------ + +QQQQ: The tempo and BPM buttons don't update when I use the Fxx command +in a pattern. + +a: This is intentional. Using these two buttons, you set up the +default tempo and BPM values that are stored in the module. They are +used to initialize the player at the beginning of the song! Of course +you can also put two Fxx commands into the first pattern, in that case +those two buttons get useless of course. diff -urN soundtracker-0.5.0/Makefile.am soundtracker-0.5.1/Makefile.am --- soundtracker-0.5.0/Makefile.am Wed Jan 26 18:27:29 2000 +++ soundtracker-0.5.1/Makefile.am Wed Mar 15 21:02:34 2000 @@ -36,4 +36,6 @@ cp soundtracker-$(VERSION)-bin.tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.3/ rpm -tb soundtracker-$(VERSION).tar.gz cp /usr/src/redhat/RPMS/i386/soundtracker-$(VERSION)-* /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.3/ - chown rawstyle.rawstyle /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.3/* + chown -R rawstyle.rawstyle /home/rawstyle/dev/soundtracker/* + + diff -urN soundtracker-0.5.0/Makefile.in soundtracker-0.5.1/Makefile.in --- soundtracker-0.5.0/Makefile.in Mon Mar 13 14:06:36 2000 +++ soundtracker-0.5.1/Makefile.in Sat Mar 25 11:35:09 2000 @@ -427,7 +427,7 @@ cp soundtracker-$(VERSION)-bin.tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.3/ rpm -tb soundtracker-$(VERSION).tar.gz cp /usr/src/redhat/RPMS/i386/soundtracker-$(VERSION)-* /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.3/ - chown rawstyle.rawstyle /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.3/* + chown -R rawstyle.rawstyle /home/rawstyle/dev/soundtracker/* # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN soundtracker-0.5.0/NEWS soundtracker-0.5.1/NEWS --- soundtracker-0.5.0/NEWS Mon Mar 13 14:02:17 2000 +++ soundtracker-0.5.1/NEWS Sat Mar 25 11:32:38 2000 @@ -1,6 +1,20 @@ -(This file lists only major user-visible changes; the ChangeLog file -contains more details) +This file lists only major user-visible changes; the ChangeLog file +contains more details. Letters in parentheses indicate the person +responsible for having coded a particular feature (full names in +AUTHORS file). + +What is new in soundtracker-0.5.1 (25-Mar-2000): + +* Status bar with online tracker command help and a + playing time display (tmaka) +* Tracker can optionally show hyphens instead of zeroes (tmaka) +* Channel numbering can be switched off (tmaka) +* Font selection for the Tracker widget - you can fill + a list with your favourite fonts and then cycle through them with + Keypad-Plus/Minus from within the tracker. +* Mixer is 15% faster (when not using filters) +* French translation (sboug) What is new in soundtracker-0.5.0 (13-Mar-2000): diff -urN soundtracker-0.5.0/README soundtracker-0.5.1/README --- soundtracker-0.5.0/README Mon Mar 13 13:57:33 2000 +++ soundtracker-0.5.1/README Sat Mar 25 11:08:30 2000 @@ -4,7 +4,7 @@ http://www.soundtracker.org/ -------------------------------------------------------------- - v0.5.0 --- THIS IS A DEVELOPMENT VERSION! + v0.5.1 --- THIS IS A DEVELOPMENT VERSION! Written and (C) 1998-2000 by Michael Krause [ raw style / lego ] @@ -62,6 +62,7 @@ Right WinMenu Key Just play current pattern row Right Shift Record (Play Pattern & Edit On) -- not yet! Space Stop Playing; edit mode on/off +Escape Edit mode on/off without stopping playing Shift - Space Toggle "jazz edit" mode F1 ... F7 Change editing octave diff -urN soundtracker-0.5.0/TODO soundtracker-0.5.1/TODO --- soundtracker-0.5.0/TODO Mon Mar 13 13:56:53 2000 +++ soundtracker-0.5.1/TODO Sat Mar 25 11:14:59 2000 @@ -1,6 +1,15 @@ things to do and known bugs (in no particular order) ------------------------------------------------------- +"enable/disable status bar" feature; + +make gnome status bar movable, like the menu bar + +call gtk_main() or something after status bar updating, so that while +loading modules/samples the status bar actually changes... + +trackersettings -> tracker_settings + > press CAPSLOCK or something, to enter "hex chooser mode" > type A3 or B0 or 45 or whatever the 2-digit hex code is for your sample > program automatically leaves hexmode and functions return to normal. @@ -31,6 +40,10 @@ ====== GUI ========= +> * 'Delete' and 'Rename' functions in File page. +> * Settings dialog for 'Render WAV' (begin postion, end position, +> amplification, WAV frequency, etc.) + in tokdar.xm in sample editor und dann die samples bis zur fünf von hand weiterschalten (Ctrl-left) KDE link file from Paul Buhr @@ -53,8 +66,6 @@ space-bar -> keyboard configuration -status bar (indicates loading and playing and tracker columns) - delink / link tab!!! MAIN WINDOW "CONTROL PANEL": the scopes must be able to be replaced by @@ -76,18 +87,16 @@ SAMPLE EDITOR: "play selection" button. (don't loop the sample then) -GUI / MIXER: when window is hidden, deactivate the scopes computation -in the mixer - GUI: alternative scope (rgb box or something) GUI-SETTINGS / TRACKER: h <-> b GNOME / AUTOMAKE: Use official gnome macros instead of the xchat -configure.in code (arghl, cf. gnome-libs-2 proposal) +configure.in code (but that sucks, since it's so much, +cf. gnome-libs-2 proposal) SAMPLE EDITOR: lowpass / highpass / bandpass, mix two samples, -down/upsample functions. +resampling functions. SAMPLE EDITOR: needs some serious re-design (i mean the gui). @@ -109,20 +118,7 @@ LOGO: add it somewhere -SAMPLE EDITOR: sample loader / saver: check if the (width == 8 -> -modifysample) code is correct. well, no need to check: it isn't. but -find a nicer way. "for now, it works" :-) also, check the -virtualbyteorder stuff. - -> - octave change - it should be configurable to change octave with -> F-keys or with "/","*" ("/" octave down, "*" octave up), and to -> switch editors with F-keys (F2 tracker, F3 instrument editor, F4 sample -> editor... - just like good old Scream Tracker). It's sometimes more -> comfortable to use Scream Tracker approach to keyboard :) -> Wasting all F-keys for octaves is not The Good Thing. - -> - editor should be colourful (customize colors of samples, commands.. and -> fonts) +> - editor should be colourful (customize colors of samples, commands) MIXER POSITION / CLIPPING INDICATOR: update more often @@ -143,26 +139,6 @@ some kind of undo, especially for block operations -> One first 'easy' extension to the soundtracker widget would be to add a -> status bar like the one that exists in buzz.. It's a quite neat feature, -> when your cursor is on a column, it describes the column: -> -> cursor -> v -> ... |. ... ... .. 3|.. -> -> status bar: -> [ volume ] [ portamento ] -> -> -N.Leveille (Knos) - -> Displaying all zeroes instead of blank spaces makes it -> harder to read the tracks... - -> You should re-design gui for some new features in sample editor, -> it would be great to see status line in main window and some shortcuts -> to switch between notebook pages. -> For example: > ctrl+d - file requester > ctrl+t - tracker > ctrl+i - instrument editor @@ -183,6 +159,13 @@ > a number of keys either to play the current pattern, the song, or the > song starting from the current pattern +> - octave change - it should be configurable to change octave with +> F-keys or with "/","*" ("/" octave down, "*" octave up), and to +> switch editors with F-keys (F2 tracker, F3 instrument editor, F4 sample +> editor... - just like good old Scream Tracker). It's sometimes more +> comfortable to use Scream Tracker approach to keyboard :) +> Wasting all F-keys for octaves is not The Good Thing. + ====== PLAYER / LOADER ======== @@ -237,9 +220,6 @@ ch.fx=xfxRowVolSlideDown; ch.chFinalVol=ch.chVol=volrange(ch.chVol-ch.chFineVolSlideDVal); -für jedes neue instrument einen neuen kanal aufmachen und den anderen -ausfaden lassen. - ====== MIXER ====== @@ -259,14 +239,10 @@ muß declicking das volume-ramping weiterführen? muß stattdessen nicht der exponentielle abfall kommen? -kb-x86-asm.S: use "unfiltered" versions of the routines as well in -case the filter is inactive. - -kb-x86-asm.S should use macros instead of copy'n'paste to generate the -various mixer routines.. - st_mixer_info->data should be a gint16*! rewrite all void* arithmetic.. remove current_word_length + +wenn ein neues sample ein altes ablöst, das alte declicken! diff -urN soundtracker-0.5.0/app/Makefile.am soundtracker-0.5.1/app/Makefile.am --- soundtracker-0.5.0/app/Makefile.am Sat Feb 19 13:59:17 2000 +++ soundtracker-0.5.1/app/Makefile.am Sun Mar 19 10:11:15 2000 @@ -35,6 +35,7 @@ tips-dialog.c tips-dialog.h \ track-editor.c track-editor.h \ tracker.c tracker.h \ + tracker-settings.c tracker-settings.h \ transposition.c transposition.h \ xm.c xm.h \ xm-player.c xm-player.h diff -urN soundtracker-0.5.0/app/Makefile.in soundtracker-0.5.1/app/Makefile.in --- soundtracker-0.5.0/app/Makefile.in Mon Mar 13 14:06:44 2000 +++ soundtracker-0.5.1/app/Makefile.in Sat Mar 25 11:35:21 2000 @@ -99,7 +99,7 @@ bin_PROGRAMS = soundtracker -soundtracker_SOURCES = audio.c audio.h audioconfig.c audioconfig.h cheat-sheet.c cheat-sheet.h clavier.c clavier.h driver.h driver-in.h driver-out.h endian-conv.h envelope-box.c envelope-box.h errors.c errors.h extspinbutton.c extspinbutton.h file-operations.c file-operations.h gui-settings.c gui-settings.h gui-subs.c gui-subs.h gui.c gui.h i18n.h instrument-editor.c instrument-editor.h keys.c keys.h main.c main.h menubar.c menubar.h mixer.h module-info.c module-info.h playlist.c playlist.h poll.c poll.h preferences.c preferences.h recode.c recode.h sample-display.c sample-display.h sample-editor.c sample-editor.h scope-group.c scope-group.h st-subs.c st-subs.h time-buffer.c time-buffer.h tips-dialog.c tips-dialog.h track-editor.c track-editor.h tracker.c tracker.h transposition.c transposition.h xm.c xm.h xm-player.c xm-player.h +soundtracker_SOURCES = audio.c audio.h audioconfig.c audioconfig.h cheat-sheet.c cheat-sheet.h clavier.c clavier.h driver.h driver-in.h driver-out.h endian-conv.h envelope-box.c envelope-box.h errors.c errors.h extspinbutton.c extspinbutton.h file-operations.c file-operations.h gui-settings.c gui-settings.h gui-subs.c gui-subs.h gui.c gui.h i18n.h instrument-editor.c instrument-editor.h keys.c keys.h main.c main.h menubar.c menubar.h mixer.h module-info.c module-info.h playlist.c playlist.h poll.c poll.h preferences.c preferences.h recode.c recode.h sample-display.c sample-display.h sample-editor.c sample-editor.h scope-group.c scope-group.h st-subs.c st-subs.h time-buffer.c time-buffer.h tips-dialog.c tips-dialog.h track-editor.c track-editor.h tracker.c tracker.h tracker-settings.c tracker-settings.h transposition.c transposition.h xm.c xm.h xm-player.c xm-player.h soundtracker_LDADD = drivers/libdrivers.a mixers/libmixers.a @@ -124,7 +124,8 @@ gui-settings.o gui-subs.o gui.o instrument-editor.o keys.o main.o \ menubar.o module-info.o playlist.o poll.o preferences.o recode.o \ sample-display.o sample-editor.o scope-group.o st-subs.o time-buffer.o \ -tips-dialog.o track-editor.o tracker.o transposition.o xm.o xm-player.o +tips-dialog.o track-editor.o tracker.o tracker-settings.o \ +transposition.o xm.o xm-player.o soundtracker_DEPENDENCIES = drivers/libdrivers.a mixers/libmixers.a soundtracker_LDFLAGS = CFLAGS = @CFLAGS@ @@ -330,68 +331,75 @@ extfilesel.o: extfilesel.c fnmatch.h extfilesel.h i18n.h ../config.h extspinbutton.o: extspinbutton.c extspinbutton.h file-operations.o: file-operations.c ../config.h i18n.h \ - file-operations.h keys.h track-editor.h xm.h mixer.h tracker.h \ - gui-subs.h gui.h errors.h + file-operations.h keys.h track-editor.h tracker.h xm.h mixer.h \ + tracker-settings.h gui-subs.h gui.h errors.h gui.o: gui.c ../config.h poll.h i18n.h gui.h gui-subs.h xm.h mixer.h \ st-subs.h audio.h driver-out.h driver.h time-buffer.h \ xm-player.h tracker.h main.h keys.h instrument-editor.h \ - sample-editor.h driver-in.h track-editor.h scope-group.h \ - sample-display.h module-info.h preferences.h menubar.h \ - tips-dialog.h gui-settings.h file-operations.h playlist.h + sample-editor.h driver-in.h track-editor.h tracker-settings.h \ + scope-group.h sample-display.h module-info.h preferences.h \ + menubar.h tips-dialog.h gui-settings.h file-operations.h \ + playlist.h gui-settings.o: gui-settings.c ../config.h i18n.h gui.h gui-settings.h \ gui-subs.h preferences.h scope-group.h sample-display.h \ - track-editor.h xm.h mixer.h tracker.h extspinbutton.h + track-editor.h tracker.h xm.h mixer.h tracker-settings.h \ + extspinbutton.h gui-subs.o: gui-subs.c ../config.h i18n.h gui.h gui-subs.h \ extspinbutton.h instrument-editor.o: instrument-editor.c i18n.h ../config.h \ instrument-editor.h xm.h mixer.h envelope-box.h st-subs.h gui.h \ - gui-subs.h keys.h track-editor.h tracker.h clavier.h errors.h \ - sample-editor.h driver-in.h driver.h gui-settings.h \ - module-info.h file-operations.h + gui-subs.h keys.h track-editor.h tracker.h tracker-settings.h \ + clavier.h errors.h sample-editor.h driver-in.h driver.h \ + gui-settings.h module-info.h file-operations.h keys.o: keys.c ../config.h i18n.h keys.h gui-subs.h gui.h menubar.h \ preferences.h main.o: main.c ../config.h i18n.h gui.h xm.h mixer.h audio.h \ driver-out.h driver.h time-buffer.h keys.h gui-settings.h \ - audioconfig.h tips-dialog.h menubar.h track-editor.h tracker.h + audioconfig.h tips-dialog.h menubar.h track-editor.h tracker.h \ + tracker-settings.h menubar.o: menubar.c ../config.h i18n.h menubar.h gui.h gui-subs.h \ main.h xm.h mixer.h st-subs.h keys.h module-info.h \ preferences.h scope-group.h sample-display.h track-editor.h \ - tracker.h audioconfig.h gui-settings.h tips-dialog.h \ - transposition.h cheat-sheet.h file-operations.h \ + tracker.h tracker-settings.h audioconfig.h gui-settings.h \ + tips-dialog.h transposition.h cheat-sheet.h file-operations.h \ instrument-editor.h module-info.o: module-info.c i18n.h ../config.h module-info.h gui.h \ gui-subs.h xm.h mixer.h st-subs.h main.h sample-editor.h \ driver-in.h driver.h instrument-editor.h keys.h track-editor.h \ - tracker.h + tracker.h tracker-settings.h playlist.o: playlist.c ../config.h i18n.h playlist.h gui-subs.h poll.o: poll.c ../config.h preferences.o: preferences.c i18n.h ../config.h gui-subs.h preferences.h \ - menubar.h scope-group.h sample-display.h track-editor.h xm.h \ - mixer.h tracker.h errors.h + menubar.h scope-group.h sample-display.h track-editor.h \ + tracker.h xm.h mixer.h tracker-settings.h errors.h recode.o: recode.c recode.h sample-display.o: sample-display.c sample-display.h sample-editor.o: sample-editor.c ../config.h i18n.h sample-editor.h xm.h \ mixer.h driver-in.h driver.h st-subs.h gui.h gui-subs.h \ instrument-editor.h sample-display.h endian-conv.h keys.h \ - track-editor.h tracker.h errors.h time-buffer.h audio.h \ - driver-out.h module-info.h file-operations.h gui-settings.h + track-editor.h tracker.h tracker-settings.h errors.h \ + time-buffer.h audio.h driver-out.h module-info.h \ + file-operations.h gui-settings.h scope-group.o: scope-group.c ../config.h scope-group.h sample-display.h \ audio.h mixer.h driver-out.h driver.h time-buffer.h gui-subs.h st-subs.o: st-subs.c st-subs.h xm.h mixer.h gui-settings.h time-buffer.o: time-buffer.c time-buffer.h tips-dialog.o: tips-dialog.c ../config.h i18n.h tips-dialog.h \ preferences.h -track-editor.o: track-editor.c i18n.h ../config.h track-editor.h xm.h \ - mixer.h tracker.h gui.h st-subs.h keys.h audio.h driver-out.h \ - driver.h time-buffer.h main.h gui-settings.h sample-editor.h \ - driver-in.h gui-subs.h preferences.h +track-editor.o: track-editor.c i18n.h ../config.h track-editor.h \ + tracker.h xm.h mixer.h tracker-settings.h gui.h st-subs.h \ + keys.h audio.h driver-out.h driver.h time-buffer.h main.h \ + gui-settings.h sample-editor.h driver-in.h gui-subs.h \ + preferences.h tracker.o: tracker.c tracker.h xm.h mixer.h main.h gui-settings.h +tracker-settings.o: tracker-settings.c ../config.h tracker-settings.h \ + tracker.h xm.h mixer.h i18n.h gui-subs.h preferences.h transposition.o: transposition.c i18n.h ../config.h transposition.h \ main.h xm.h mixer.h gui-subs.h gui.h st-subs.h track-editor.h \ - tracker.h + tracker.h tracker-settings.h xm.o: xm.c i18n.h ../config.h gui-settings.h xm.h mixer.h endian-conv.h \ st-subs.h recode.h errors.h audio.h driver-out.h driver.h \ - time-buffer.h + time-buffer.h gui-subs.h xm-player.o: xm-player.c ../config.h i18n.h xm-player.h xm.h mixer.h \ main.h audio.h driver-out.h driver.h time-buffer.h diff -urN soundtracker-0.5.0/app/cheat-sheet.c soundtracker-0.5.1/app/cheat-sheet.c --- soundtracker-0.5.0/app/cheat-sheet.c Thu Mar 9 21:04:10 2000 +++ soundtracker-0.5.1/app/cheat-sheet.c Wed Mar 22 17:06:33 2000 @@ -83,7 +83,7 @@ void cheat_sheet_dialog (void) { - GtkWidget *mainbox, *scrolled_window, *text; + GtkWidget *mainbox, *scrolled_window, *text, *hbox, *thing; GdkFont *font; if(cheat_sheet_window != NULL) { @@ -115,6 +115,29 @@ GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_widget_show (scrolled_window); + + /* Close button */ + thing = gtk_hseparator_new(); + gtk_widget_show(thing); + gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + + hbox = gtk_hbutton_box_new (); + gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbox), 4); + gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_END); + gtk_box_pack_start (GTK_BOX (mainbox), hbox, + FALSE, FALSE, 0); + gtk_widget_show (hbox); + +#ifdef USE_GNOME + thing = gnome_stock_button (GNOME_STOCK_BUTTON_CLOSE); +#else + thing = gtk_button_new_with_label (_ ("Close")); +#endif + gtk_signal_connect (GTK_OBJECT (thing), "clicked", + GTK_SIGNAL_FUNC (cheat_sheet_close_requested), NULL); + gtk_box_pack_start (GTK_BOX (hbox), thing, FALSE, FALSE, 0); + gtk_widget_show (thing); + text = gtk_text_new (NULL, NULL); gtk_text_set_editable (GTK_TEXT (text), FALSE); diff -urN soundtracker-0.5.0/app/drivers/Makefile.in soundtracker-0.5.1/app/drivers/Makefile.in --- soundtracker-0.5.0/app/drivers/Makefile.in Mon Mar 13 14:06:46 2000 +++ soundtracker-0.5.1/app/drivers/Makefile.in Sat Mar 25 11:35:26 2000 @@ -221,9 +221,7 @@ alsa2-output.o: alsa2-output.c ../../config.h alsa-input.o: alsa-input.c ../../config.h alsa-output.o: alsa-output.c ../../config.h -esd-output.o: esd-output.c ../../config.h ../i18n.h ../driver-out.h \ - ../driver.h ../mixer.h ../errors.h ../gui-subs.h \ - ../preferences.h +esd-output.o: esd-output.c ../../config.h file-output.o: file-output.c ../../config.h ../i18n.h ../driver-out.h \ ../driver.h ../mixer.h ../errors.h ../gui-subs.h \ ../preferences.h diff -urN soundtracker-0.5.0/app/gui-settings.c soundtracker-0.5.1/app/gui-settings.c --- soundtracker-0.5.0/app/gui-settings.c Mon Mar 13 13:47:01 2000 +++ soundtracker-0.5.1/app/gui-settings.c Sat Mar 25 10:30:03 2000 @@ -34,6 +34,7 @@ #include "scope-group.h" #include "track-editor.h" #include "extspinbutton.h" +#include "tracker-settings.h" gui_prefs gui_settings = { 1, @@ -42,6 +43,8 @@ 0, 1, + 1, + 1, 0, 0, 1, @@ -71,17 +74,11 @@ }; static GtkWidget *configwindow = NULL; +static GtkWidget *ts_box = NULL; static void prefs_scopesfreq_changed (int value); static void prefs_trackerfreq_changed (int value); -static void -gui_settings_close_requested (void) -{ - gtk_widget_destroy(configwindow); - configwindow = NULL; -} - static gui_subs_slider prefs_scopesfreq_slider = { N_("Scopes Frequency"), 1, 80, prefs_scopesfreq_changed }; @@ -90,6 +87,14 @@ }; static void +gui_settings_close_requested (void) +{ + gtk_container_remove(GTK_CONTAINER(ts_box), trackersettings); + gtk_widget_destroy(configwindow); + configwindow = NULL; +} + +static void prefs_scopesfreq_changed (int value) { extern ScopeGroup *scopegroup; @@ -136,6 +141,24 @@ } static void +gui_settings_show_zeroes_toggled (GtkWidget *widget) +{ + int o = gui_settings.show_zeroes; + if(o != (gui_settings.show_zeroes = GTK_TOGGLE_BUTTON(widget)->active)) { + gtk_widget_queue_resize(GTK_WIDGET(tracker)); + } +} + +static void +gui_settings_channel_numbering_toggled (GtkWidget *widget) +{ + int o = gui_settings.channel_numbering; + if(o != (gui_settings.channel_numbering = GTK_TOGGLE_BUTTON(widget)->active)) { + gtk_widget_queue_resize(GTK_WIDGET(tracker)); + } +} + +static void gui_settings_use_aa_canvas_toggled (GtkWidget *widget) { gui_settings.gui_use_aa_canvas = GTK_TOGGLE_BUTTON(widget)->active; @@ -176,7 +199,7 @@ void gui_settings_dialog (void) { - GtkWidget *mainbox, *thing, *box1, *hbox; + GtkWidget *mainbox, *mainhbox, *thing, *box1, *hbox, *vbox1; GtkTooltips *tooltips; if(configwindow != NULL) { @@ -192,7 +215,7 @@ #endif gtk_signal_connect (GTK_OBJECT (configwindow), "delete_event", GTK_SIGNAL_FUNC (gui_settings_close_requested), NULL); - gtk_window_set_policy(GTK_WINDOW(configwindow), FALSE, FALSE, FALSE); +// gtk_window_set_policy(GTK_WINDOW(configwindow), FALSE, FALSE, FALSE); mainbox = gtk_vbox_new(FALSE, 2); gtk_container_border_width(GTK_CONTAINER(mainbox), 4); @@ -203,48 +226,70 @@ #endif gtk_widget_show(mainbox); + mainhbox = gtk_hbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(mainbox), mainhbox, TRUE, TRUE, 0); + gtk_widget_show(mainhbox); + + vbox1 = gtk_vbox_new(FALSE, 2); + gtk_box_pack_start(GTK_BOX(mainhbox), vbox1, FALSE, TRUE, 0); + gtk_widget_show(vbox1); + tooltips = gtk_tooltips_new(); gtk_object_set_data(GTK_OBJECT(configwindow), "tooltips", tooltips); thing = gui_subs_create_slider(&prefs_scopesfreq_slider); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); gtk_widget_show(thing); thing = gui_subs_create_slider(&prefs_trackerfreq_slider); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); gtk_widget_show(thing); thing = gtk_check_button_new_with_label(_("Use Hexadecimal Numbers")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.tracker_hexmode); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); gtk_widget_show(thing); gtk_signal_connect(GTK_OBJECT(thing), "toggled", GTK_SIGNAL_FUNC(gui_settings_hexmode_toggled), NULL); thing = gtk_check_button_new_with_label(_("Use upper case letters for hex numbers")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.tracker_upcase); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); gtk_widget_show(thing); gtk_signal_connect(GTK_OBJECT(thing), "toggled", GTK_SIGNAL_FUNC(gui_settings_upcase_toggled), NULL); thing = gtk_check_button_new_with_label(_("Advance cursor horizontally in effect columns")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.advance_cursor_in_fx_columns); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); gtk_widget_show(thing); gtk_signal_connect(GTK_OBJECT(thing), "toggled", GTK_SIGNAL_FUNC(gui_settings_advance_cursor_toggled), NULL); thing = gtk_check_button_new_with_label(_("Asynchronous Editing")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.asynchronous_editing); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); gtk_widget_show(thing); gtk_signal_connect(GTK_OBJECT(thing), "toggled", GTK_SIGNAL_FUNC(gui_settings_asyncedit_toggled), NULL); + thing = gtk_check_button_new_with_label(_("Show zeroes")); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.show_zeroes); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); + gtk_widget_show(thing); + gtk_signal_connect(GTK_OBJECT(thing), "toggled", + GTK_SIGNAL_FUNC(gui_settings_show_zeroes_toggled), NULL); + + thing = gtk_check_button_new_with_label(_("Channel numbering")); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.channel_numbering); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); + gtk_widget_show(thing); + gtk_signal_connect(GTK_OBJECT(thing), "toggled", + GTK_SIGNAL_FUNC(gui_settings_channel_numbering_toggled), NULL); + thing = gtk_check_button_new_with_label(_("Use anti-aliased envelope editor")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.gui_use_aa_canvas); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); gtk_widget_show(thing); gtk_signal_connect(GTK_OBJECT(thing), "toggled", GTK_SIGNAL_FUNC(gui_settings_use_aa_canvas_toggled), NULL); @@ -255,7 +300,7 @@ box1 = gtk_hbox_new(FALSE, 4); gtk_widget_show(box1); - gtk_box_pack_start(GTK_BOX(mainbox), box1, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), box1, FALSE, TRUE, 0); thing = gtk_label_new(_("Scopes buffer size [MB]")); gtk_box_pack_start(GTK_BOX(box1), thing, FALSE, TRUE, 0); @@ -270,11 +315,11 @@ thing = gtk_hseparator_new(); gtk_widget_show(thing); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); box1 = gtk_hbox_new(FALSE, 4); gtk_widget_show(box1); - gtk_box_pack_start(GTK_BOX(mainbox), box1, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), box1, FALSE, TRUE, 0); thing = gtk_check_button_new_with_label(_("Highlight rows:")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.highlight_rows); @@ -292,15 +337,28 @@ thing = gtk_hseparator_new(); gtk_widget_show(thing); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); thing = gtk_check_button_new_with_label(_("`Save XM' saves all non-empty patterns")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(thing), gui_settings.save_all_patterns); - gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), thing, FALSE, TRUE, 0); gtk_widget_show(thing); gtk_signal_connect(GTK_OBJECT(thing), "toggled", GTK_SIGNAL_FUNC(gui_settings_non_empty_patterns_toggled), NULL); + thing = gtk_vseparator_new(); + gtk_widget_show(thing); + gtk_box_pack_start(GTK_BOX(mainhbox), thing, FALSE, TRUE, 0); + + /* The tracker widget settings */ + ts_box = vbox1 = gtk_vbox_new(FALSE, 2); + gtk_box_pack_start(GTK_BOX(mainhbox), vbox1, TRUE, TRUE, 0); + gtk_widget_show(vbox1); + + gtk_object_ref(GTK_OBJECT(trackersettings)); + gtk_box_pack_start(GTK_BOX(vbox1), trackersettings, TRUE, TRUE, 0); + gtk_widget_show(trackersettings); + /* The button area */ thing = gtk_hseparator_new(); gtk_widget_show(thing); @@ -341,6 +399,8 @@ prefs_get_int(f, "gui-use-upper-case", &gui_settings.tracker_upcase); prefs_get_int(f, "gui-advance-cursor-in-fx-columns", &gui_settings.advance_cursor_in_fx_columns); prefs_get_int(f, "gui-asynchronous-editing", &gui_settings.asynchronous_editing); + prefs_get_int(f, "gui-show-zeroes", &gui_settings.show_zeroes); + prefs_get_int(f, "gui-channel-numbering", &gui_settings.channel_numbering); prefs_get_int(f, "gui-display-scopes", &gui_settings.gui_display_scopes); prefs_get_int(f, "gui-use-backing-store", &gui_settings.gui_use_backing_store); prefs_get_int(f, "gui-use-aa-canvas", &gui_settings.gui_use_aa_canvas); @@ -393,6 +453,8 @@ prefs_put_int(f, "gui-use-upper-case", gui_settings.tracker_upcase); prefs_put_int(f, "gui-advance-cursor-in-fx-columns", gui_settings.advance_cursor_in_fx_columns); prefs_put_int(f, "gui-asynchronous-editing", gui_settings.asynchronous_editing); + prefs_put_int(f, "gui-show-zeroes", gui_settings.show_zeroes); + prefs_put_int(f, "gui-channel-numbering", gui_settings.channel_numbering); prefs_put_int(f, "gui-display-scopes", gui_settings.gui_display_scopes); prefs_put_int(f, "gui-use-backing-store", gui_settings.gui_use_backing_store); prefs_put_int(f, "gui-use-aa-canvas", gui_settings.gui_use_aa_canvas); diff -urN soundtracker-0.5.0/app/gui-settings.h soundtracker-0.5.1/app/gui-settings.h --- soundtracker-0.5.0/app/gui-settings.h Mon Mar 13 13:47:01 2000 +++ soundtracker-0.5.1/app/gui-settings.h Thu Mar 23 18:27:35 2000 @@ -29,6 +29,8 @@ gboolean tracker_upcase; gboolean advance_cursor_in_fx_columns; gboolean asynchronous_editing; + gboolean show_zeroes; + gboolean channel_numbering; gboolean gui_display_scopes; gboolean gui_use_backing_store; diff -urN soundtracker-0.5.0/app/gui-subs.c soundtracker-0.5.1/app/gui-subs.c --- soundtracker-0.5.0/app/gui-subs.c Sat Feb 19 11:58:34 2000 +++ soundtracker-0.5.1/app/gui-subs.c Wed Mar 22 17:06:33 2000 @@ -28,6 +28,35 @@ #include "gui-subs.h" #include "extspinbutton.h" +static const char *status_messages[] = { + N_("Idle."), + N_("Playing song..."), + N_("Playing pattern..."), + N_("Loading module..."), + N_("Module loaded."), + N_("Saving module..."), + N_("Module saved."), + N_("Loading sample..."), + N_("Sample loaded."), + N_("Saving sample..."), + N_("Sample saved."), + N_("Loading instrument..."), + N_("Instrument loaded."), + N_("Saving instrument..."), + N_("Instrument saved."), +}; + +void +statusbar_update (int message) +{ +#ifdef USE_GNOME + gnome_appbar_set_status(GNOME_APPBAR(status_bar), status_messages[message]); +#else + gtk_statusbar_pop(GTK_STATUSBAR(status_bar), statusbar_context_id); + gtk_statusbar_push(GTK_STATUSBAR(status_bar), statusbar_context_id, status_messages[message]); +#endif +} + int find_current_toggle (GtkWidget **widgets, int count) { diff -urN soundtracker-0.5.0/app/gui-subs.h soundtracker-0.5.1/app/gui-subs.h --- soundtracker-0.5.0/app/gui-subs.h Sat Feb 19 11:58:56 2000 +++ soundtracker-0.5.1/app/gui-subs.h Wed Mar 22 17:06:33 2000 @@ -24,6 +24,31 @@ #include +/* values for status bar messages */ +enum { + STATUS_IDLE, + STATUS_PLAYING_SONG, + STATUS_PLAYING_PATTERN, + STATUS_LOADING_MODULE, + STATUS_MODULE_LOADED, + STATUS_SAVING_MODULE, + STATUS_MODULE_SAVED, + STATUS_LOADING_SAMPLE, + STATUS_SAMPLE_LOADED, + STATUS_SAVING_SAMPLE, + STATUS_SAMPLE_SAVED, + STATUS_LOADING_INSTRUMENT, + STATUS_INSTRUMENT_LOADED, + STATUS_SAVING_INSTRUMENT, + STATUS_INSTRUMENT_SAVED, +}; + +extern guint statusbar_context_id; +extern GtkWidget *status_bar; +extern GtkWidget *st_clock; + +void statusbar_update (int message); + GtkWidget* file_selection_create (const gchar *title, void(*clickfunc)()); void file_selection_save_path (const gchar *fn, diff -urN soundtracker-0.5.0/app/gui.c soundtracker-0.5.1/app/gui.c --- soundtracker-0.5.0/app/gui.c Mon Mar 13 13:47:01 2000 +++ soundtracker-0.5.1/app/gui.c Sat Mar 25 11:00:52 2000 @@ -76,6 +76,10 @@ static GtkWidget *spin_jump, *curins_spin, *spin_octave; static Playlist *playlist; +guint statusbar_context_id; +GtkWidget *status_bar; +GtkWidget *st_clock; + static void tempo_slider_changed (int value); static void bpm_slider_changed (int value); @@ -381,7 +385,9 @@ if(b) { /* toggle editing mode (only if we haven't been in playing mode) */ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(editing_toggle), !GUI_EDITING); - } + if (GTK_TOGGLE_BUTTON(editing_toggle)->active) show_editmode_status(); + else statusbar_update(STATUS_IDLE); + } handled = TRUE; break; case GDK_Escape: @@ -389,6 +395,8 @@ break; /* toggle editing mode, even if we're in playing mode */ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(editing_toggle), !GUI_EDITING); + if (GTK_TOGGLE_BUTTON(editing_toggle)->active) show_editmode_status(); + else statusbar_update(STATUS_IDLE); handled = TRUE; break; } @@ -662,7 +670,12 @@ switch(a) { case AUDIO_BACKPIPE_PLAYING_STOPPED: - if(startstop_count > 0) { + statusbar_update(STATUS_IDLE); + #ifdef USE_GNOME + gtk_clock_stop(GTK_CLOCK(st_clock)); + #endif + + if(startstop_count > 0) { /* can be equal to zero when the audio subsystem decides to stop playing on its own. */ startstop_count--; } @@ -673,8 +686,16 @@ break; case AUDIO_BACKPIPE_PLAYING_STARTED: + statusbar_update(STATUS_PLAYING_SONG); case AUDIO_BACKPIPE_PLAYING_PATTERN_STARTED: - startstop_count--; + + if(a==AUDIO_BACKPIPE_PLAYING_PATTERN_STARTED) statusbar_update(STATUS_PLAYING_PATTERN); + #ifdef USE_GNOME + gtk_clock_set_seconds(GTK_CLOCK(st_clock), 0); + gtk_clock_start(GTK_CLOCK(st_clock)); + #endif + + startstop_count--; gui_playing_mode = (a == AUDIO_BACKPIPE_PLAYING_STARTED) ? PLAYING_SONG : PLAYING_PATTERN; if(!ASYNCEDIT) { gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(editing_toggle), FALSE); @@ -695,7 +716,7 @@ case AUDIO_BACKPIPE_DRIVER_OPEN_FAILED: startstop_count--; - break; + break; case AUDIO_BACKPIPE_SONGPOS_CONFIRM: set_songpos_count--; @@ -705,7 +726,8 @@ case AUDIO_BACKPIPE_ERROR_MESSAGE: case AUDIO_BACKPIPE_WARNING_MESSAGE: - readpipe(source, &x, sizeof(x)); + statusbar_update(STATUS_IDLE); + readpipe(source, &x, sizeof(x)); if(msgbuflen < x + 1) { g_free(msgbuf); msgbuf = g_new(char, x + 1); @@ -713,9 +735,9 @@ } readpipe(source, msgbuf, x + 1); if(a == AUDIO_BACKPIPE_ERROR_MESSAGE) - gnome_error_dialog(msgbuf); + gnome_error_dialog(msgbuf); else - gnome_warning_dialog(msgbuf); + gnome_warning_dialog(msgbuf); break; default: @@ -1400,6 +1422,47 @@ gtk_widget_show(gui_cursmpl_name); gtk_widget_set_usize(gui_cursmpl_name, 100, gui_cursmpl_name->requisition.height); + /* Status Bar */ + +#ifdef USE_GNOME + hbox = gtk_hbox_new(FALSE, 2); + gtk_box_pack_start(GTK_BOX(mainvbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + status_bar = gnome_appbar_new (FALSE, TRUE, GNOME_PREFERENCES_NEVER); + gtk_widget_show (status_bar); + + gtk_box_pack_start (GTK_BOX (hbox), status_bar, TRUE, TRUE, 0); + gtk_widget_set_usize (status_bar, -2, 20); + + thing = gtk_frame_new (NULL); + gtk_widget_show (thing); + gtk_box_pack_start (GTK_BOX (hbox), thing, FALSE, FALSE, 0); + gtk_widget_set_usize (thing, 48, 20); + gtk_frame_set_shadow_type (GTK_FRAME (thing), GTK_SHADOW_IN); + + st_clock = gtk_clock_new (GTK_CLOCK_INCREASING); + gtk_widget_show (st_clock); + gtk_container_add (GTK_CONTAINER (thing), st_clock); + gtk_widget_set_usize (st_clock, 48, 20); + gtk_clock_set_format (GTK_CLOCK (st_clock), _("%M:%S")); + gtk_clock_set_seconds(GTK_CLOCK (st_clock), 0); + + gnome_appbar_set_status(GNOME_APPBAR(status_bar), WELCOME_MESSAGE); +#else + thing = gtk_hbox_new(FALSE, 1); + gtk_box_pack_start(GTK_BOX(mainvbox), thing, FALSE, TRUE, 0); + gtk_widget_show(thing); + + status_bar = gtk_statusbar_new(); + gtk_box_pack_start(GTK_BOX (thing), status_bar, TRUE, TRUE, 0); + gtk_widget_show(status_bar); + gtk_widget_set_usize(status_bar, -2, 20); + + statusbar_context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(status_bar), "ST Statusbar"); + gtk_statusbar_push(GTK_STATUSBAR(status_bar), statusbar_context_id, WELCOME_MESSAGE); +#endif + /* The notebook */ notebook = gtk_notebook_new(); @@ -1421,23 +1484,6 @@ 1); notebook_current_page = 1; - /* status bar */ -/* - hbox = gtk_hbox_new(FALSE, 4); - gtk_box_pack_start(GTK_BOX(mainvbox), hbox, FALSE, TRUE, 0); - gtk_widget_show(hbox); - - add_empty_hbox(hbox); - thing = gtk_vseparator_new(); - gtk_box_pack_start(GTK_BOX(hbox), thing, FALSE, TRUE, 0); - gtk_widget_show(thing); - - thing = gui_button (mainwindow, GNOME_STOCK_BUTTON_UP, - 0, NULL, NULL, 0); - gtk_box_pack_start (GTK_BOX (hbox), thing, 0, 0, 0); - gtk_widget_show (thing); -// add_tip (wid, "Link/DeLink this tab"); -*/ /* capture all key presses */ gtk_widget_add_events(GTK_WIDGET(mainwindow), GDK_KEY_RELEASE_MASK); gtk_signal_connect(GTK_OBJECT(mainwindow), "key_press_event", GTK_SIGNAL_FUNC(keyevent), (gpointer)1); diff -urN soundtracker-0.5.0/app/gui.h soundtracker-0.5.1/app/gui.h --- soundtracker-0.5.0/app/gui.h Sat Feb 19 11:58:33 2000 +++ soundtracker-0.5.1/app/gui.h Wed Mar 22 17:06:33 2000 @@ -38,9 +38,13 @@ #define GUI_ENABLED (gui_playing_mode != PLAYING_SONG && gui_playing_mode != PLAYING_PATTERN) #define GUI_EDITING (GTK_TOGGLE_BUTTON(editing_toggle)->active) +#define WELCOME_MESSAGE _("Welcome to Sound Tracker !") + extern GtkWidget *editing_toggle; extern GtkWidget *gui_curins_name, *gui_cursmpl_name; extern GtkWidget *mainwindow; + +extern void show_editmode_status (void); int gui_init (int argc, char *argv[]); diff -urN soundtracker-0.5.0/app/instrument-editor.c soundtracker-0.5.1/app/instrument-editor.c --- soundtracker-0.5.0/app/instrument-editor.c Sat Feb 19 11:58:33 2000 +++ soundtracker-0.5.1/app/instrument-editor.c Sat Mar 25 11:06:09 2000 @@ -36,7 +36,7 @@ #include "module-info.h" #include "file-operations.h" -static GtkWidget *volenv, *panenv, *disableboxes[3]; +static GtkWidget *volenv, *panenv, *disableboxes[4]; static GtkWidget *instrument_editor_vibtype_w[4]; static GtkWidget *clavier; static GtkWidget *curnote_label; @@ -148,7 +148,9 @@ f = fopen(fn, "rb"); if(f) { - xm_load_xi(instr, f); + statusbar_update(STATUS_LOADING_INSTRUMENT); + xm_load_xi(instr, f); + statusbar_update(STATUS_INSTRUMENT_LOADED); fclose(f); } else { error_error(_("Can't open file.")); @@ -169,7 +171,9 @@ f = fopen(fn, "wb"); if(f) { + statusbar_update(STATUS_SAVING_INSTRUMENT); xm_save_xi(instr, f); + statusbar_update(STATUS_INSTRUMENT_SAVED); fclose(f); } else { error_error(_("Can't open file.")); @@ -257,7 +261,7 @@ gtk_signal_connect(GTK_OBJECT(thing), "clicked", GTK_SIGNAL_FUNC(fileops_open_dialog), (void*)DIALOG_LOAD_INSTRUMENT); - thing = gtk_button_new_with_label(_("Save XI")); + disableboxes[3] = thing = gtk_button_new_with_label(_("Save XI")); gtk_box_pack_start(GTK_BOX(box2), thing, TRUE, TRUE, 0); gtk_widget_show(thing); gtk_signal_connect(GTK_OBJECT(thing), "clicked", @@ -415,7 +419,7 @@ int o, n, m = xm_get_modified(); o = current_instrument != NULL && st_instrument_num_samples(current_instrument) > 0; - for(n = 0; n < 3; n++) { + for(n = 0; n < 4; n++) { gtk_widget_set_sensitive(disableboxes[n], o); } diff -urN soundtracker-0.5.0/app/menubar.c soundtracker-0.5.1/app/menubar.c --- soundtracker-0.5.0/app/menubar.c Sat Feb 19 14:01:43 2000 +++ soundtracker-0.5.1/app/menubar.c Sat Mar 25 10:19:21 2000 @@ -41,6 +41,7 @@ #include "cheat-sheet.h" #include "file-operations.h" #include "instrument-editor.h" +#include "tracker-settings.h" #ifdef USE_GNOME #include @@ -191,6 +192,7 @@ gui_settings_save_config(); keys_save_config(); audioconfig_save_config(); + trackersettings_write_settings(); } static void @@ -217,6 +219,18 @@ functions[a](t); } +static void +menubar_settings_tracker_next_font (void) +{ + trackersettings_cycle_font_forward(TRACKERSETTINGS(trackersettings)); +} + +static void +menubar_settings_tracker_prev_font (void) +{ + trackersettings_cycle_font_backward(TRACKERSETTINGS(trackersettings)); +} + #ifdef USE_GNOME static GnomeUIInfo file_menu[] = { @@ -340,12 +354,24 @@ GNOMEUIINFO_END }; +static GnomeUIInfo settings_tracker_menu[] = { + { GNOME_APP_UI_TOGGLEITEM, N_("Use _Backing Store"), 0, menubar_backing_store_toggled, 0, 0, + GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL }, + + { GNOME_APP_UI_ITEM, N_("_Previous font"), NULL, menubar_settings_tracker_prev_font, (gpointer)0, NULL, + GNOME_APP_PIXMAP_NONE, 0, GDK_KP_Subtract, GDK_CONTROL_MASK, NULL }, + { GNOME_APP_UI_ITEM, N_("_Next font"), NULL, menubar_settings_tracker_next_font, (gpointer)0, NULL, + GNOME_APP_PIXMAP_NONE, 0, GDK_KP_Add, GDK_CONTROL_MASK, NULL }, + + GNOMEUIINFO_END +}; + // Take care to adjust the indices in menubar_init_prefs() when reordering stuff here! static GnomeUIInfo settings_menu[] = { { GNOME_APP_UI_TOGGLEITEM, N_("Display _Oscilloscopes"), 0, menubar_scopes_toggled, 0, 0, GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL }, - { GNOME_APP_UI_TOGGLEITEM, N_("Use _Backing Store"), 0, menubar_backing_store_toggled, 0, 0, - GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL }, + + GNOMEUIINFO_SUBTREE (N_("_Tracker"), settings_tracker_menu), GNOMEUIINFO_SEPARATOR, @@ -404,7 +430,7 @@ menubar_init_prefs () { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(settings_menu[0].widget), gui_settings.gui_display_scopes); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(settings_menu[1].widget), gui_settings.gui_use_backing_store); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(settings_tracker_menu[0].widget), gui_settings.gui_use_backing_store); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(settings_menu[8].widget), gui_settings.save_settings_on_exit); } @@ -462,7 +488,10 @@ { N_("/Instrument/_Delete Unused Instruments"), NULL, modinfo_delete_unused_instruments, 0 }, { N_("/_Settings"), NULL, NULL, 0, "" }, { N_("/Settings/Display _Oscilloscopes"), NULL, menubar_scopes_toggled, 0, "" }, - { N_("/Settings/Use _Backing Store"), NULL, menubar_backing_store_toggled, 0, "" }, + { N_("/Settings/_Tracker"), NULL, NULL, 0, "" }, + { N_("/Settings/Tracker/Use _Backing Store"), NULL, menubar_backing_store_toggled, 0, "" }, + { N_("/Settings/Tracker/_Previous font"), "KP_Subtract", menubar_settings_tracker_prev_font }, + { N_("/Settings/Tracker/_Next font"), "KP_Add", menubar_settings_tracker_next_font }, { N_("/Settings/-"), NULL, NULL, 0, "" }, { N_("/Settings/_Keyboard Configuration..."), NULL, keys_dialog, 0 }, { N_("/Settings/_Audio Configuration..."), NULL, audioconfig_dialog, 0 }, @@ -519,7 +548,7 @@ w = gtk_item_factory_get_widget(item_factory, buf); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), gui_settings.gui_display_scopes); - strip_underscores(buf, tl("/Settings/Use _Backing Store")); + strip_underscores(buf, tl("/Settings/Tracker/Use _Backing Store")); w = gtk_item_factory_get_widget(item_factory, buf); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), gui_settings.gui_use_backing_store); @@ -569,7 +598,7 @@ menu_items[i].path = _(menu_items[i].path); } } else { - fprintf(stderr, "*** SoundTracker Non-GNOME: Disabling menu bar translation because\n*** not all strings have been translated.\n"); + fprintf(stderr, "*** SoundTracker Non-GNOME: Disabling menu bar translation because\n*** not all strings have been translated.\n*** ( --- this is NOT the user's fault! :D --- )\n"); } #endif diff -urN soundtracker-0.5.0/app/mixer.h soundtracker-0.5.1/app/mixer.h --- soundtracker-0.5.0/app/mixer.h Mon Mar 13 12:47:18 2000 +++ soundtracker-0.5.1/app/mixer.h Sat Mar 25 10:55:39 2000 @@ -33,12 +33,6 @@ GMutex *lock; } st_mixer_sample_info; -static inline -int mixer_sample_word_length (st_mixer_sample_info *s) -{ - return 2; -} - /* values for st_mixer_sample_info.looptype */ #define ST_MIXER_SAMPLE_LOOPTYPE_NONE 0 #define ST_MIXER_SAMPLE_LOOPTYPE_AMIGA 1 diff -urN soundtracker-0.5.0/app/mixers/Makefile.am soundtracker-0.5.1/app/mixers/Makefile.am --- soundtracker-0.5.0/app/mixers/Makefile.am Sun Mar 5 18:01:54 2000 +++ soundtracker-0.5.1/app/mixers/Makefile.am Sat Mar 25 10:46:17 2000 @@ -1,8 +1,16 @@ +kb-x86-asm-built.S: kb-x86-asm.S + gasp kb-x86-asm.S > kb-x86-asm-built.S + +EXTRA_DIST = kb-x86-asm.S + noinst_LIBRARIES = libmixers.a libmixers_a_SOURCES = \ integer32.c integer32-asm.S integer32-asm.h \ - kb-x86.c kb-x86-asm.S kb-x86-asm.h + kb-x86.c kb-x86-asm-built.S kb-x86-asm.h INCLUDES = -I.. + +dist-hook: + rm -f $(distdir)/kb-x86-asm-built.S diff -urN soundtracker-0.5.0/app/mixers/Makefile.in soundtracker-0.5.1/app/mixers/Makefile.in --- soundtracker-0.5.0/app/mixers/Makefile.in Mon Mar 13 14:06:49 2000 +++ soundtracker-0.5.1/app/mixers/Makefile.in Sat Mar 25 11:35:29 2000 @@ -95,9 +95,11 @@ l = @l@ sedpath = @sedpath@ +EXTRA_DIST = kb-x86-asm.S + noinst_LIBRARIES = libmixers.a -libmixers_a_SOURCES = integer32.c integer32-asm.S integer32-asm.h kb-x86.c kb-x86-asm.S kb-x86-asm.h +libmixers_a_SOURCES = integer32.c integer32-asm.S integer32-asm.h kb-x86.c kb-x86-asm-built.S kb-x86-asm.h INCLUDES = -I.. @@ -112,7 +114,8 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libmixers_a_LIBADD = -libmixers_a_OBJECTS = integer32.o integer32-asm.o kb-x86.o kb-x86-asm.o +libmixers_a_OBJECTS = integer32.o integer32-asm.o kb-x86.o \ +kb-x86-asm-built.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -216,6 +219,7 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook integer32.o: integer32.c ../../config.h ../mixer.h integer32-asm.h kb-x86.o: kb-x86.c ../../config.h ../mixer.h kb-x86-asm.h @@ -288,6 +292,12 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean + +kb-x86-asm-built.S: kb-x86-asm.S + gasp kb-x86-asm.S > kb-x86-asm-built.S + +dist-hook: + rm -f $(distdir)/kb-x86-asm-built.S # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN soundtracker-0.5.0/app/mixers/kb-x86-asm.S soundtracker-0.5.1/app/mixers/kb-x86-asm.S --- soundtracker-0.5.0/app/mixers/kb-x86-asm.S Sun Mar 12 22:20:00 2000 +++ soundtracker-0.5.1/app/mixers/kb-x86-asm.S Sun Mar 19 17:23:59 2000 @@ -24,7 +24,7 @@ #if defined(__i386__) -.data +\(.data) .align 4 _fadeleft: .long 0 @@ -257,99 +257,14 @@ movl 16(%ebp),%eax // pointer to sample data movl 20(%ebp),%edx // sample position (fractional part) movl 32(%ebp),%edi // destination float buffer - - cmpl $0,%ecx - jnz .fwscopes - movl 36(%ebp),%ecx // number of samples to mix - call kbasm_mix_stereo_cubic_filtered_i2f_noscopes - jmp .fwcont -.fwscopes: movl 36(%ebp),%ecx // number of samples to mix - call kbasm_mix_stereo_cubic_filtered_i2f -.fwcont: - - // Update changed values - movl ebpstore,%ebp - movl 8(%ebp),%ebp - - movl %eax,16(%ebp) // pointer to sample data - movl %edx,20(%ebp) // sample position (fractional part) - movl %edi,32(%ebp) // destination float buffer - movl fl1,%eax - movl %eax,52(%ebp) - movl fb1,%eax - movl %eax,56(%ebp) - - movl _voll,%eax - movl _volr,%ebx - movl %eax,(%ebp) - movl %ebx,4(%ebp) - - movl ebpstore,%ebp - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -.globl kbasm_mix_backward -kbasm_mix_backward: - pushl %ebp - movl %esp, %ebp - - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi + movl 64(%ebp),%ebp + addl $kbasm_mixers,%ebp + movl (%ebp),%ebp +#warning Please ignore the following warning. + call %ebp - finit - - movl %ebp,ebpstore - movl 8(%ebp),%ebp - - // Put data into appropriate places for the real mixer subroutine - movl (%ebp),%eax - movl 4(%ebp),%ebx - movl %eax,_voll - movl %ebx,_volr - movl 8(%ebp),%eax - movl 12(%ebp),%ebx - movl %eax,_volrl - movl %ebx,_volrr - - movl 44(%ebp),%eax - movl %eax,ffreq - movl 48(%ebp),%eax - movl %eax,freso - movl 52(%ebp),%eax - movl %eax,fl1 - movl 56(%ebp),%eax - movl %eax,fb1 - movl 60(%ebp),%ecx - movl %ecx,scopebuf - movl 24(%ebp),%ebx // freqi - movl 28(%ebp),%esi // freqf - movl 16(%ebp),%eax // pointer to sample data - movl 20(%ebp),%edx // sample position (fractional part) - movl 32(%ebp),%edi // destination float buffer - - cmpl $0,%ecx - jnz .bwscopes - movl 36(%ebp),%ecx // number of samples to mix - call kbasm_mix_stereo_cubic_filtered_i2f_backward_noscopes - jmp .bwcont -.bwscopes: - movl 36(%ebp),%ecx // number of samples to mix - call kbasm_mix_stereo_cubic_filtered_i2f_backward -.bwcont: - // Update changed values movl ebpstore,%ebp movl 8(%ebp),%ebp @@ -379,306 +294,6 @@ leave ret -kbasm_mix_stereo_cubic_filtered_i2f: // mixing, stereo w/ cubic interpolation, FILTERED - flds _voll // (vl) - flds _volr // (vr) (vl) - movl %eax,%ebp - shrl $1,%ebp - movl %edx,%eax - shrl $24,%eax - movl %esp,store2 - movl scopebuf,%esp - - .p2align 4,,7 -.I2Fnext: // (vr) (vl) - fild (,%ebp,2) // (w0) (vl) - fmuls kb_x86_ct0(,%eax,4) // (w0') (vl) - fild 2(,%ebp,2) // (w1) (w0') (vl) - fmuls kb_x86_ct1(,%eax,4) // (w1') (w0') (vl) - fild 4(,%ebp,2) // (w2) (w1') (w0') (vl) - fmuls kb_x86_ct2(,%eax,4) // (w2') (w1') (w0') (vl) - fild 6(,%ebp,2) // (w3) (w2') (w1') (w0') (vl) - fmuls kb_x86_ct3(,%eax,4) // (w3') (w2') (w1') (w0') (vl) - fxch %st(2) // (w1') (w2') (w3') (w0') (vr) (vl) - faddp %st,%st(3) // (w2') (w3') (w0+w1) (vr) (vl) - addl %esi,%edx - lea 8(%edi),%edi - faddp %st,%st(2) // (w2+w3) (w0+w1) (vr) (vl) - adcl %ebx,%ebp - movl %edx,%eax - faddp %st,%st(1) // (val) (vr) (vl) - - // IT Filter Code - // b=reso*b+freq*(in-l); - // l+=freq*b; - fsubs fl1 // (in-l) .. - fmuls ffreq // (f*(in-l)) .. - flds fb1 // (b) (f*(in-l)) .. - fmuls freso // (r*b) (f*(in-l)) .. - faddp %st,%st(1) // (b') .. - fsts fb1 - fmuls ffreq // (f*b') .. - fadds fl1 // (l') .. - fsts fl1 // (val) (vr) (vl) - - shrl $24,%eax - - // Scopes - fld %st(0) // (val) (val) (vr) (vl) - fmul %st(2),%st // (val*vr) (val) (vr) (vl) - fld %st(1) // (val) (val*vr) (val) (vr) (vl) - fmul %st(4),%st // (val*vl) (val*vr) (val) (vr) (vl) - faddp %st(1),%st // (val*vl + val*vr) (val) (vr) (vl) - fistp (%esp) // (val) (vr) (vl) - lea 2(%esp),%esp - - fld %st(1) // (vr) (val) (vr) (vl) - fld %st(3) // (vl) (vr) (val) (vr) (vl) - fmul %st(2),%st // (left) (vr) (val) (vr) (vl) - fxch %st(4) // (vl) (vr) (val) (vr) (left) - fadds _volrl // (vl') (vr) (val) (vr) (left) - fxch %st(2) // (val) (vr) (vl') (vr) (left) - fmulp %st(1) // (right) (vl') (vr) (left) - fxch %st(2) // (vr) (vl') (right) (left) - fadds _volrr // (vr') (vl') (right) (left) - fxch %st(3) // (left) (vl') (right) (vr') - fadds -8(%edi) // (lfinal) (vl') (vr') - fxch %st(2) // (right) (vl') (lfinal) (vr') - fadds -4(%edi) // (rfinal) (vl') (lfinal) (vr') - fstps -4(%edi) // (vl') (lfinal) (vr') - fxch %st(1) // (lfinal) (vl) (vr) - fstps -8(%edi) // (vl) (vr) - fxch %st(1) // (vr) (vl) - decl %ecx - jnz .I2Fnext - - fstps _volr // (vl) - fstps _voll // - - shll $1,%ebp - movl %ebp,%eax - movl store2,%esp - ret - -kbasm_mix_stereo_cubic_filtered_i2f_noscopes: // mixing, stereo w/ cubic interpolation, FILTERED - flds _voll // (vl) - flds _volr // (vr) (vl) - movl %eax,%ebp - shrl $1,%ebp - movl %edx,%eax - shrl $24,%eax - - .p2align 4,,7 -.I2FnextN: // (vr) (vl) - fild (,%ebp,2) // (w0) (vl) - fmuls kb_x86_ct0(,%eax,4) // (w0') (vl) - fild 2(,%ebp,2) // (w1) (w0') (vl) - fmuls kb_x86_ct1(,%eax,4) // (w1') (w0') (vl) - fild 4(,%ebp,2) // (w2) (w1') (w0') (vl) - fmuls kb_x86_ct2(,%eax,4) // (w2') (w1') (w0') (vl) - fild 6(,%ebp,2) // (w3) (w2') (w1') (w0') (vl) - fmuls kb_x86_ct3(,%eax,4) // (w3') (w2') (w1') (w0') (vl) - fxch %st(2) // (w1') (w2') (w3') (w0') (vr) (vl) - faddp %st,%st(3) // (w2') (w3') (w0+w1) (vr) (vl) - addl %esi,%edx - lea 8(%edi),%edi - faddp %st,%st(2) // (w2+w3) (w0+w1) (vr) (vl) - adcl %ebx,%ebp - movl %edx,%eax - faddp %st,%st(1) // (val) (vr) (vl) - - // IT Filter Code - // b=reso*b+freq*(in-l); - // l+=freq*b; - fsubs fl1 // (in-l) .. - fmuls ffreq // (f*(in-l)) .. - flds fb1 // (b) (f*(in-l)) .. - fmuls freso // (r*b) (f*(in-l)) .. - faddp %st,%st(1) // (b') .. - fsts fb1 - fmuls ffreq // (f*b') .. - fadds fl1 // (l') .. - fsts fl1 // (val) (vr) (vl) - - shrl $24,%eax - - fld %st(1) // (vr) (val) (vr) (vl) - fld %st(3) // (vl) (vr) (val) (vr) (vl) - fmul %st(2),%st // (left) (vr) (val) (vr) (vl) - fxch %st(4) // (vl) (vr) (val) (vr) (left) - fadds _volrl // (vl') (vr) (val) (vr) (left) - fxch %st(2) // (val) (vr) (vl') (vr) (left) - fmulp %st(1) // (right) (vl') (vr) (left) - fxch %st(2) // (vr) (vl') (right) (left) - fadds _volrr // (vr') (vl') (right) (left) - fxch %st(3) // (left) (vl') (right) (vr') - fadds -8(%edi) // (lfinal) (vl') (vr') - fxch %st(2) // (right) (vl') (lfinal) (vr') - fadds -4(%edi) // (rfinal) (vl') (lfinal) (vr') - fstps -4(%edi) // (vl') (lfinal) (vr') - fxch %st(1) // (lfinal) (vl) (vr) - fstps -8(%edi) // (vl) (vr) - fxch %st(1) // (vr) (vl) - decl %ecx - jnz .I2FnextN - - fstps _volr // (vl) - fstps _voll // - - shll $1,%ebp - movl %ebp,%eax - ret - -kbasm_mix_stereo_cubic_filtered_i2f_backward: // mixing, stereo w/ cubic interpolation, FILTERED - flds _voll // (vl) - flds _volr // (vr) (vl) - movl %eax,%ebp - shrl $1,%ebp - movl %edx,%eax - negl %eax - shrl $24,%eax - movl %esp,store2 - movl scopebuf,%esp - - .p2align 4,,7 -.I2FBnext: // (vr) (vl) - fild (,%ebp,2) // (w0) (vl) - fmuls kb_x86_ct0(,%eax,4) // (w0') (vl) - fild -2(,%ebp,2) // (w1) (w0') (vl) - fmuls kb_x86_ct1(,%eax,4) // (w1') (w0') (vl) - fild -4(,%ebp,2) // (w2) (w1') (w0') (vl) - fmuls kb_x86_ct2(,%eax,4) // (w2') (w1') (w0') (vl) - fild -6(,%ebp,2) // (w3) (w2') (w1') (w0') (vl) - fmuls kb_x86_ct3(,%eax,4) // (w3') (w2') (w1') (w0') (vl) - fxch %st(2) // (w1') (w2') (w3') (w0') (vr) (vl) - faddp %st,%st(3) // (w2') (w3') (w0+w1) (vr) (vl) - addl %esi,%edx - lea 8(%edi),%edi - faddp %st,%st(2) // (w2+w3) (w0+w1) (vr) (vl) - adcl %ebx,%ebp - movl %edx,%eax - faddp %st,%st(1) // (val) (vr) (vl) - - // IT Filter Code - // b=reso*b+freq*(in-l); - // l+=freq*b; - fsubs fl1 // (in-l) .. - fmuls ffreq // (f*(in-l)) .. - flds fb1 // (b) (f*(in-l)) .. - fmuls freso // (r*b) (f*(in-l)) .. - negl %eax - faddp %st,%st(1) // (b') .. - fsts fb1 - fmuls ffreq // (f*b') .. - fadds fl1 // (l') .. - fsts fl1 // (val) (vr) (vl) - - shrl $24,%eax - - // Scopes - fld %st(0) // (val) (val) (vr) (vl) - fmul %st(2),%st // (val*vr) (val) (vr) (vl) - fld %st(1) // (val) (val*vr) (val) (vr) (vl) - fmul %st(4),%st // (val*vl) (val*vr) (val) (vr) (vl) - faddp %st(1),%st // (val*vl + val*vr) (val) (vr) (vl) - fistp (%esp) // (val) (vr) (vl) - lea 2(%esp),%esp - - fld %st(1) // (vr) (val) (vr) (vl) - fld %st(3) // (vl) (vr) (val) (vr) (vl) - fmul %st(2),%st // (left) (vr) (val) (vr) (vl) - fxch %st(4) // (vl) (vr) (val) (vr) (left) - fadds _volrl // (vl') (vr) (val) (vr) (left) - fxch %st(2) // (val) (vr) (vl') (vr) (left) - fmulp %st(1) // (right) (vl') (vr) (left) - fxch %st(2) // (vr) (vl') (right) (left) - fadds _volrr // (vr') (vl') (right) (left) - fxch %st(3) // (left) (vl') (right) (vr') - fadds -8(%edi) // (lfinal) (vl') (vr') - fxch %st(2) // (right) (vl') (lfinal) (vr') - fadds -4(%edi) // (rfinal) (vl') (lfinal) (vr') - fstps -4(%edi) // (vl') (lfinal) (vr') - fxch %st(1) // (lfinal) (vl) (vr) - fstps -8(%edi) // (vl) (vr) - fxch %st(1) // (vr) (vl) - decl %ecx - jnz .I2FBnext - - fstps _volr // (vl) - fstps _voll // - - shll $1,%ebp - movl %ebp,%eax - movl store2,%esp - ret - -kbasm_mix_stereo_cubic_filtered_i2f_backward_noscopes: // mixing, stereo w/ cubic interpolation, FILTERED - flds _voll // (vl) - flds _volr // (vr) (vl) - movl %eax,%ebp - shrl $1,%ebp - movl %edx,%eax - negl %eax - shrl $24,%eax - - .p2align 4,,7 -.I2FBnextN: // (vr) (vl) - fild (,%ebp,2) // (w0) (vl) - fmuls kb_x86_ct0(,%eax,4) // (w0') (vl) - fild -2(,%ebp,2) // (w1) (w0') (vl) - fmuls kb_x86_ct1(,%eax,4) // (w1') (w0') (vl) - fild -4(,%ebp,2) // (w2) (w1') (w0') (vl) - fmuls kb_x86_ct2(,%eax,4) // (w2') (w1') (w0') (vl) - fild -6(,%ebp,2) // (w3) (w2') (w1') (w0') (vl) - fmuls kb_x86_ct3(,%eax,4) // (w3') (w2') (w1') (w0') (vl) - fxch %st(2) // (w1') (w2') (w3') (w0') (vr) (vl) - faddp %st,%st(3) // (w2') (w3') (w0+w1) (vr) (vl) - addl %esi,%edx - lea 8(%edi),%edi - faddp %st,%st(2) // (w2+w3) (w0+w1) (vr) (vl) - adcl %ebx,%ebp - movl %edx,%eax - faddp %st,%st(1) // (val) (vr) (vl) - - // IT Filter Code - // b=reso*b+freq*(in-l); - // l+=freq*b; - fsubs fl1 // (in-l) .. - fmuls ffreq // (f*(in-l)) .. - flds fb1 // (b) (f*(in-l)) .. - fmuls freso // (r*b) (f*(in-l)) .. - negl %eax - faddp %st,%st(1) // (b') .. - fsts fb1 - fmuls ffreq // (f*b') .. - fadds fl1 // (l') .. - fsts fl1 // (val) (vr) (vl) - - shrl $24,%eax - - fld %st(1) // (vr) (val) (vr) (vl) - fld %st(3) // (vl) (vr) (val) (vr) (vl) - fmul %st(2),%st // (left) (vr) (val) (vr) (vl) - fxch %st(4) // (vl) (vr) (val) (vr) (left) - fadds _volrl // (vl') (vr) (val) (vr) (left) - fxch %st(2) // (val) (vr) (vl') (vr) (left) - fmulp %st(1) // (right) (vl') (vr) (left) - fxch %st(2) // (vr) (vl') (right) (left) - fadds _volrr // (vr') (vl') (right) (left) - fxch %st(3) // (left) (vl') (right) (vr') - fadds -8(%edi) // (lfinal) (vl') (vr') - fxch %st(2) // (right) (vl') (lfinal) (vr') - fadds -4(%edi) // (rfinal) (vl') (lfinal) (vr') - fstps -4(%edi) // (vl') (lfinal) (vr') - fxch %st(1) // (lfinal) (vl) (vr) - fstps -8(%edi) // (vl) (vr) - fxch %st(1) // (vr) (vl) - decl %ecx - jnz .I2FBnextN - - fstps _volr // (vl) - fstps _voll // - - shll $1,%ebp - movl %ebp,%eax - ret - .globl kbasm_declick_postproc kbasm_declick_postproc: pushl %ebp @@ -761,5 +376,143 @@ leave ret - + + .MACRO CUBICMIXER SCOPES=0 FILTERED=0 BACKWARDS=0 + flds _voll !! (vl) + flds _volr !! (vr) (vl) + movl %eax,%ebp + shrl $1,%ebp + movl %edx,%eax + .AIF \BACKWARDS EQ 1 + negl %eax + .AENDI + shrl $24,%eax + + .AIF \SCOPES EQ 1 + movl %esp,store2 + movl scopebuf,%esp + .AENDI + + .p2align 4,,7 +cubicmixer\@: + fild (,%ebp,2) !! (w0) (vl) + fmuls kb_x86_ct0(,%eax,4) !! (w0') (vl) + .AIF \BACKWARDS EQ 0 + fild 2(,%ebp,2) !! (w1) (w0') (vl) + fmuls kb_x86_ct1(,%eax,4) !! (w1') (w0') (vl) + fild 4(,%ebp,2) !! (w2) (w1') (w0') (vl) + fmuls kb_x86_ct2(,%eax,4) !! (w2') (w1') (w0') (vl) + fild 6(,%ebp,2) !! (w3) (w2') (w1') (w0') (vl) + .AELSE + fild -2(,%ebp,2) !! (w1) (w0') (vl) + fmuls kb_x86_ct1(,%eax,4) !! (w1') (w0') (vl) + fild -4(,%ebp,2) !! (w2) (w1') (w0') (vl) + fmuls kb_x86_ct2(,%eax,4) !! (w2') (w1') (w0') (vl) + fild -6(,%ebp,2) !! (w3) (w2') (w1') (w0') (vl) + .AENDI + fmuls kb_x86_ct3(,%eax,4) !! (w3') (w2') (w1') (w0') (vl) + fxch %st(2) !! (w1') (w2') (w3') (w0') (vr) (vl) + faddp %st,%st(3) !! (w2') (w3') (w0+w1) (vr) (vl) + addl %esi,%edx + lea 8(%edi),%edi + faddp %st,%st(2) !! (w2+w3) (w0+w1) (vr) (vl) + adcl %ebx,%ebp + movl %edx,%eax + faddp %st,%st(1) !! (val) (vr) (vl) + + .AIF \BACKWARDS EQ 1 + negl %eax + .AENDI + + .AIF \FILTERED EQ 1 + !! IT Filter Code + !! b=reso*b+freq*(in-l); + !! l+=freq*b; + fsubs fl1 !! (in-l) .. + fmuls ffreq !! (f*(in-l)) .. + flds fb1 !! (b) (f*(in-l)) .. + fmuls freso !! (r*b) (f*(in-l)) .. + faddp %st,%st(1) !! (b') .. + fsts fb1 + fmuls ffreq !! (f*b') .. + fadds fl1 !! (l') .. + fsts fl1 !! (val) (vr) (vl) + .AENDI + + shrl $24,%eax + + .AIF \SCOPES EQ 1 + !! Scopes + fld %st(0) !! (val) (val) (vr) (vl) + fmul %st(2),%st !! (val*vr) (val) (vr) (vl) + fld %st(1) !! (val) (val*vr) (val) (vr) (vl) + fmul %st(4),%st !! (val*vl) (val*vr) (val) (vr) (vl) + faddp %st(1),%st !! (val*vl + val*vr) (val) (vr) (vl) + fistp (%esp) !! (val) (vr) (vl) + lea 2(%esp),%esp + .AENDI + + fld %st(1) !! (vr) (val) (vr) (vl) + fld %st(3) !! (vl) (vr) (val) (vr) (vl) + fmul %st(2),%st !! (left) (vr) (val) (vr) (vl) + fxch %st(4) !! (vl) (vr) (val) (vr) (left) + fadds _volrl !! (vl') (vr) (val) (vr) (left) + fxch %st(2) !! (val) (vr) (vl') (vr) (left) + fmulp %st(1) !! (right) (vl') (vr) (left) + fxch %st(2) !! (vr) (vl') (right) (left) + fadds _volrr !! (vr') (vl') (right) (left) + fxch %st(3) !! (left) (vl') (right) (vr') + fadds -8(%edi) !! (lfinal) (vl') (vr') + fxch %st(2) !! (right) (vl') (lfinal) (vr') + fadds -4(%edi) !! (rfinal) (vl') (lfinal) (vr') + fstps -4(%edi) !! (vl') (lfinal) (vr') + fxch %st(1) !! (lfinal) (vl) (vr) + fstps -8(%edi) !! (vl) (vr) + fxch %st(1) !! (vr) (vl) + decl %ecx + jnz cubicmixer\@ + + fstps _volr !! (vl) + fstps _voll !! - + shll $1,%ebp + movl %ebp,%eax + + .AIF \SCOPES EQ 1 + movl store2,%esp + .AENDI + + ret + .ENDM + +kbasm_mix_cubic_noscopes_unfiltered_forward: + CUBICMIXER 0 0 0 +kbasm_mix_cubic_noscopes_unfiltered_backward: + CUBICMIXER 0 0 1 +kbasm_mix_cubic_noscopes_filtered_forward: + CUBICMIXER 0 1 0 +kbasm_mix_cubic_noscopes_filtered_backward: + CUBICMIXER 0 1 1 +kbasm_mix_cubic_scopes_unfiltered_forward: + CUBICMIXER 1 0 0 +kbasm_mix_cubic_scopes_unfiltered_backward: + CUBICMIXER 1 0 1 +kbasm_mix_cubic_scopes_filtered_forward: + CUBICMIXER 1 1 0 +kbasm_mix_cubic_scopes_filtered_backward: + CUBICMIXER 1 1 1 + +\(.data) +.globl kbasm_mixers +kbasm_mixers: + .long kbasm_mix_cubic_noscopes_unfiltered_forward + .long kbasm_mix_cubic_noscopes_unfiltered_backward + .long kbasm_mix_cubic_noscopes_filtered_forward + .long kbasm_mix_cubic_noscopes_filtered_backward + .long kbasm_mix_cubic_scopes_unfiltered_forward + .long kbasm_mix_cubic_scopes_unfiltered_backward + .long kbasm_mix_cubic_scopes_filtered_forward + .long kbasm_mix_cubic_scopes_filtered_backward + #endif /* defined(__i386__) */ + + .END diff -urN soundtracker-0.5.0/app/mixers/kb-x86-asm.h soundtracker-0.5.1/app/mixers/kb-x86-asm.h --- soundtracker-0.5.0/app/mixers/kb-x86-asm.h Sun Mar 12 21:17:04 2000 +++ soundtracker-0.5.1/app/mixers/kb-x86-asm.h Sun Mar 19 16:58:02 2000 @@ -47,10 +47,14 @@ float fl1; // filter lp buffer 52 float fb1; // filter bp buffer 56 gint16 *scopebuf; // 60 + guint32 flags; // which mixer to use 64 } kb_x86_mixer_data; +#define KB_X86_MIXER_FLAGS_BACKWARD (1 << 2) +#define KB_X86_MIXER_FLAGS_FILTERED (1 << 3) +#define KB_X86_MIXER_FLAGS_SCOPES (1 << 4) + void kbasm_mix (kb_x86_mixer_data *data); // 8 -void kbasm_mix_backward (kb_x86_mixer_data *data); // 8 void kbasm_declick_postproc (kb_x86_mixer_data *data); // 8 diff -urN soundtracker-0.5.0/app/mixers/kb-x86.c soundtracker-0.5.1/app/mixers/kb-x86.c --- soundtracker-0.5.0/app/mixers/kb-x86.c Mon Mar 13 13:38:43 2000 +++ soundtracker-0.5.1/app/mixers/kb-x86.c Sun Mar 19 17:13:52 2000 @@ -409,6 +409,14 @@ md.ffreq = ch->ffreq; md.fl1 = ch->fl1; md.fb1 = ch->fb1; + md.flags = KB_X86_MIXER_FLAGS_FILTERED; + + if(md.ffreq == 1.0 && md.freso == 0.0) { + md.flags &= ~KB_X86_MIXER_FLAGS_FILTERED; + } + if(md.scopebuf) { + md.flags |= KB_X86_MIXER_FLAGS_SCOPES; + } if((ch->direction == 1 && pos >= ende - KB_X86_SAMPLE_PADDING) || (ch->direction == -1 && pos < (gint32)(ch->sample->loopstart + KB_X86_SAMPLE_PADDING))) { @@ -540,7 +548,8 @@ } else { md.positioni = buffer + ((sizeof(buffer) / sizeof(buffer[0])) - 1); kb_x86_mix_handle_last_mixed_pre(ch, &md); - kbasm_mix_backward(&md); + md.flags |= KB_X86_MIXER_FLAGS_BACKWARD; + kbasm_mix(&md); ch->positionw = md.positioni - (buffer + ((sizeof(buffer) / sizeof(buffer[0])) - 1)) + pos; } kb_x86_mix_handle_last_mixed_post(ch, &md); @@ -604,7 +613,8 @@ md.positioni = (gint16*)ch->sample->data + pos; md.numsamples = num_samples; kb_x86_mix_handle_last_mixed_pre(ch, &md); - kbasm_mix_backward(&md); + md.flags |= KB_X86_MIXER_FLAGS_BACKWARD; + kbasm_mix(&md); kb_x86_mix_handle_last_mixed_post(ch, &md); } diff -urN soundtracker-0.5.0/app/sample-editor.c soundtracker-0.5.1/app/sample-editor.c --- soundtracker-0.5.0/app/sample-editor.c Mon Mar 13 13:24:44 2000 +++ soundtracker-0.5.1/app/sample-editor.c Sat Mar 25 10:57:05 2000 @@ -861,13 +861,12 @@ int cutlen, newlen; void *newsample; STSample *oldsample = current_sample; - int ss = sampledisplay->sel_start, se, mult; + int ss = sampledisplay->sel_start, se; if(oldsample == NULL || ss == -1) return; se = sampledisplay->sel_end; - mult = mixer_sample_word_length(&oldsample->sample); cutlen = se - ss; newlen = oldsample->sample.length - cutlen; @@ -878,13 +877,13 @@ copybuffer = NULL; } copybufferlen = cutlen; - copybuffer = malloc(copybufferlen * mult); + copybuffer = malloc(copybufferlen * 2); if(!copybuffer) { error_error("Out of memory for copybuffer.\n"); } else { memcpy(copybuffer, - oldsample->sample.data + ss * mult, - cutlen * mult); + oldsample->sample.data + ss * 2, + cutlen * 2); } } @@ -896,7 +895,7 @@ return; } - newsample = malloc(newlen * mult); + newsample = malloc(newlen * 2); if(!newsample) return; @@ -904,10 +903,10 @@ memcpy(newsample, oldsample->sample.data, - ss * mult); - memcpy(newsample + ss * mult, - oldsample->sample.data + se * mult, - (oldsample->sample.length - se) * mult); + ss * 2); + memcpy(newsample + ss * 2, + oldsample->sample.data + se * 2, + (oldsample->sample.length - se) * 2); free(oldsample->sample.data); @@ -988,7 +987,7 @@ { void *newsample; STSample *oldsample = current_sample; - int ss = sampledisplay->sel_start, mult, newlen; + int ss = sampledisplay->sel_start, newlen; int update_ie = 0; if(oldsample == NULL || copybuffer == NULL) @@ -1006,11 +1005,9 @@ return; } - mult = mixer_sample_word_length(&oldsample->sample); - newlen = oldsample->sample.length + copybufferlen; - newsample = malloc(newlen * mult); + newsample = malloc(newlen * 2); if(!newsample) return; @@ -1018,17 +1015,17 @@ memcpy(newsample, oldsample->sample.data, - ss * mult); + ss * 2); st_convert_sample(copybuffer, - newsample + ss * mult, + newsample + ss * 2, 16, 16, copybufferlen); - st_sample_cutoff_lowest_8_bits(newsample + ss * mult, + st_sample_cutoff_lowest_8_bits(newsample + ss * 2, copybufferlen); - memcpy(newsample + (ss + copybufferlen) * mult, - oldsample->sample.data + ss * mult, - (oldsample->sample.length - ss) * mult); + memcpy(newsample + (ss + copybufferlen) * 2, + oldsample->sample.data + ss * 2, + (oldsample->sample.length - ss) * 2); free(oldsample->sample.data); @@ -1060,6 +1057,8 @@ int len; int i, count; + statusbar_update(STATUS_LOADING_SAMPLE); + len = 2 * wavload_frameCount * wavload_channelCount; if(!(sbuf = malloc(len))) { error_error("Out of memory for sample data."); @@ -1125,9 +1124,12 @@ sample_editor_update(); xm_set_modified(1); afCloseFile(wavload_file); + + statusbar_update(STATUS_SAMPLE_LOADED); return; errnodata: + statusbar_update(STATUS_IDLE); free(sbuf); errnobuf: afCloseFile(wavload_file); @@ -1299,6 +1301,8 @@ AFfilehandle outfile; AFfilesetup outfilesetup; + statusbar_update(STATUS_SAVING_SAMPLE); + file_selection_save_path(fn, gui_settings.savesmpl_path); outfilesetup = afNewFileSetup(); @@ -1316,7 +1320,7 @@ if(current_sample->treat_as_8bit) { void *buf = malloc(1 * length); g_assert(buf); - st_convert_sample(current_sample->sample.data + offset * mixer_sample_word_length(¤t_sample->sample), + st_convert_sample(current_sample->sample.data + offset * 2, buf, 16, 8, @@ -1329,11 +1333,13 @@ free(buf); } else { afWriteFrames(outfile, AF_DEFAULT_TRACK, - current_sample->sample.data + offset * mixer_sample_word_length(¤t_sample->sample), + current_sample->sample.data + offset * 2, length); } afCloseFile(outfile); + + statusbar_update(STATUS_SAMPLE_SAVED); } static void @@ -1682,41 +1688,27 @@ int action = (int)data; double left, right; int ss = sampledisplay->sel_start, se = sampledisplay->sel_end; - int mult, i; - + int i; + gint16 *p; + if(action == 2 || !current_sample || ss == -1) { sample_editor_close_volume_ramp_dialog(); return; } - mult = mixer_sample_word_length(¤t_sample->sample); - if(action == 0) { // Find maximum amplitude int m; - if(mult == 1) { - gint8 *p = current_sample->sample.data; - int q; - p += ss; - for(i = 0, m = 0; i < se - ss; i++) { - q = *p++; - q = ABS(q); - if(q > m) - m = q; - } - left = right = (double)0x7f / m; - } else { - gint16 *p = current_sample->sample.data; - int q; - p += ss; - for(i = 0, m = 0; i < se - ss; i++) { - q = *p++; - q = ABS(q); - if(q > m) - m = q; - } - left = right = (double)0x7fff / m; + int q; + p = current_sample->sample.data; + p += ss; + for(i = 0, m = 0; i < se - ss; i++) { + q = *p++; + q = ABS(q); + if(q > m) + m = q; } + left = right = (double)0x7fff / m; } else { left = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(sample_editor_volramp_spin_w[0])) / 100; right = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(sample_editor_volramp_spin_w[1])) / 100; @@ -1725,22 +1717,12 @@ // Now perform the actual operation sample_editor_lock_sample(); - if(mult == 1) { - gint8 *p = current_sample->sample.data; - p += ss; - for(i = 0; i < se - ss; i++) { - double q = *p; - q *= left + i * (right - left) / (se - ss); - *p++ = CLAMP((int)q, -128, +127); - } - } else { - gint16 *p = current_sample->sample.data; - p += ss; - for(i = 0; i < se - ss; i++) { - double q = *p; - q *= left + i * (right - left) / (se - ss); - *p++ = CLAMP((int)q, -32768, +32767); - } + p = current_sample->sample.data; + p += ss; + for(i = 0; i < se - ss; i++) { + double q = *p; + q *= left + i * (right - left) / (se - ss); + *p++ = CLAMP((int)q, -32768, +32767); } xm_set_modified(1); @@ -1753,40 +1735,23 @@ sample_editor_reverse_clicked (void) { int ss = sampledisplay->sel_start, se = sampledisplay->sel_end; - int mult, i; + int i; + gint16 *p, *q; if(!current_sample || ss == -1) { return; } - mult = mixer_sample_word_length(¤t_sample->sample); - sample_editor_lock_sample(); - if(mult == 1) { - gint8 *p = current_sample->sample.data; - gint8 *q = p; - - p += ss; - q += se; - - for(i = 0; i < (se - ss)/2; i++) { - double t = *p; - *p++ = *q; - *q-- = t; - } - } else { - gint16 *p = current_sample->sample.data; - gint16 *q = p; - - p += ss; - q += se; - - for(i = 0; i < (se - ss)/2; i++) { - double t = *p; - *p++ = *q; - *q-- = t; - } + p = q = current_sample->sample.data; + p += ss; + q += se; + + for(i = 0; i < (se - ss)/2; i++) { + gint16 t = *p; + *p++ = *--q; + *q = t; } xm_set_modified(1); @@ -1794,8 +1759,3 @@ sample_editor_update(); sample_display_set_selection(sampledisplay, ss, se); } - - - - - diff -urN soundtracker-0.5.0/app/scope-group.c soundtracker-0.5.1/app/scope-group.c --- soundtracker-0.5.0/app/scope-group.c Sun Mar 12 21:21:01 2000 +++ soundtracker-0.5.1/app/scope-group.c Sat Mar 25 10:40:46 2000 @@ -27,6 +27,7 @@ #include #include +#include #include "scope-group.h" #include "sample-display.h" @@ -84,14 +85,13 @@ } gint -scope_group_timeout (gpointer data) +scope_group_timeout (ScopeGroup *s) { double time1, time2; int i, l; static gint16 *buf = NULL; static int bufsize = 0; int o1, o2; - ScopeGroup *s = data; if(!s->scopes_on || !scopebuf_ready || !current_driver) return TRUE; @@ -161,7 +161,7 @@ if(!s->scopes_on || s->gtktimer != -1) return; - s->gtktimer = gtk_timeout_add(1000/s->update_freq, scope_group_timeout, s); + s->gtktimer = gtk_timeout_add(1000/s->update_freq, (gint(*)())scope_group_timeout, s); } void diff -urN soundtracker-0.5.0/app/track-editor.c soundtracker-0.5.1/app/track-editor.c --- soundtracker-0.5.0/app/track-editor.c Sat Mar 11 21:35:46 2000 +++ soundtracker-0.5.1/app/track-editor.c Sat Mar 25 09:29:00 2000 @@ -36,8 +36,10 @@ #include "sample-editor.h" #include "gui-subs.h" #include "preferences.h" +#include "tracker-settings.h" Tracker *tracker; +GtkWidget *trackersettings; GtkWidget *vscrollbar; static GtkWidget *hscrollbar; @@ -70,6 +72,227 @@ static gboolean track_editor_handle_column_input(Tracker *t, int gdkkey); void +show_editmode_status(void) +{ + Tracker *t = tracker; + XMNote *note = &t->curpattern->channels[t->cursor_ch][t->patpos]; + gchar ed_buf[128], tmp_buf[128]; + int cmd_p1, cmd_p2; + + static const gchar *fx_commands[]={ + N_("Arpeggio"), /* 0 */ + N_("Porta up"), /* 1 */ + N_("Porta down"), /* 2 */ + N_("Tone porta"), /* 3 */ + N_("Vibrato"), /* 4 */ + N_("Tone porta + Volume slide"), /* 5 */ + N_("Vibrato + Volume slide"), /* 6 */ + N_("Tremolo"), /* 7 */ + N_("Set panning"), /* 8 */ + N_("Position jump"), /* 9 */ + N_("Set volume"), /* A */ + N_("Position jump"), /* B */ + N_("Set volume"), /* C */ + N_("Pattern break"), /* D */ + NULL, /* E */ + N_("Set tempo/bpm"), /* F */ + N_("Set global volume"), /* G */ + N_("Global volume slide"), /* H */ + NULL, /* I */ + NULL, /* J */ + N_("Key off"), /* K */ + N_("Set envelop position"), /* L */ + NULL, /* M */ + NULL, /* N */ + NULL, /* O */ + N_("Panning slide"), /* P */ + N_("LP filter resonance"), /* Q */ + N_("Multi retrig note"), /* R */ + NULL, /* S */ + N_("Tremor"), /* T */ + NULL, /* U */ + NULL, /* V */ + NULL, /* W */ + NULL, /* X */ + NULL, /* Y */ + N_("LP filter cutoff"), /* Z */ + }; + + static const gchar *e_fx_commands[]={ + NULL, /* 0 */ + N_("Fine porta up"), /* 1 */ + N_("Fine porta down"), /* 2 */ + N_("Set gliss control"), /* 3 */ + N_("Set vibrato control"), /* 4 */ + N_("Set finetune"), /* 5 */ + N_("Set loop begin/loop"), /* 6 */ + N_("Set tremolo control"), /* 7 */ + NULL, /* 8 */ + N_("Retrig note"), /* 9 */ + N_("Fine volume slide up"), /* A */ + N_("Fine volume slide down"), /* B */ + N_("Note cut"), /* C */ + N_("Note delay"), /* D */ + N_("Pattern delay"), /* E */ + NULL, /* F */ + }; + + static const gchar *vol_fx_commands[]={ + N_("Volume slide down"), + N_("Volume slide up"), + N_("Fine volume slide down"), + N_("Fine volume slide up"), + N_("Set vibrato speed"), + N_("Vibrato"), + N_("Set panning"), + N_("Panning slide left"), + N_("Panning slide right"), + N_("Tone porta"), + }; + + static const gchar *e47_fx_forms[]={ + N_("sine"), /* 0 */ + N_("ramp down"), /* 1 */ + N_("square"), /* 2 */ + }; + + sprintf(ed_buf, "[Chnn: %02d] [Pos: %03d] [Instr: %03d] ", t->cursor_ch+1, + t->patpos, + note->instrument); + + strcat(ed_buf, "[Vol: "); + + switch(note->volume&0xf0) + { + case 0: + strcat(ed_buf, _("None")); + break; + case 0x10: case 0x20: case 0x30: case 0x40: case 0x50: + strcat(ed_buf, _("Set volume")); + break; + default: + if(note->volume>0xf) { + sprintf(tmp_buf,"%s", vol_fx_commands[((note->volume&0xf0)-0x60)>>4]); + strcat(ed_buf, tmp_buf); + } else + strcat(ed_buf, _("None")); + break; + } + + if(note->volume&0xf0) { + if(note->volume>=0x10 && note->volume<=0x50) + sprintf(tmp_buf, " => %02d ] ", note->volume-0x10); + else + sprintf(tmp_buf, " => %02d ] ", note->volume&0xf); + } else + sprintf(tmp_buf, " ] "); + strcat(ed_buf, tmp_buf); + + + bzero(tmp_buf, strlen(tmp_buf)); + strcat(ed_buf, "[Cmd: "); + + /* enum values maybe for fx numbers ? */ + switch(note->fxtype) + { + case 0: + if(note->fxparam) + sprintf(tmp_buf, "%s", fx_commands[note->fxtype]); + else + sprintf(tmp_buf, "None ]"); + break; + case 14: + switch((note->fxparam&0xf0)>>4) + { + case 0: case 8: case 15: + sprintf(tmp_buf, "None ]"); + break; + default: + sprintf(tmp_buf, "%s", e_fx_commands[(note->fxparam&0xf0)>>4]); + break; + } + break; + case 33: + switch((note->fxparam&0xf0)>>4) + { + case 1: + sprintf(tmp_buf, "Extra fine porta up"); + break; + case 2: + sprintf(tmp_buf, "Extra fine porta down"); + break; + default: + sprintf(tmp_buf, "None ]"); + break; + } + break; + case 18: case 19: case 22: case 23: case 24: + case 28: case 30: case 31: case 32: case 34: + sprintf(tmp_buf, "None ]"); + break; + + default: + sprintf(tmp_buf, "%s", fx_commands[note->fxtype]); + break; + } + strcat(ed_buf, tmp_buf); + + bzero(tmp_buf, strlen(tmp_buf)); + + cmd_p1 = (note->fxparam&0xf0)>>4; + cmd_p2 = note->fxparam&0xf; + + /* enum values maybe for fx numbers ? */ + switch(note->fxtype) + { + case 0: + if(note->fxparam) + sprintf(tmp_buf, " => %02d %02d ]", cmd_p1, cmd_p2); + break; + case 4: case 7: case 10: case 17: case 25: case 27: case 29: + sprintf(tmp_buf, " => %02d %02d ]", cmd_p1, cmd_p2); + break; + case 1: case 2: case 3: case 5: case 6: case 8: case 9: + case 11: case 12: case 13: case 15: case 16: case 21: case 26: case 35: + + if(note->fxtype==15) + if (note->fxparam<32) + sprintf(tmp_buf, " => tempo: %02d ]", note->fxparam); + else + sprintf(tmp_buf, " => BPM: %03d ]", note->fxparam); + else if(note->fxtype==9) + sprintf(tmp_buf, " => offset: %d ]", note->fxparam<<8); + else + sprintf(tmp_buf, " => %03d ]", note->fxparam); + + break; + case 14: + if(cmd_p1!=0 && cmd_p1!=8 && cmd_p1!=15) { + if((cmd_p1==4 || cmd_p1==7) && (cmd_p2<3)) + sprintf(tmp_buf, " => %02d (%s) ]", cmd_p2, e47_fx_forms[cmd_p2]); + else + sprintf(tmp_buf, " => %02d ]", cmd_p2); + } + break; + case 33: + if (cmd_p1==1 || cmd_p1==2) + sprintf(tmp_buf, " => %02d ]", cmd_p2); + break; + default: + sprintf(tmp_buf, "]"); + break; + } + strcat(ed_buf, tmp_buf); + +#ifdef USE_GNOME + gnome_appbar_set_status(GNOME_APPBAR(status_bar), ed_buf); +#else + gtk_statusbar_pop(GTK_STATUSBAR(status_bar), statusbar_context_id); + gtk_statusbar_push(GTK_STATUSBAR(status_bar), statusbar_context_id, ed_buf); +#endif +} + +void track_editor_set_num_channels (int n) { int i; @@ -132,6 +355,9 @@ gtk_signal_connect(GTK_OBJECT(thing), "xpanning", GTK_SIGNAL_FUNC(update_hscrollbar), NULL); tracker = TRACKER(thing); + trackersettings = trackersettings_new(); + trackersettings_set_tracker_widget(TRACKERSETTINGS(trackersettings), tracker); + hscrollbar = gtk_hscrollbar_new(NULL); gtk_table_attach(GTK_TABLE(table), hscrollbar, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); gtk_widget_show(hscrollbar); @@ -471,6 +697,8 @@ break; } + if (GTK_TOGGLE_BUTTON(editing_toggle)->active) show_editmode_status(); + return handled; } @@ -865,6 +1093,10 @@ FILE *f; int i; + if(gui_settings.save_settings_on_exit) { + trackersettings_write_settings(); + } + prefs_check_prefs_dir(); sprintf(buf, "%s/jazz", prefs_get_prefsdir()); @@ -879,5 +1111,3 @@ fclose(f); } - - diff -urN soundtracker-0.5.0/app/track-editor.h soundtracker-0.5.1/app/track-editor.h --- soundtracker-0.5.0/app/track-editor.h Sat Feb 19 11:58:33 2000 +++ soundtracker-0.5.1/app/track-editor.h Sat Mar 25 09:19:20 2000 @@ -22,14 +22,13 @@ #ifndef _TRACK_EDITOR_H #define _TRACK_EDITOR_H -#include -#include +#include -#include -#include "xm.h" #include "tracker.h" +#include "tracker-settings.h" extern Tracker *tracker; +extern GtkWidget *trackersettings; extern GtkWidget *vscrollbar; void tracker_page_create (GtkNotebook *nb); diff -urN soundtracker-0.5.0/app/tracker-settings.c soundtracker-0.5.1/app/tracker-settings.c --- soundtracker-0.5.0/app/tracker-settings.c Thu Jan 1 01:00:00 1970 +++ soundtracker-0.5.1/app/tracker-settings.c Sat Mar 25 10:27:39 2000 @@ -0,0 +1,386 @@ + +/* + * The Real SoundTracker - GTK+ Tracker widget settings + * + * Copyright (C) 2000 Michael Krause + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include + +#include + +#include "tracker-settings.h" +#include "i18n.h" +#include "gui-subs.h" +#include "preferences.h" + +/* A global font list is kept here, so that when (at some time in the + future) we have to deal with multiple Tracker widgets, this can be + easily adapted. */ + +static GList *trackersettings_fontlist; + +static void +trackersettings_gui_add_font (TrackerSettings *ts, + gchar *fontname, + int position) +{ + gchar *insertbuf[1]; + + trackersettings_fontlist = g_list_insert(trackersettings_fontlist, fontname, position); + + insertbuf[0] = fontname; + + gtk_clist_insert(GTK_CLIST(ts->clist), position, insertbuf); +} + +static void +trackersettings_gui_delete_font (TrackerSettings *ts, + int position) +{ + GList *ll = g_list_nth(trackersettings_fontlist, position); + + g_free(ll->data); + trackersettings_fontlist = g_list_remove_link(trackersettings_fontlist, ll); + + gtk_clist_remove(GTK_CLIST(ts->clist), position); + ts->clist_selected_row = -1; +} + +static void +trackersettings_gui_exchange_font (TrackerSettings *ts, + int p1, + int p2) +{ + gtk_clist_swap_rows(GTK_CLIST(ts->clist), p1, p2); + gtk_clist_select_row(GTK_CLIST(ts->clist), p2, 0); +} + +static void +trackersettings_gui_populate_clist (TrackerSettings *ts) +{ + gchar *insertbuf[1]; + GList *l; + + for(l = trackersettings_fontlist; l != NULL; l = l->next) { + insertbuf[0] = (gchar*)l->data; + gtk_clist_append(GTK_CLIST(ts->clist), insertbuf); + } +} + +static void +trackersettings_clist_selected (GtkCList *clist, + gint row, + gint column, + GdkEvent *event, + TrackerSettings *ts) +{ + ts->clist_selected_row = row; +} + +static void +trackersettings_add_font (GtkWidget *widget, + TrackerSettings *ts) +{ + gtk_widget_show(ts->fontsel_dialog); +} + +static void +trackersettings_add_font_ok (GtkWidget *widget, + TrackerSettings *ts) +{ + int row; + + gtk_widget_hide(ts->fontsel_dialog); + + if(gtk_font_selection_dialog_get_font(GTK_FONT_SELECTION_DIALOG(ts->fontsel_dialog))) { + row = ts->clist_selected_row; + if(row == -1) { + row = 0; + } + + trackersettings_gui_add_font(ts, + gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(ts->fontsel_dialog)), + row); + } +} + +static void +trackersettings_add_font_cancel (GtkWidget *widget, + TrackerSettings *ts) +{ + gtk_widget_hide(ts->fontsel_dialog); +} + +static void +trackersettings_delete_font (GtkWidget *widget, + TrackerSettings *ts) +{ + int sel = ts->clist_selected_row; + + if(sel != -1) { + trackersettings_gui_delete_font(ts, sel); + } +} + +static void +trackersettings_apply_font (GtkWidget *widget, + TrackerSettings *ts) +{ + int sel = ts->clist_selected_row; + + if(sel != -1) { + tracker_set_font(ts->tracker, g_list_nth_data(trackersettings_fontlist, sel)); + } +} + +void +trackersettings_cycle_font_forward (TrackerSettings *t) +{ + int len = g_list_length(trackersettings_fontlist); + + t->current_font++; + t->current_font %= len; + + tracker_set_font(t->tracker, g_list_nth_data(trackersettings_fontlist, t->current_font)); +} + +void +trackersettings_cycle_font_backward (TrackerSettings *t) +{ + int len = g_list_length(trackersettings_fontlist); + + t->current_font--; + if(t->current_font < 0) { + t->current_font = len - 1; + } + + tracker_set_font(t->tracker, g_list_nth_data(trackersettings_fontlist, t->current_font)); +} + +static GList * +my_g_list_swap (GList *l, + int p1, + int p2) +{ + GList *l1, *l2; + gpointer l1d, l2d; + + if(p1 > p2) { + int p3 = p2; + p2 = p1; + p1 = p3; + } + + l1 = g_list_nth(l, p1); + l2 = g_list_nth(l, p2); + l1d = l1->data; + l2d = l2->data; + + l = g_list_remove_link(l, l1); + l = g_list_remove_link(l, l2); + l = g_list_insert(l, l2d, p1); + l = g_list_insert(l, l1d, p2); + + return l; +} + +static void +trackersettings_font_exchange (TrackerSettings *ts, + int p1, + int p2) +{ + trackersettings_fontlist = my_g_list_swap(trackersettings_fontlist, p1, p2); + trackersettings_gui_exchange_font(ts, p1, p2); +} + +static void +trackersettings_font_up (GtkWidget *button, + TrackerSettings *ts) +{ + if(ts->clist_selected_row > 0) { + trackersettings_font_exchange(ts, ts->clist_selected_row, ts->clist_selected_row - 1); + } +} + +static void +trackersettings_font_down (GtkWidget *button, + TrackerSettings *ts) +{ + if(ts->clist_selected_row != -1 && ts->clist_selected_row < g_list_length(trackersettings_fontlist) - 1) { + trackersettings_font_exchange(ts, ts->clist_selected_row, ts->clist_selected_row + 1); + } +} + +GtkWidget* +trackersettings_new (void) +{ + TrackerSettings *ts; + gchar *clisttitles[] = { _("Font list") }; + GtkWidget *hbox1, *hbox2, *thing; + + ts = gtk_type_new(trackersettings_get_type()); + GTK_BOX(ts)->spacing = 2; + GTK_BOX(ts)->homogeneous = FALSE; + + ts->clist_selected_row = -1; + ts->current_font = 0; + + ts->clist = gui_clist_in_scrolled_window(1, clisttitles, GTK_WIDGET(ts)); + gtk_signal_connect (GTK_OBJECT (ts->clist), "select_row", + GTK_SIGNAL_FUNC (trackersettings_clist_selected), ts); + + trackersettings_gui_populate_clist(ts); + + hbox1 = gtk_hbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(ts), hbox1, FALSE, TRUE, 0); + gtk_widget_show(hbox1); + + hbox2 = gtk_hbox_new(TRUE, 4); + gtk_box_pack_start(GTK_BOX(hbox1), hbox2, TRUE, TRUE, 0); + gtk_widget_show(hbox2); + + thing = ts->add_button = gtk_button_new_with_label(_("Add font")); + gtk_box_pack_start(GTK_BOX(hbox2), thing, TRUE, TRUE, 0); + gtk_widget_show(thing); + gtk_signal_connect (GTK_OBJECT (thing), "clicked", + GTK_SIGNAL_FUNC (trackersettings_add_font), ts); + + thing = ts->delete_button = gtk_button_new_with_label(_("Delete font")); + gtk_box_pack_start(GTK_BOX(hbox2), thing, TRUE, TRUE, 0); + gtk_widget_show(thing); + gtk_signal_connect (GTK_OBJECT (thing), "clicked", + GTK_SIGNAL_FUNC (trackersettings_delete_font), ts); + + thing = ts->apply_button = gtk_button_new_with_label(_("Apply font")); + gtk_box_pack_start(GTK_BOX(hbox2), thing, TRUE, TRUE, 0); + gtk_widget_show(thing); + gtk_signal_connect (GTK_OBJECT (thing), "clicked", + GTK_SIGNAL_FUNC (trackersettings_apply_font), ts); + + hbox2 = gtk_hbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox1), hbox2, FALSE, TRUE, 0); + gtk_widget_show(hbox2); + +#ifndef USE_GNOME +#define GNOME_STOCK_BUTTON_UP 0 +#define GNOME_STOCK_BUTTON_DOWN 0 +#endif + + ts->up_button = gui_button(GTK_WIDGET(ts), GNOME_STOCK_BUTTON_UP, _("Up"), + trackersettings_font_up, ts, hbox2); + + ts->down_button = gui_button(GTK_WIDGET(ts), GNOME_STOCK_BUTTON_DOWN, _("Down"), + trackersettings_font_down, ts, hbox2); + + ts->fontsel_dialog = gtk_font_selection_dialog_new(_("Select font...")); + gtk_window_set_modal(GTK_WINDOW(ts->fontsel_dialog), TRUE); + gtk_signal_connect (GTK_OBJECT (GTK_FONT_SELECTION_DIALOG(ts->fontsel_dialog)->ok_button), "clicked", + GTK_SIGNAL_FUNC (trackersettings_add_font_ok), ts); + gtk_signal_connect (GTK_OBJECT (GTK_FONT_SELECTION_DIALOG(ts->fontsel_dialog)->cancel_button), "clicked", + GTK_SIGNAL_FUNC (trackersettings_add_font_cancel), ts); + + return GTK_WIDGET(ts); +} + +void +trackersettings_set_tracker_widget (TrackerSettings *ts, + Tracker *t) +{ + ts->tracker = t; + + tracker_set_font(t, g_list_nth_data(trackersettings_fontlist, ts->current_font)); +} + +static void +trackersettings_read_fontlist (void) +{ + char buf[256]; + FILE *f; + + trackersettings_fontlist = NULL; + + sprintf(buf, "%s/tracker-fonts", prefs_get_prefsdir()); + + f = fopen(buf, "rb"); + if(f) { + while(!feof(f)) { + buf[0] = 0; + fgets(buf, 255, f); + buf[255] = 0; + if(strlen(buf) > 0) { + buf[strlen(buf) - 1] = 0; + trackersettings_fontlist = g_list_append(trackersettings_fontlist, g_strdup(buf)); + } + } + fclose(f); + } + + if(g_list_length(trackersettings_fontlist) == 0) { + trackersettings_fontlist = g_list_append(trackersettings_fontlist, "7x13"); + } +} + +void +trackersettings_write_settings (void) +{ + char buf[256]; + FILE *f; + GList *l; + + prefs_check_prefs_dir(); + sprintf(buf, "%s/tracker-fonts", prefs_get_prefsdir()); + + f = fopen(buf, "wb"); + if(!f) + return; + + for(l = trackersettings_fontlist; l != NULL; l = l->next) { + fprintf(f, "%s\n", (gchar*)l->data); + } + + fclose(f); +} + +static void +trackersettings_class_init (TrackerSettingsClass *class) +{ + trackersettings_read_fontlist(); +} + +guint +trackersettings_get_type (void) +{ + static guint trackersettings_type = 0; + + if (!trackersettings_type) { + GtkTypeInfo trackersettings_info = + { + "TrackerSettings", + sizeof(TrackerSettings), + sizeof(TrackerSettingsClass), + (GtkClassInitFunc) NULL, + (GtkObjectInitFunc) trackersettings_class_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + }; + + trackersettings_type = gtk_type_unique (gtk_vbox_get_type (), &trackersettings_info); + } + + return trackersettings_type; +} diff -urN soundtracker-0.5.0/app/tracker-settings.h soundtracker-0.5.1/app/tracker-settings.h --- soundtracker-0.5.0/app/tracker-settings.h Thu Jan 1 01:00:00 1970 +++ soundtracker-0.5.1/app/tracker-settings.h Sat Mar 25 09:47:35 2000 @@ -0,0 +1,64 @@ + +/* + * The Real SoundTracker - GTK+ Tracker widget settings (header) + * + * Copyright (C) 2000 Michael Krause + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef _TRACKER_SETTINGS_H +#define _TRACKER_SETTINGS_H + +#include + +#include "tracker.h" + +#define TRACKERSETTINGS(obj) GTK_CHECK_CAST (obj, trackersettings_get_type (), TrackerSettings) +#define TRACKERSETTINGS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, trackersettings_get_type (), TrackerSettingsClass) +#define IS_TRACKERSETTINGS(obj) GTK_CHECK_TYPE (obj, trackersettings_get_type ()) + +typedef struct _TrackerSettings TrackerSettings; +typedef struct _TrackerSettingsClass TrackerSettingsClass; + +struct _TrackerSettings +{ + GtkVBox widget; + + Tracker *tracker; + int current_font; + + GtkWidget *clist; + GtkWidget *add_button, *delete_button, *apply_button; + GtkWidget *up_button, *down_button; + GtkWidget *fontsel_dialog; + + gint clist_selected_row; +}; + +struct _TrackerSettingsClass +{ + GtkVBoxClass parent_class; +}; + +guint trackersettings_get_type (void); +GtkWidget * trackersettings_new (void); +void trackersettings_write_settings (void); +void trackersettings_set_tracker_widget (TrackerSettings *ts, Tracker *t); + +void trackersettings_cycle_font_forward (TrackerSettings *t); +void trackersettings_cycle_font_backward (TrackerSettings *t); + +#endif /* _TRACKER_SETTINGS_H */ diff -urN soundtracker-0.5.0/app/tracker.c soundtracker-0.5.1/app/tracker.c --- soundtracker-0.5.0/app/tracker.c Sat Feb 19 11:58:34 2000 +++ soundtracker-0.5.1/app/tracker.c Sat Mar 25 09:35:37 2000 @@ -29,12 +29,8 @@ #include "main.h" #include "gui-settings.h" -//#define XFONTNAME "-*-courier-medium-r-*-*-18-*-*-*-*-*-*-*" -//#define XFONTNAME "5x8" #define XFONTNAME "7x13" -//#define xm ASDFASDF - const char * const notenames[96] = { "C-0", "C#0", "D-0", "D#0", "E-0", "F-0", "F#0", "G-0", "G#0", "A-0", "A#0", "H-0", "C-1", "C#1", "D-1", "D#1", "E-1", "F-1", "F#1", "G-1", "G#1", "A-1", "A#1", "H-1", @@ -255,15 +251,16 @@ note2string (XMNote *note, char *buf) { - const char *b; static const char hexmapU[] = { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', - 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' }; static const char hexmapL[] = { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', - 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', + 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' }; + + const char *b; const char *hexmap = gui_settings.tracker_upcase ? hexmapU : hexmapL; if(note->note > 0 && note->note < 97) { @@ -292,16 +289,49 @@ buf[5] = (note->instrument % 10) + '0'; } - buf[6] = ' '; - buf[7] = hexmap[note->volume / 16]; - buf[8] = hexmap[note->volume & 15]; - buf[9] = ' '; - buf[10] = hexmap[note->fxtype]; - buf[11] = hexmap[note->fxparam / 16]; - buf[12] = hexmap[note->fxparam & 15]; - buf[13] = ' '; - buf[14] = ' '; - buf[15] = 0; + if(gui_settings.show_zeroes) { + buf[6] = ' '; + buf[7] = hexmap[note->volume / 16]; + buf[8] = hexmap[note->volume & 15]; + buf[9] = ' '; + buf[10] = hexmap[note->fxtype]; + buf[11] = hexmap[note->fxparam / 16]; + buf[12] = hexmap[note->fxparam & 15]; + buf[13] = ' '; + buf[14] = ' '; + buf[15] = 0; + } else { + if(!note->instrument) { + buf[4] = '-'; + buf[5] = '-'; + } + + buf[6] = ' '; + + if(note->volume) { + buf[7] = hexmap[note->volume / 16]; + buf[8] = hexmap[note->volume & 15]; + } else { + buf[7] = '-'; + buf[8] = '-'; + } + + buf[9] = ' '; + + if(!note->fxtype && !note->fxparam) { + buf[10] = '-'; + buf[11] = '-'; + buf[12] = '-'; + } else { + buf[10] = hexmap[note->fxtype]; + buf[11] = hexmap[note->fxparam / 16]; + buf[12] = hexmap[note->fxparam & 15]; + } + + buf[13] = ' '; + buf[14] = ' '; + buf[15] = 0; + } } static void @@ -332,10 +362,12 @@ /* The row number */ if(gui_settings.tracker_hexmode) { - sprintf(buf, "%02x", row); + if(gui_settings.tracker_upcase) sprintf(buf, "%02X", row); + else sprintf(buf, "%02x", row); } else { sprintf(buf, "%03d", row); } + gdk_draw_string(win, t->font, t->notes_gc, 5, y, buf); /* The notes */ @@ -519,7 +551,9 @@ print_notes_and_bars(widget, win, 0, ytemp, widget->allocation.width, fonth); } print_notes_and_bars(widget, win, 0, y, widget->allocation.width, redrawcnt * fonth); - print_channel_numbers(widget, win); + + if(gui_settings.channel_numbering) + print_channel_numbers(widget, win); } /* update the cursor */ @@ -731,6 +765,24 @@ gdk_window_set_background(widget->window, &t->colors[TRACKERCOL_BG]); } +gboolean +tracker_set_font (Tracker *t, + const gchar *fontname) +{ + GdkFont *font; + + if((font = gdk_font_load(fontname))) { + gdk_font_unref(t->font); + t->font = font; + t->fonth = t->font->ascent + t->font->descent; + t->fontw = gdk_string_width(t->font, "X"); /* let's just hope this is a non-proportional font */ + tracker_reset(t); + return TRUE; + } + + return FALSE; +} + static void my_3ints_marshal (GtkObject *object, GtkSignalFunc func, @@ -788,7 +840,7 @@ static void tracker_init (Tracker *t) { - t->font = gdk_font_load(XFONTNAME); + t->font = gdk_font_load("7x13"); t->fonth = t->font->ascent + t->font->descent; t->fontw = gdk_string_width(t->font, "X"); /* let's just hope this is a non-proportional font */ t->oldpos = -1; diff -urN soundtracker-0.5.0/app/tracker.h soundtracker-0.5.1/app/tracker.h --- soundtracker-0.5.0/app/tracker.h Sat Feb 19 11:58:34 2000 +++ soundtracker-0.5.1/app/tracker.h Thu Mar 23 18:07:22 2000 @@ -87,6 +87,8 @@ void tracker_set_num_channels (Tracker *t, int); void tracker_set_backing_store (Tracker *t, int on); +gboolean tracker_set_font (Tracker *t, const gchar *fontname); + void tracker_reset (Tracker *t); void tracker_redraw (Tracker *t); diff -urN soundtracker-0.5.0/app/xm.c soundtracker-0.5.1/app/xm.c --- soundtracker-0.5.0/app/xm.c Mon Mar 13 13:47:01 2000 +++ soundtracker-0.5.1/app/xm.c Wed Mar 22 17:06:33 2000 @@ -42,6 +42,7 @@ #include "recode.h" #include "errors.h" #include "audio.h" +#include "gui-subs.h" #define LFSTAT_IS_MODULE 1 @@ -722,6 +723,8 @@ int i, n; guint8 mh[8]; + statusbar_update(STATUS_LOADING_MODULE); + xm = calloc(1, sizeof(XM)); if(!xm) goto fileerr; @@ -828,12 +831,14 @@ } } + statusbar_update(STATUS_MODULE_LOADED); return xm; ende: XM_Free(xm); fileerr: fclose(f); + statusbar_update(STATUS_IDLE); return NULL; } @@ -845,6 +850,8 @@ guint8 xh[80]; int i, j, num_patterns, num_instruments; + statusbar_update(STATUS_LOADING_MODULE); + *status = 0; f = fopen(filename, "r"); if(!f) { @@ -928,12 +935,14 @@ xm->num_channels++; } + statusbar_update(STATUS_MODULE_LOADED); return xm; ende: XM_Free(xm); fileerr: fclose(f); + statusbar_update(STATUS_IDLE); return NULL; } @@ -946,6 +955,8 @@ guint8 xh[80]; int num_patterns, num_instruments; + statusbar_update(STATUS_SAVING_MODULE); + f = fopen(filename, "w"); if(!f) return 0; @@ -979,10 +990,12 @@ xm_save_xm_instrument(&xm->instruments[i], f); if(ferror(f)) { + statusbar_update(STATUS_IDLE); fclose(f); return 0; } + statusbar_update(STATUS_MODULE_SAVED); fclose(f); return 1; } diff -urN soundtracker-0.5.0/configure soundtracker-0.5.1/configure --- soundtracker-0.5.0/configure Mon Mar 13 14:04:27 2000 +++ soundtracker-0.5.1/configure Sat Mar 25 11:33:02 2000 @@ -722,7 +722,7 @@ PACKAGE=soundtracker -VERSION=0.5.0 +VERSION=0.5.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1342,7 +1342,7 @@ fi -ALL_LINGUAS="de es it pl ja ru" +ALL_LINGUAS="de es fr it pl ja ru" echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 echo "configure:1348: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && diff -urN soundtracker-0.5.0/configure.in soundtracker-0.5.1/configure.in --- soundtracker-0.5.0/configure.in Mon Mar 13 13:57:34 2000 +++ soundtracker-0.5.1/configure.in Sat Mar 25 11:30:27 2000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(app/endian-conv.h) -AM_INIT_AUTOMAKE(soundtracker, 0.5.0) +AM_INIT_AUTOMAKE(soundtracker, 0.5.1) AM_CONFIG_HEADER(config.h) dnl ----------------------------------------------------------------------- @@ -36,7 +36,7 @@ dnl ----------------------------------------------------------------------- dnl Also add new catalogs to soundtracker.spec (%build)! -ALL_LINGUAS="de es it pl ja ru" +ALL_LINGUAS="de es fr it pl ja ru" AM_GNU_GETTEXT dnl ----------------------------------------------------------------------- diff -urN soundtracker-0.5.0/po/ChangeLog soundtracker-0.5.1/po/ChangeLog --- soundtracker-0.5.0/po/ChangeLog Thu Aug 12 16:11:57 1999 +++ soundtracker-0.5.1/po/ChangeLog Tue Mar 14 18:59:42 2000 @@ -1,3 +1,7 @@ +2000-03-14 Michael Krause + + * + 1999-08-12 Michael Krause * Hmm, the Makefile wants a ChangeLog. Here's one. diff -urN soundtracker-0.5.0/po/POTFILES.in soundtracker-0.5.1/po/POTFILES.in --- soundtracker-0.5.0/po/POTFILES.in Sat Feb 19 16:27:06 2000 +++ soundtracker-0.5.1/po/POTFILES.in Sun Mar 19 10:22:12 2000 @@ -32,6 +32,7 @@ app/tips-dialog.c app/track-editor.c app/tracker.c +app/tracker-settings.c app/transposition.c app/xm-player.c app/xm.c diff -urN soundtracker-0.5.0/po/cat-id-tbl.c soundtracker-0.5.1/po/cat-id-tbl.c --- soundtracker-0.5.0/po/cat-id-tbl.c Mon Mar 13 13:51:33 2000 +++ soundtracker-0.5.1/po/cat-id-tbl.c Sat Mar 25 10:20:33 2000 @@ -85,315 +85,389 @@ {"Use upper case letters for hex numbers", 57}, {"Advance cursor horizontally in effect columns", 58}, {"Asynchronous Editing", 59}, - {"Use anti-aliased envelope editor", 60}, - {"You need to restart SoundTracker for this change to come into effect.", 61}, - {"Scopes buffer size [MB]", 62}, - {"Highlight rows:", 63}, - {"`Save XM' saves all non-empty patterns", 64}, - {"Question", 65}, - {"Cancel", 66}, - {"Warning", 67}, - {"Error!", 68}, - {"Tempo", 69}, + {"Show zeroes", 60}, + {"Channel numbering", 61}, + {"Use anti-aliased envelope editor", 62}, + {"You need to restart SoundTracker for this change to come into effect.", 63}, + {"Scopes buffer size [MB]", 64}, + {"Highlight rows:", 65}, + {"`Save XM' saves all non-empty patterns", 66}, + {"Idle.", 67}, + {"Playing song...", 68}, + {"Playing pattern...", 69}, + {"Loading module...", 70}, + {"Module loaded.", 71}, + {"Saving module...", 72}, + {"Module saved.", 73}, + {"Loading sample...", 74}, + {"Sample loaded.", 75}, + {"Saving sample...", 76}, + {"Sample saved.", 77}, + {"Loading instrument...", 78}, + {"Instrument loaded.", 79}, + {"Saving instrument...", 80}, + {"Instrument saved.", 81}, + {"Question", 82}, + {"Cancel", 83}, + {"Warning", 84}, + {"Error!", 85}, + {"Tempo", 86}, {"\ Are you sure you want to free the current project?\n\ -All changes will be lost!", 70}, - {"Are you sure you want to overwrite the file?", 71}, - {"Load XM...", 72}, - {"Save XM...", 73}, - {"Render module as WAV...", 74}, - {"Play Song", 75}, - {"Play Pattern", 76}, - {"Stop", 77}, - {"Number of Channels:", 78}, - {"Pattern", 79}, - {"PatLength", 80}, - {"Octave", 81}, - {"Jump", 82}, - {"Instr", 83}, - {"Sample", 84}, - {"VolFade", 85}, - {"VibSpeed", 86}, - {"VibDepth", 87}, - {"VibSweep", 88}, - {"Can't open file.", 89}, - {"Sine", 90}, - {"Square", 91}, - {"Saw Down", 92}, - {"Saw Up", 93}, - {"Instrument Editor", 94}, - {"Volume envelope", 95}, - {"Panning envelope", 96}, - {"Load Instrument...", 97}, - {"Save Instrument...", 98}, - {"Load XI", 99}, - {"Save XI", 100}, - {"Vibrato Type:", 101}, - {"Note:", 102}, - {"Initialize", 103}, - {"The key that inserts the special keyoff note for FastTracker modules.", 104}, - {"Upper Octave Keys...", 105}, +All changes will be lost!", 87}, + {"Are you sure you want to overwrite the file?", 88}, + {"Load XM...", 89}, + {"Save XM...", 90}, + {"Render module as WAV...", 91}, + {"Play Song", 92}, + {"Play Pattern", 93}, + {"Stop", 94}, + {"Number of Channels:", 95}, + {"Pattern", 96}, + {"PatLength", 97}, + {"Octave", 98}, + {"Jump", 99}, + {"Instr", 100}, + {"Sample", 101}, + {"%M:%S", 102}, + {"VolFade", 103}, + {"VibSpeed", 104}, + {"VibDepth", 105}, + {"VibSweep", 106}, + {"Can't open file.", 107}, + {"Sine", 108}, + {"Square", 109}, + {"Saw Down", 110}, + {"Saw Up", 111}, + {"Instrument Editor", 112}, + {"Volume envelope", 113}, + {"Panning envelope", 114}, + {"Load Instrument...", 115}, + {"Save Instrument...", 116}, + {"Load XI", 117}, + {"Save XI", 118}, + {"Vibrato Type:", 119}, + {"Note:", 120}, + {"Initialize", 121}, + {"The key that inserts the special keyoff note for FastTracker modules.", 122}, + {"Upper Octave Keys...", 123}, {"\ These are the keys on the upper half of the keyboard. The c key is normally \ the key to the right of the TAB key. The rest of the keys should be ordered \ -in a piano keyboard fashion, including the number keys row above.", 106}, - {"Lower Octave Keys...", 107}, +in a piano keyboard fashion, including the number keys row above.", 124}, + {"Lower Octave Keys...", 125}, {"\ These are the keys on the lower half of the keyboard. The c key is normally \ the first character key to the right of the left Shift key. The rest of the \ -keys should be ordered in a piano keyboard fashion, including the row above.", 108}, - {"Other Keys...", 109}, - {"Various other keys", 110}, - {"Function", 111}, - {"Assignment", 112}, - {"Keyboard Configuration", 113}, - {"Key Group Explanation", 114}, - {"Key Explanation", 115}, - {"Modifiers:", 116}, - {"Learn selected key", 117}, - {"Learn all keys", 118}, +keys should be ordered in a piano keyboard fashion, including the row above.", 126}, + {"Other Keys...", 127}, + {"Various other keys", 128}, + {"Function", 129}, + {"Assignment", 130}, + {"Keyboard Configuration", 131}, + {"Key Group Explanation", 132}, + {"Key Explanation", 133}, + {"Modifiers:", 134}, + {"Learn selected key", 135}, + {"Learn all keys", 136}, {"\ Please press the desired key combination!\n\ -Click into left list to cancel", 119}, - {"Ok", 120}, - {"Apply", 121}, +Click into left list to cancel", 137}, + {"Ok", 138}, + {"Apply", 139}, {"\ The keyboard configuration file is defective.\n\ -Please use the Keyboard Configuration dialog.", 122}, +Please use the Keyboard Configuration dialog.", 140}, {"\ Automatic key configuration unsuccessful.\n\ Please use the Keyboard Configuration dialog\n\ -in the Settings menu.", 123}, +in the Settings menu.", 141}, {"\ Are you sure you want to do this?\n\ -All changes will be lost!", 124}, +All changes will be lost!", 142}, {"\ Are you sure you want to quit?\n\ -All changes will be lost!", 125}, - {"_Open...", 126}, - {"Save _as...", 127}, - {"Save Module as _WAV...", 128}, - {"_Quit", 129}, - {"Clear _All", 130}, - {"Clear _Patterns Only", 131}, - {"_Optimize Module", 132}, - {"C_ut", 133}, - {"_Copy", 134}, - {"_Paste", 135}, - {"_Insert", 136}, - {"_Delete", 137}, - {"_Mark", 138}, - {"_Jazz Edit Mode", 139}, - {"Transp_osition...", 140}, - {"_Pattern", 141}, - {"_Track", 142}, - {"_Selection", 143}, - {"_Find Unused Pattern", 144}, - {"_Copy Current to Unused Pattern", 145}, - {"C_lear Unused Patterns", 146}, - {"_Pack Patterns", 147}, - {"_Load XI...", 148}, - {"_Save XI...", 149}, - {"_Clear Current", 150}, - {"_Delete Unused Instruments", 151}, - {"Display _Oscilloscopes", 152}, - {"Use _Backing Store", 153}, - {"_Keyboard Configuration...", 154}, - {"_Audio Configuration...", 155}, - {"_GUI Configuration...", 156}, - {"_Save Settings now", 157}, - {"Save Settings on _Exit", 158}, - {"_About...", 159}, - {"Show _Tips...", 160}, - {"_XM Effects...", 161}, - {"_File", 162}, - {"_Module", 163}, - {"_Edit", 164}, - {"_Instrument", 165}, - {"_Settings", 166}, - {"_Help", 167}, - {"/_File", 168}, - {"/File/_Open...", 169}, - {"/File/Save _as...", 170}, - {"/File/-", 171}, - {"/File/Save Module as _WAV...", 172}, - {"/File/_Quit", 173}, - {"/_Module", 174}, - {"/Module/Clear _All", 175}, - {"/Module/Clear _Patterns Only", 176}, - {"/Module/_Optimize Module", 177}, - {"/_Edit", 178}, - {"/Edit/_Jazz Edit Mode", 179}, - {"/Edit/-", 180}, - {"/Edit/_Transposition...", 181}, - {"/Edit/_Pattern", 182}, - {"/Edit/Pattern/C_ut", 183}, - {"/Edit/Pattern/_Copy", 184}, - {"/Edit/Pattern/_Paste", 185}, - {"/Edit/_Track", 186}, - {"/Edit/Track/C_ut", 187}, - {"/Edit/Track/_Copy", 188}, - {"/Edit/Track/_Paste", 189}, - {"/Edit/Track/_Insert", 190}, - {"/Edit/Track/_Delete", 191}, - {"/Edit/_Selection", 192}, - {"/Edit/Selection/_Mark", 193}, - {"/Edit/Selection/C_ut", 194}, - {"/Edit/Selection/_Copy", 195}, - {"/Edit/Selection/_Paste", 196}, - {"/_Pattern", 197}, - {"/Pattern/_Find Unused Pattern", 198}, - {"/Pattern/_Copy Current to Unused Pattern", 199}, - {"/Pattern/C_lear Unused Patterns", 200}, - {"/Pattern/_Pack Patterns", 201}, - {"/_Instrument", 202}, - {"/Instrument/_Load XI...", 203}, - {"/Instrument/_Save XI...", 204}, - {"/Instrument/-", 205}, - {"/Instrument/_Clear Current", 206}, - {"/Instrument/_Delete Unused Instruments", 207}, - {"/_Settings", 208}, - {"/Settings/Display _Oscilloscopes", 209}, - {"/Settings/Use _Backing Store", 210}, - {"/Settings/-", 211}, - {"/Settings/_Keyboard Configuration...", 212}, - {"/Settings/_Audio Configuration...", 213}, - {"/Settings/_GUI Configuration...", 214}, - {"/Settings/_Save Settings now", 215}, - {"/Settings/Save Settings on _Exit", 216}, - {"/_Help", 217}, - {"/Help/_About...", 218}, - {"/Help/-", 219}, - {"/Help/Show _Tips...", 220}, - {"/Help/_XM Effects...", 221}, - {"Instrument Name", 222}, - {"#smpl", 223}, - {"Sample Name", 224}, - {"Linear", 225}, - {"Amiga", 226}, - {"Module Info", 227}, - {"Songname:", 228}, - {"Frequencies:", 229}, - {"ProTracker Mode", 230}, - {"Song length", 231}, - {"Current pos", 232}, - {"Restart pos", 233}, +All changes will be lost!", 143}, + {"_Open...", 144}, + {"Save _as...", 145}, + {"Save Module as _WAV...", 146}, + {"_Quit", 147}, + {"Clear _All", 148}, + {"Clear _Patterns Only", 149}, + {"_Optimize Module", 150}, + {"C_ut", 151}, + {"_Copy", 152}, + {"_Paste", 153}, + {"_Insert", 154}, + {"_Delete", 155}, + {"_Mark", 156}, + {"_Jazz Edit Mode", 157}, + {"Transp_osition...", 158}, + {"_Pattern", 159}, + {"_Track", 160}, + {"_Selection", 161}, + {"_Find Unused Pattern", 162}, + {"_Copy Current to Unused Pattern", 163}, + {"C_lear Unused Patterns", 164}, + {"_Pack Patterns", 165}, + {"_Load XI...", 166}, + {"_Save XI...", 167}, + {"_Clear Current", 168}, + {"_Delete Unused Instruments", 169}, + {"Use _Backing Store", 170}, + {"_Previous font", 171}, + {"_Next font", 172}, + {"Display _Oscilloscopes", 173}, + {"_Tracker", 174}, + {"_Keyboard Configuration...", 175}, + {"_Audio Configuration...", 176}, + {"_GUI Configuration...", 177}, + {"_Save Settings now", 178}, + {"Save Settings on _Exit", 179}, + {"_About...", 180}, + {"Show _Tips...", 181}, + {"_XM Effects...", 182}, + {"_File", 183}, + {"_Module", 184}, + {"_Edit", 185}, + {"_Instrument", 186}, + {"_Settings", 187}, + {"_Help", 188}, + {"/_File", 189}, + {"/File/_Open...", 190}, + {"/File/Save _as...", 191}, + {"/File/-", 192}, + {"/File/Save Module as _WAV...", 193}, + {"/File/_Quit", 194}, + {"/_Module", 195}, + {"/Module/Clear _All", 196}, + {"/Module/Clear _Patterns Only", 197}, + {"/Module/_Optimize Module", 198}, + {"/_Edit", 199}, + {"/Edit/_Jazz Edit Mode", 200}, + {"/Edit/-", 201}, + {"/Edit/_Transposition...", 202}, + {"/Edit/_Pattern", 203}, + {"/Edit/Pattern/C_ut", 204}, + {"/Edit/Pattern/_Copy", 205}, + {"/Edit/Pattern/_Paste", 206}, + {"/Edit/_Track", 207}, + {"/Edit/Track/C_ut", 208}, + {"/Edit/Track/_Copy", 209}, + {"/Edit/Track/_Paste", 210}, + {"/Edit/Track/_Insert", 211}, + {"/Edit/Track/_Delete", 212}, + {"/Edit/_Selection", 213}, + {"/Edit/Selection/_Mark", 214}, + {"/Edit/Selection/C_ut", 215}, + {"/Edit/Selection/_Copy", 216}, + {"/Edit/Selection/_Paste", 217}, + {"/_Pattern", 218}, + {"/Pattern/_Find Unused Pattern", 219}, + {"/Pattern/_Copy Current to Unused Pattern", 220}, + {"/Pattern/C_lear Unused Patterns", 221}, + {"/Pattern/_Pack Patterns", 222}, + {"/_Instrument", 223}, + {"/Instrument/_Load XI...", 224}, + {"/Instrument/_Save XI...", 225}, + {"/Instrument/-", 226}, + {"/Instrument/_Clear Current", 227}, + {"/Instrument/_Delete Unused Instruments", 228}, + {"/_Settings", 229}, + {"/Settings/Display _Oscilloscopes", 230}, + {"/Settings/_Tracker", 231}, + {"/Settings/Tracker/Use _Backing Store", 232}, + {"/Settings/Tracker/_Previous font", 233}, + {"/Settings/Tracker/_Next font", 234}, + {"/Settings/-", 235}, + {"/Settings/_Keyboard Configuration...", 236}, + {"/Settings/_Audio Configuration...", 237}, + {"/Settings/_GUI Configuration...", 238}, + {"/Settings/_Save Settings now", 239}, + {"/Settings/Save Settings on _Exit", 240}, + {"/_Help", 241}, + {"/Help/_About...", 242}, + {"/Help/-", 243}, + {"/Help/Show _Tips...", 244}, + {"/Help/_XM Effects...", 245}, + {"Instrument Name", 246}, + {"#smpl", 247}, + {"Sample Name", 248}, + {"Linear", 249}, + {"Amiga", 250}, + {"Module Info", 251}, + {"Songname:", 252}, + {"Frequencies:", 253}, + {"ProTracker Mode", 254}, + {"Song length", 255}, + {"Current pos", 256}, + {"Restart pos", 257}, {"\ A directory called '.soundtracker' has been created in your\n\ -home directory to store configuration files.\n", 234}, - {"No loop", 235}, - {"PingPong", 236}, - {"8 bits", 237}, - {"16 bits", 238}, - {"Sample Editor", 239}, - {"Volume", 240}, - {"Panning", 241}, - {"Finetune", 242}, - {"Selection:", 243}, - {"None", 244}, - {"All", 245}, - {"Length:", 246}, - {"RelNote", 247}, - {"Load Sample...", 248}, - {"Save WAV...", 249}, - {"Save region as WAV...", 250}, - {"Save WAV", 251}, - {"Save Region", 252}, - {"Monitor", 253}, - {"Volume Ramp", 254}, - {"Zoom to selection", 255}, - {"Show all", 256}, - {"Zoom in (+50%)", 257}, - {"Zoom out (-50%)", 258}, - {"Reverse", 259}, - {"Cut", 260}, - {"Remove", 261}, - {"Copy", 262}, - {"Paste", 263}, - {"Clear Sample", 264}, - {"(no selection)", 265}, - {"", 266}, - {"Read error.", 267}, - {"Load stereo sample", 268}, +home directory to store configuration files.\n", 258}, + {"No loop", 259}, + {"PingPong", 260}, + {"8 bits", 261}, + {"16 bits", 262}, + {"Sample Editor", 263}, + {"Volume", 264}, + {"Panning", 265}, + {"Finetune", 266}, + {"Selection:", 267}, + {"None", 268}, + {"All", 269}, + {"Length:", 270}, + {"RelNote", 271}, + {"Load Sample...", 272}, + {"Save WAV...", 273}, + {"Save region as WAV...", 274}, + {"Save WAV", 275}, + {"Save Region", 276}, + {"Monitor", 277}, + {"Volume Ramp", 278}, + {"Zoom to selection", 279}, + {"Show all", 280}, + {"Zoom in (+50%)", 281}, + {"Zoom out (-50%)", 282}, + {"Reverse", 283}, + {"Cut", 284}, + {"Remove", 285}, + {"Copy", 286}, + {"Paste", 287}, + {"Clear Sample", 288}, + {"(no selection)", 289}, + {"", 290}, + {"Read error.", 291}, + {"Load stereo sample", 292}, {"\ You have selected a stereo sample!\n\ (SoundTracker can only handle mono samples!)\n\ \n\ -Please choose which channel to load:", 269}, - {"Left", 270}, - {"Mix", 271}, - {"Right", 272}, - {"Can't read sample", 273}, - {"Sample is too long for current mixer module. Loading anyway.", 274}, - {"Can only handle 8 and 16 bit samples with up to 2 channels", 275}, - {"Nothing to save.", 276}, - {"OK", 277}, - {"Start sampling", 278}, - {"Sampling Window", 279}, - {"", 280}, - {"Recorded sample is too long for current mixer module. Using it anyway.", 281}, - {"Normalize", 282}, - {"Execute", 283}, - {"Volume Ramping", 284}, - {"Perform linear volume fade on Selection", 285}, - {"Left [%]:", 286}, - {"Right [%]:", 287}, - {"SoundTracker Tip of the day", 288}, - {"Previous Tip", 289}, - {"Next Tip", 290}, - {"Show tip next time", 291}, +Please choose which channel to load:", 293}, + {"Left", 294}, + {"Mix", 295}, + {"Right", 296}, + {"Can't read sample", 297}, + {"Sample is too long for current mixer module. Loading anyway.", 298}, + {"Can only handle 8 and 16 bit samples with up to 2 channels", 299}, + {"Nothing to save.", 300}, + {"OK", 301}, + {"Start sampling", 302}, + {"Sampling Window", 303}, + {"", 304}, + {"Recorded sample is too long for current mixer module. Using it anyway.", 305}, + {"Normalize", 306}, + {"Execute", 307}, + {"Volume Ramping", 308}, + {"Perform linear volume fade on Selection", 309}, + {"Left [%]:", 310}, + {"Right [%]:", 311}, + {"SoundTracker Tip of the day", 312}, + {"Previous Tip", 313}, + {"Next Tip", 314}, + {"Show tip next time", 315}, {"\ Welcome to SoundTracker!\n\ \n\ If you are new to this type of program, you will want to get hold of\n\ -some XM or MOD files first and play with them.", 292}, +some XM or MOD files first and play with them.", 316}, {"\ You can make SoundTracker's edit mode more responsive to keyboard\n\ input by decreasing the mixing buffer size of the \"Editing\" object in\n\ -the Audio Configuration.", 293}, +the Audio Configuration.", 317}, {"\ You can adjust the loop points in the sample editor by holding Shift\n\ -and using the left and right mousebuttons.\n", 294}, +and using the left and right mousebuttons.\n", 318}, {"\ If you want to know more about tracking, and how the various commands\n\ -work, have a look at http://www.united-trackers.org/", 295}, +work, have a look at http://www.united-trackers.org/", 319}, {"\ You can assign samples of an instrument to the individual keys by\n\ activating its sample and then clicking on the keyboard in the\n\ -instrument editor page.", 296}, - {"Jazz Edit:", 297}, - {"Tracker", 298}, - {"Whole Song", 299}, - {"All Patterns", 300}, - {"Current Pattern", 301}, - {"Current Track", 302}, - {"Current Instrument", 303}, - {"All Instruments", 304}, - {"Half note up", 305}, - {"Half note down", 306}, - {"Octave up", 307}, - {"Octave down", 308}, - {"Exchange 1 <-> 2", 309}, - {"Change 1 -> 2", 310}, - {"Transposition Tools", 311}, - {"Scope of the operation:", 312}, - {"Note Transposition", 313}, - {"Instrument Changing", 314}, - {"Instrument 1:", 315}, - {"Current instrument", 316}, - {"Instrument 2:", 317}, - {"Pattern length out of range: %d.\n", 318}, - {"Invalid vibtype %d, using Sine.\n", 319}, - {"File is no XI instrument.", 320}, - {"Unknown XI version 0x%x\n", 321}, - {"Error while loading patterns.", 322}, - {"Can't open file", 323}, - {"XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n", 324}, - {"Error while loading instruments.", 325}, +instrument editor page.", 320}, + {"Arpeggio", 321}, + {"Porta up", 322}, + {"Porta down", 323}, + {"Tone porta", 324}, + {"Vibrato", 325}, + {"Tone porta + Volume slide", 326}, + {"Vibrato + Volume slide", 327}, + {"Tremolo", 328}, + {"Set panning", 329}, + {"Position jump", 330}, + {"Set volume", 331}, + {"Pattern break", 332}, + {"Set tempo/bpm", 333}, + {"Set global volume", 334}, + {"Global volume slide", 335}, + {"Key off", 336}, + {"Set envelop position", 337}, + {"Panning slide", 338}, + {"LP filter resonance", 339}, + {"Multi retrig note", 340}, + {"Tremor", 341}, + {"LP filter cutoff", 342}, + {"Fine porta up", 343}, + {"Fine porta down", 344}, + {"Set gliss control", 345}, + {"Set vibrato control", 346}, + {"Set finetune", 347}, + {"Set loop begin/loop", 348}, + {"Set tremolo control", 349}, + {"Retrig note", 350}, + {"Fine volume slide up", 351}, + {"Fine volume slide down", 352}, + {"Note cut", 353}, + {"Note delay", 354}, + {"Pattern delay", 355}, + {"Volume slide down", 356}, + {"Volume slide up", 357}, + {"Set vibrato speed", 358}, + {"Panning slide left", 359}, + {"Panning slide right", 360}, + {"sine", 361}, + {"ramp down", 362}, + {"square", 363}, + {"Jazz Edit:", 364}, + {"Tracker", 365}, + {"Font list", 366}, + {"Add font", 367}, + {"Delete font", 368}, + {"Apply font", 369}, + {"Up", 370}, + {"Down", 371}, + {"Select font...", 372}, + {"Whole Song", 373}, + {"All Patterns", 374}, + {"Current Pattern", 375}, + {"Current Track", 376}, + {"Current Instrument", 377}, + {"All Instruments", 378}, + {"Half note up", 379}, + {"Half note down", 380}, + {"Octave up", 381}, + {"Octave down", 382}, + {"Exchange 1 <-> 2", 383}, + {"Change 1 -> 2", 384}, + {"Transposition Tools", 385}, + {"Scope of the operation:", 386}, + {"Note Transposition", 387}, + {"Instrument Changing", 388}, + {"Instrument 1:", 389}, + {"Current instrument", 390}, + {"Instrument 2:", 391}, + {"Pattern length out of range: %d.\n", 392}, + {"Invalid vibtype %d, using Sine.\n", 393}, + {"File is no XI instrument.", 394}, + {"Unknown XI version 0x%x\n", 395}, + {"Error while loading patterns.", 396}, + {"Can't open file", 397}, + {"XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n", 398}, + {"Error while loading instruments.", 399}, {"\ Module contains sample(s) that are too long for the current mixer.\n\ -Maximum sample length is %d.", 326}, - {"No FastTracker XM and no supported MOD format!", 327}, +Maximum sample length is %d.", 400}, + {"No FastTracker XM and no supported MOD format!", 401}, }; -int _msg_tbl_length = 327; +int _msg_tbl_length = 401; Binary files soundtracker-0.5.0/po/de.gmo and soundtracker-0.5.1/po/de.gmo differ diff -urN soundtracker-0.5.0/po/de.po soundtracker-0.5.1/po/de.po --- soundtracker-0.5.0/po/de.po Mon Mar 13 14:06:37 2000 +++ soundtracker-0.5.1/po/de.po Sat Mar 25 11:35:10 2000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.3.3\n" -"POT-Creation-Date: 2000-03-13 13:56+0100\n" +"POT-Creation-Date: 2000-03-25 11:24+0100\n" "PO-Revision-Date: 1999-09-21 23:00+02:00\n" "Last-Translator: Colin Marquardt \n" "Language-Team: German \n" @@ -53,7 +53,7 @@ msgid "Mixers" msgstr "Modifizierer:" -#: app/audioconfig.c:320 app/gui-settings.c:319 app/sample-editor.c:1607 +#: app/audioconfig.c:320 app/gui-settings.c:377 app/sample-editor.c:1613 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "Schließen" @@ -150,7 +150,7 @@ msgid "no settings (yet), sorry!" msgstr "Keine Einstellungen (zur Zeit), sorry!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1312 +#: app/drivers/file-output.c:161 app/sample-editor.c:1316 msgid "Can't open file for writing." msgstr "Kann Datei nicht zum Schreiben öffnen." @@ -277,78 +277,160 @@ msgid "Operation not supported." msgstr "" -#: app/gui-settings.c:86 +#: app/gui-settings.c:83 msgid "Scopes Frequency" msgstr "Scope-Frequenz" -#: app/gui-settings.c:89 +#: app/gui-settings.c:86 msgid "Tracker Frequency" msgstr "Tracker-Frequenz" -#: app/gui-settings.c:188 app/gui-settings.c:191 +#: app/gui-settings.c:211 app/gui-settings.c:214 msgid "GUI Configuration" msgstr "GUI-Konfiguration" -#: app/gui-settings.c:217 +#: app/gui-settings.c:248 msgid "Use Hexadecimal Numbers" msgstr "Verwende hexadezimale Zahlen" -#: app/gui-settings.c:224 +#: app/gui-settings.c:255 msgid "Use upper case letters for hex numbers" msgstr "" -#: app/gui-settings.c:231 +#: app/gui-settings.c:262 #, fuzzy msgid "Advance cursor horizontally in effect columns" msgstr "Lasse Cursor in FX-Spalten mitlaufen" -#: app/gui-settings.c:238 +#: app/gui-settings.c:269 msgid "Asynchronous Editing" msgstr "" -#: app/gui-settings.c:245 +#: app/gui-settings.c:276 +msgid "Show zeroes" +msgstr "" + +#: app/gui-settings.c:283 +msgid "Channel numbering" +msgstr "" + +#: app/gui-settings.c:290 msgid "Use anti-aliased envelope editor" msgstr "Verwende Antialiasing im Hüllkurven-Editor" -#: app/gui-settings.c:251 +#: app/gui-settings.c:296 msgid "You need to restart SoundTracker for this change to come into effect." msgstr "" "Sie müssen SoundTracker neustarten, damit diese Änderungen wirksam werden." -#: app/gui-settings.c:260 +#: app/gui-settings.c:305 msgid "Scopes buffer size [MB]" msgstr "Puffergröße der Scopes [MB]" -#: app/gui-settings.c:279 +#: app/gui-settings.c:324 msgid "Highlight rows:" msgstr "" -#: app/gui-settings.c:297 +#: app/gui-settings.c:342 msgid "`Save XM' saves all non-empty patterns" msgstr "`Speichere XM' speichert alle nicht-leeren Pattern" -#: app/gui-subs.c:430 +#: app/gui-subs.c:32 +msgid "Idle." +msgstr "" + +#: app/gui-subs.c:33 +#, fuzzy +msgid "Playing song..." +msgstr "Spiele Song" + +#: app/gui-subs.c:34 +#, fuzzy +msgid "Playing pattern..." +msgstr "Spiele Pattern" + +#: app/gui-subs.c:35 +#, fuzzy +msgid "Loading module..." +msgstr "_Modul" + +#: app/gui-subs.c:36 +#, fuzzy +msgid "Module loaded." +msgstr "Modul-Info" + +#: app/gui-subs.c:37 +#, fuzzy +msgid "Saving module..." +msgstr "Treibermodul" + +#: app/gui-subs.c:38 +#, fuzzy +msgid "Module saved." +msgstr "_Modul" + +#: app/gui-subs.c:39 +#, fuzzy +msgid "Loading sample..." +msgstr "Lade Sample..." + +#: app/gui-subs.c:40 +#, fuzzy +msgid "Sample loaded." +msgstr "Samplename" + +#: app/gui-subs.c:41 +#, fuzzy +msgid "Saving sample..." +msgstr "Lade Sample" + +#: app/gui-subs.c:42 +#, fuzzy +msgid "Sample saved." +msgstr "Samplename" + +#: app/gui-subs.c:43 +#, fuzzy +msgid "Loading instrument..." +msgstr "Lade Instrument..." + +#: app/gui-subs.c:44 +#, fuzzy +msgid "Instrument loaded." +msgstr "Instrumentenname" + +#: app/gui-subs.c:45 +#, fuzzy +msgid "Saving instrument..." +msgstr "Speichere Instrument..." + +#: app/gui-subs.c:46 +#, fuzzy +msgid "Instrument saved." +msgstr "Instrumentenname" + +#: app/gui-subs.c:459 msgid "Question" msgstr "Frage" -#: app/gui-subs.c:447 app/keys.c:702 app/sample-editor.c:1225 -#: app/sample-editor.c:1412 +#: app/gui-subs.c:476 app/keys.c:702 app/sample-editor.c:1227 +#: app/sample-editor.c:1418 msgid "Cancel" msgstr "Abbrechen" -#: app/gui-subs.c:465 +#: app/gui-subs.c:494 msgid "Warning" msgstr "Warnung" -#: app/gui-subs.c:491 +#: app/gui-subs.c:520 msgid "Error!" msgstr "Fehler!" -#: app/gui.c:83 +#: app/gui.c:87 msgid "Tempo" msgstr "Tempo" -#: app/gui.c:217 +#: app/gui.c:221 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -356,62 +438,66 @@ "Sind Sie sicher, daß Sie das aktuelle Projekt schließen wollen?\n" "Alle Änderungen gehen verloren!" -#: app/gui.c:231 app/gui.c:245 +#: app/gui.c:235 app/gui.c:249 msgid "Are you sure you want to overwrite the file?" msgstr "Sind sie sicher, daß Sie die Datei überschreiben wollen?" -#: app/gui.c:1145 +#: app/gui.c:1167 msgid "Load XM..." msgstr "Lade XM..." -#: app/gui.c:1147 +#: app/gui.c:1169 msgid "Save XM..." msgstr "Speichere XM..." -#: app/gui.c:1150 +#: app/gui.c:1172 msgid "Render module as WAV..." msgstr "" -#: app/gui.c:1202 +#: app/gui.c:1224 msgid "Play Song" msgstr "Spiele Song" -#: app/gui.c:1208 +#: app/gui.c:1230 msgid "Play Pattern" msgstr "Spiele Pattern" -#: app/gui.c:1214 +#: app/gui.c:1236 msgid "Stop" msgstr "Stop" -#: app/gui.c:1233 +#: app/gui.c:1255 msgid "Number of Channels:" msgstr "Anzahl der Kanäle:" -#: app/gui.c:1249 app/playlist.c:294 +#: app/gui.c:1271 app/playlist.c:294 msgid "Pattern" msgstr "Pattern" -#: app/gui.c:1265 +#: app/gui.c:1287 msgid "PatLength" msgstr "PatLänge" -#: app/gui.c:1357 +#: app/gui.c:1379 msgid "Octave" msgstr "Oktave" -#: app/gui.c:1365 +#: app/gui.c:1387 msgid "Jump" msgstr "Springe" -#: app/gui.c:1373 +#: app/gui.c:1395 msgid "Instr" msgstr "Instr" -#: app/gui.c:1388 +#: app/gui.c:1410 msgid "Sample" msgstr "Sample" +#: app/gui.c:1448 +msgid "%M:%S" +msgstr "" + #: app/instrument-editor.c:75 msgid "VolFade" msgstr "VolFade" @@ -428,65 +514,65 @@ msgid "VibSweep" msgstr "VibSweep" -#: app/instrument-editor.c:154 app/instrument-editor.c:175 +#: app/instrument-editor.c:156 app/instrument-editor.c:179 msgid "Can't open file." msgstr "Kann Datei nicht öffnen." -#: app/instrument-editor.c:212 +#: app/instrument-editor.c:216 msgid "Sine" msgstr "Sinus" -#: app/instrument-editor.c:212 +#: app/instrument-editor.c:216 msgid "Square" msgstr "Rechteck" -#: app/instrument-editor.c:212 +#: app/instrument-editor.c:216 msgid "Saw Down" msgstr "Säge Fall" -#: app/instrument-editor.c:212 +#: app/instrument-editor.c:216 msgid "Saw Up" msgstr "Säge Steig" -#: app/instrument-editor.c:216 +#: app/instrument-editor.c:220 msgid "Instrument Editor" msgstr "Instrumenten-Editor" -#: app/instrument-editor.c:225 +#: app/instrument-editor.c:229 msgid "Volume envelope" msgstr "Lautstärken-Hüllkurve" -#: app/instrument-editor.c:233 +#: app/instrument-editor.c:237 msgid "Panning envelope" msgstr "Balance-Hüllkurve" -#: app/instrument-editor.c:250 +#: app/instrument-editor.c:254 #, fuzzy msgid "Load Instrument..." msgstr "Lade Instrument..." -#: app/instrument-editor.c:252 +#: app/instrument-editor.c:256 #, fuzzy msgid "Save Instrument..." msgstr "Speichere Instrument..." -#: app/instrument-editor.c:254 +#: app/instrument-editor.c:258 msgid "Load XI" msgstr "Lade XI" -#: app/instrument-editor.c:260 +#: app/instrument-editor.c:264 msgid "Save XI" msgstr "Speichere XI" -#: app/instrument-editor.c:279 +#: app/instrument-editor.c:283 msgid "Vibrato Type:" msgstr "Vibrato-Typ:" -#: app/instrument-editor.c:351 +#: app/instrument-editor.c:355 msgid "Note:" msgstr "Note:" -#: app/instrument-editor.c:369 +#: app/instrument-editor.c:373 msgid "Initialize" msgstr "Initialisieren" @@ -575,7 +661,7 @@ "Bitte drücken Sie die gewünschte Tastenkombination!\n" "Klicken Sie in die linke Liste, um abzubrechen" -#: app/keys.c:682 app/menubar.c:94 +#: app/keys.c:682 app/menubar.c:95 msgid "Ok" msgstr "OK" @@ -601,7 +687,7 @@ "Bitte verwenden Sie den Dialog für die Tastatur-Konfiguration\n" "im Menü Einstellungen." -#: app/menubar.c:130 +#: app/menubar.c:131 msgid "" "Are you sure you want to do this?\n" "All changes will be lost!" @@ -609,7 +695,7 @@ "Sind Sie sicher, daß Sie das tun wollen?\n" "Alle Änderungen gehen verloren!" -#: app/menubar.c:152 +#: app/menubar.c:153 msgid "" "Are you sure you want to quit?\n" "All changes will be lost!" @@ -617,416 +703,446 @@ "Sind Sie sicher, daß Sie das Programm beenden wollen?\n" "Alle Änderungen gehen verloren!" -#: app/menubar.c:223 +#: app/menubar.c:237 #, fuzzy msgid "_Open..." msgstr "Ö_ffnen..." -#: app/menubar.c:225 +#: app/menubar.c:239 #, fuzzy msgid "Save _as..." msgstr "Speichern _unter..." -#: app/menubar.c:231 +#: app/menubar.c:245 #, fuzzy msgid "Save Module as _WAV..." msgstr "Speichere WAV..." -#: app/menubar.c:236 +#: app/menubar.c:250 msgid "_Quit" msgstr "_Beenden" -#: app/menubar.c:243 +#: app/menubar.c:257 msgid "Clear _All" msgstr "_Alles löschen" -#: app/menubar.c:245 +#: app/menubar.c:259 msgid "Clear _Patterns Only" msgstr "Nur _Pattern löschen" -#: app/menubar.c:247 +#: app/menubar.c:261 msgid "_Optimize Module" msgstr "Modul _optimieren" -#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 +#: app/menubar.c:268 app/menubar.c:279 app/menubar.c:297 msgid "C_ut" msgstr "_Ausschneiden" -#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 +#: app/menubar.c:270 app/menubar.c:281 app/menubar.c:299 msgid "_Copy" msgstr "_Kopieren" -#: app/menubar.c:258 app/menubar.c:269 app/menubar.c:287 +#: app/menubar.c:272 app/menubar.c:283 app/menubar.c:301 msgid "_Paste" msgstr "E_infügen" -#: app/menubar.c:271 +#: app/menubar.c:285 #, fuzzy msgid "_Insert" msgstr "Einfügen" -#: app/menubar.c:273 +#: app/menubar.c:287 #, fuzzy msgid "_Delete" msgstr "Löschen" -#: app/menubar.c:281 +#: app/menubar.c:295 msgid "_Mark" msgstr "_Markieren" -#: app/menubar.c:294 +#: app/menubar.c:308 msgid "_Jazz Edit Mode" msgstr "_Jazz-Edit-Modus" -#: app/menubar.c:299 +#: app/menubar.c:313 #, fuzzy msgid "Transp_osition..." msgstr "_Transposition..." -#: app/menubar.c:304 app/menubar.c:387 +#: app/menubar.c:318 app/menubar.c:413 msgid "_Pattern" msgstr "_Pattern" -#: app/menubar.c:305 +#: app/menubar.c:319 msgid "_Track" msgstr "_Track" -#: app/menubar.c:306 +#: app/menubar.c:320 msgid "_Selection" msgstr "_Auswahl" -#: app/menubar.c:312 +#: app/menubar.c:326 msgid "_Find Unused Pattern" msgstr "_Finde unbenutztes Pattern" -#: app/menubar.c:314 +#: app/menubar.c:328 msgid "_Copy Current to Unused Pattern" msgstr "_Kopiere aktuelles zu unbenutztem Pattern" -#: app/menubar.c:316 +#: app/menubar.c:330 msgid "C_lear Unused Patterns" msgstr "_Lösche unbenutzte Pattern" -#: app/menubar.c:318 +#: app/menubar.c:332 msgid "_Pack Patterns" msgstr "_Packe Pattern" -#: app/menubar.c:325 +#: app/menubar.c:339 #, fuzzy msgid "_Load XI..." msgstr "_Lade XI..." -#: app/menubar.c:327 +#: app/menubar.c:341 #, fuzzy msgid "_Save XI..." msgstr "Speichere XM..." -#: app/menubar.c:332 +#: app/menubar.c:346 #, fuzzy msgid "_Clear Current" msgstr "Aktuell" -#: app/menubar.c:337 +#: app/menubar.c:351 msgid "_Delete Unused Instruments" msgstr "Lösche unbenutzte _Instrumente" -#: app/menubar.c:345 +#: app/menubar.c:358 +msgid "Use _Backing Store" +msgstr "Verwende _Backing Store" + +#: app/menubar.c:361 +#, fuzzy +msgid "_Previous font" +msgstr "Vorheriger Tip" + +#: app/menubar.c:363 +msgid "_Next font" +msgstr "" + +#: app/menubar.c:371 msgid "Display _Oscilloscopes" msgstr "Zeige _Oszilloskope" -#: app/menubar.c:347 -msgid "Use _Backing Store" -msgstr "Verwende _Backing Store" +#: app/menubar.c:374 +#, fuzzy +msgid "_Tracker" +msgstr "_Track" -#: app/menubar.c:352 +#: app/menubar.c:378 #, fuzzy msgid "_Keyboard Configuration..." msgstr "_Tastatur-Konfiguration..." -#: app/menubar.c:354 +#: app/menubar.c:380 #, fuzzy msgid "_Audio Configuration..." msgstr "_Audio-Konfiguration..." -#: app/menubar.c:356 +#: app/menubar.c:382 #, fuzzy msgid "_GUI Configuration..." msgstr "_GUI-Konfiguration..." -#: app/menubar.c:361 +#: app/menubar.c:387 msgid "_Save Settings now" msgstr "_Speichere Einstellungen jetzt" -#: app/menubar.c:363 +#: app/menubar.c:389 msgid "Save Settings on _Exit" msgstr "Speichere Einstellungen beim _Verlassen" -#: app/menubar.c:370 +#: app/menubar.c:396 #, fuzzy msgid "_About..." msgstr "Ü_ber..." -#: app/menubar.c:375 +#: app/menubar.c:401 #, fuzzy msgid "Show _Tips..." msgstr "Zeige _Tips..." -#: app/menubar.c:377 +#: app/menubar.c:403 #, fuzzy msgid "_XM Effects..." msgstr "_XM-Effekte..." -#: app/menubar.c:384 +#: app/menubar.c:410 msgid "_File" msgstr "_Datei" -#: app/menubar.c:385 +#: app/menubar.c:411 msgid "_Module" msgstr "_Modul" -#: app/menubar.c:386 +#: app/menubar.c:412 msgid "_Edit" msgstr "_Bearbeiten" -#: app/menubar.c:388 +#: app/menubar.c:414 msgid "_Instrument" msgstr "_Instrument" -#: app/menubar.c:389 +#: app/menubar.c:415 msgid "_Settings" msgstr "_Einstellungen" -#: app/menubar.c:390 +#: app/menubar.c:416 msgid "_Help" msgstr "_Hilfe" -#: app/menubar.c:420 +#: app/menubar.c:446 msgid "/_File" msgstr "/_Datei" -#: app/menubar.c:421 +#: app/menubar.c:447 #, fuzzy msgid "/File/_Open..." msgstr "/Datei/Ö_ffnen..." -#: app/menubar.c:422 +#: app/menubar.c:448 #, fuzzy msgid "/File/Save _as..." msgstr "/Datei/Speichern _unter..." -#: app/menubar.c:423 app/menubar.c:425 +#: app/menubar.c:449 app/menubar.c:451 msgid "/File/-" msgstr "/Datei/-" -#: app/menubar.c:424 +#: app/menubar.c:450 #, fuzzy msgid "/File/Save Module as _WAV..." msgstr "/Datei/Speichern _unter..." -#: app/menubar.c:426 +#: app/menubar.c:452 msgid "/File/_Quit" msgstr "/Datei/_Beenden" -#: app/menubar.c:427 +#: app/menubar.c:453 msgid "/_Module" msgstr "/_Modul" -#: app/menubar.c:428 +#: app/menubar.c:454 msgid "/Module/Clear _All" msgstr "/Modul/Lösche _alle" -#: app/menubar.c:429 +#: app/menubar.c:455 msgid "/Module/Clear _Patterns Only" msgstr "/Modul/Lösche nur _Pattern" -#: app/menubar.c:430 +#: app/menubar.c:456 msgid "/Module/_Optimize Module" msgstr "/Modul/_Optimiere Modul" -#: app/menubar.c:431 +#: app/menubar.c:457 msgid "/_Edit" msgstr "/_Bearbeiten" -#: app/menubar.c:432 +#: app/menubar.c:458 msgid "/Edit/_Jazz Edit Mode" msgstr "/Bearbeiten/_Jazz-Edit-Mode" -#: app/menubar.c:433 app/menubar.c:435 +#: app/menubar.c:459 app/menubar.c:461 msgid "/Edit/-" msgstr "/Bearbeiten/-" -#: app/menubar.c:434 +#: app/menubar.c:460 #, fuzzy msgid "/Edit/_Transposition..." msgstr "/Bearbeiten/_Transposition..." -#: app/menubar.c:436 +#: app/menubar.c:462 msgid "/Edit/_Pattern" msgstr "/Bearbeiten/_Pattern" -#: app/menubar.c:437 +#: app/menubar.c:463 msgid "/Edit/Pattern/C_ut" msgstr "/Bearbeiten/Pattern/_Ausschneiden" -#: app/menubar.c:438 +#: app/menubar.c:464 msgid "/Edit/Pattern/_Copy" msgstr "/Bearbeiten/Pattern/_Kopieren" -#: app/menubar.c:439 +#: app/menubar.c:465 msgid "/Edit/Pattern/_Paste" msgstr "/Bearbeiten/Pattern/E_infügen" -#: app/menubar.c:440 +#: app/menubar.c:466 msgid "/Edit/_Track" msgstr "/Bearbeiten/_Track" -#: app/menubar.c:441 +#: app/menubar.c:467 msgid "/Edit/Track/C_ut" msgstr "/Bearbeiten/Track/_Ausschneiden" -#: app/menubar.c:442 +#: app/menubar.c:468 msgid "/Edit/Track/_Copy" msgstr "/Bearbeiten/Track/_Kopieren" -#: app/menubar.c:443 +#: app/menubar.c:469 msgid "/Edit/Track/_Paste" msgstr "/Bearbeiten/Track/E_infügen" -#: app/menubar.c:444 +#: app/menubar.c:470 #, fuzzy msgid "/Edit/Track/_Insert" msgstr "/Bearbeiten/Track/E_infügen" -#: app/menubar.c:445 +#: app/menubar.c:471 #, fuzzy msgid "/Edit/Track/_Delete" msgstr "/Bearbeiten/Track/E_infügen" -#: app/menubar.c:446 +#: app/menubar.c:472 msgid "/Edit/_Selection" msgstr "/Bearbeiten/_Auswahl" -#: app/menubar.c:447 +#: app/menubar.c:473 msgid "/Edit/Selection/_Mark" msgstr "/Bearbeiten/Auswahl/_Markieren" -#: app/menubar.c:448 +#: app/menubar.c:474 msgid "/Edit/Selection/C_ut" msgstr "/Bearbeiten/Auswahl/_Ausschneiden" -#: app/menubar.c:449 +#: app/menubar.c:475 msgid "/Edit/Selection/_Copy" msgstr "/Bearbeiten/Auswahl/_Kopieren" -#: app/menubar.c:450 +#: app/menubar.c:476 msgid "/Edit/Selection/_Paste" msgstr "/Bearbeiten/Auswahl/E_infügen" -#: app/menubar.c:451 +#: app/menubar.c:477 msgid "/_Pattern" msgstr "/_Pattern" -#: app/menubar.c:452 +#: app/menubar.c:478 msgid "/Pattern/_Find Unused Pattern" msgstr "/Pattern/_Finde unbenutztes Pattern" -#: app/menubar.c:453 +#: app/menubar.c:479 msgid "/Pattern/_Copy Current to Unused Pattern" msgstr "/Pattern/_Kopiere aktuelles zu unbenutztem Pattern" -#: app/menubar.c:454 +#: app/menubar.c:480 msgid "/Pattern/C_lear Unused Patterns" msgstr "/Pattern/_Lösche unbenutzte Pattern" -#: app/menubar.c:455 +#: app/menubar.c:481 msgid "/Pattern/_Pack Patterns" msgstr "/Pattern/_Packe Pattern" -#: app/menubar.c:456 +#: app/menubar.c:482 msgid "/_Instrument" msgstr "/_Instrument" -#: app/menubar.c:457 +#: app/menubar.c:483 #, fuzzy msgid "/Instrument/_Load XI..." msgstr "/Instrument/_Lade XI..." -#: app/menubar.c:458 +#: app/menubar.c:484 #, fuzzy msgid "/Instrument/_Save XI..." msgstr "/Instrument/_Lade XI..." -#: app/menubar.c:459 app/menubar.c:461 +#: app/menubar.c:485 app/menubar.c:487 msgid "/Instrument/-" msgstr "/Instrument/-" -#: app/menubar.c:460 +#: app/menubar.c:486 #, fuzzy msgid "/Instrument/_Clear Current" msgstr "/Instrument/_Lösche unbenutzte Instrumente" -#: app/menubar.c:462 +#: app/menubar.c:488 msgid "/Instrument/_Delete Unused Instruments" msgstr "/Instrument/_Lösche unbenutzte Instrumente" -#: app/menubar.c:463 +#: app/menubar.c:489 msgid "/_Settings" msgstr "/_Einstellungen" -#: app/menubar.c:464 +#: app/menubar.c:490 msgid "/Settings/Display _Oscilloscopes" msgstr "/Einstellungen/Zeige _Oszilloskope" -#: app/menubar.c:465 -msgid "/Settings/Use _Backing Store" +#: app/menubar.c:491 +#, fuzzy +msgid "/Settings/_Tracker" +msgstr "/Einstellungen/-" + +#: app/menubar.c:492 +#, fuzzy +msgid "/Settings/Tracker/Use _Backing Store" msgstr "/Einstellungen/Verwende _Backing Store" -#: app/menubar.c:466 app/menubar.c:470 +#: app/menubar.c:493 +#, fuzzy +msgid "/Settings/Tracker/_Previous font" +msgstr "/Einstellungen/Speichere Einstellungen beim Verlassen" + +#: app/menubar.c:494 +#, fuzzy +msgid "/Settings/Tracker/_Next font" +msgstr "/Einstellungen/Speichere Einstellungen beim Verlassen" + +#: app/menubar.c:495 app/menubar.c:499 msgid "/Settings/-" msgstr "/Einstellungen/-" -#: app/menubar.c:467 +#: app/menubar.c:496 #, fuzzy msgid "/Settings/_Keyboard Configuration..." msgstr "/Einstellungen/_Tastatur-Konfiguration..." -#: app/menubar.c:468 +#: app/menubar.c:497 #, fuzzy msgid "/Settings/_Audio Configuration..." msgstr "/Einstellungen/_Audio-Konfiguration..." -#: app/menubar.c:469 +#: app/menubar.c:498 #, fuzzy msgid "/Settings/_GUI Configuration..." msgstr "/Einstellungen/_GUI-Konfiguration..." -#: app/menubar.c:471 +#: app/menubar.c:500 msgid "/Settings/_Save Settings now" msgstr "/Einstellungen/_Speichere Einstellungen jetzt" -#: app/menubar.c:472 +#: app/menubar.c:501 msgid "/Settings/Save Settings on _Exit" msgstr "/Einstellungen/Speichere Einstellungen beim _Verlassen" -#: app/menubar.c:473 +#: app/menubar.c:502 msgid "/_Help" msgstr "/_Hilfe" -#: app/menubar.c:474 +#: app/menubar.c:503 #, fuzzy msgid "/Help/_About..." msgstr "/Hilfe/Ü_ber..." -#: app/menubar.c:475 +#: app/menubar.c:504 msgid "/Help/-" msgstr "/Hilfe/-" -#: app/menubar.c:476 +#: app/menubar.c:505 #, fuzzy msgid "/Help/Show _Tips..." msgstr "/Hilfe/Zeige _Tips..." -#: app/menubar.c:477 +#: app/menubar.c:506 #, fuzzy msgid "/Help/_XM Effects..." msgstr "/Hilfe/_XM-Effekte..." @@ -1124,7 +1240,7 @@ msgid "Selection:" msgstr "_Auswahl" -#: app/sample-editor.c:263 +#: app/sample-editor.c:263 app/track-editor.c:168 app/track-editor.c:178 #, fuzzy msgid "None" msgstr "Note:" @@ -1220,20 +1336,20 @@ msgid "(no selection)" msgstr "Zoom in Auswahl" -#: app/sample-editor.c:1000 +#: app/sample-editor.c:999 msgid "" msgstr "" -#: app/sample-editor.c:1076 +#: app/sample-editor.c:1075 msgid "Read error." msgstr "Lesefehler." -#: app/sample-editor.c:1181 +#: app/sample-editor.c:1183 #, fuzzy msgid "Load stereo sample" msgstr "Lade Sample" -#: app/sample-editor.c:1189 +#: app/sample-editor.c:1191 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1241,80 +1357,80 @@ "Please choose which channel to load:" msgstr "" -#: app/sample-editor.c:1200 +#: app/sample-editor.c:1202 #, fuzzy msgid "Left" msgstr "Links [%]:" -#: app/sample-editor.c:1206 +#: app/sample-editor.c:1208 msgid "Mix" msgstr "" -#: app/sample-editor.c:1212 +#: app/sample-editor.c:1214 #, fuzzy msgid "Right" msgstr "Rechts [%]:" -#: app/sample-editor.c:1251 +#: app/sample-editor.c:1253 msgid "Can't read sample" msgstr "Kann Sample nicht lesen" -#: app/sample-editor.c:1257 +#: app/sample-editor.c:1259 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "Sample ist zu lang für aktuelles Mixer-Modul. Lade trotzdem." -#: app/sample-editor.c:1271 +#: app/sample-editor.c:1273 #, fuzzy msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "Kann nur mono- 8 und 16 Bit Samples verarbeiten" -#: app/sample-editor.c:1370 +#: app/sample-editor.c:1376 msgid "Nothing to save." msgstr "" -#: app/sample-editor.c:1397 +#: app/sample-editor.c:1403 msgid "OK" msgstr "OK" -#: app/sample-editor.c:1405 +#: app/sample-editor.c:1411 msgid "Start sampling" msgstr "Starte Sampling" -#: app/sample-editor.c:1440 app/sample-editor.c:1443 +#: app/sample-editor.c:1446 app/sample-editor.c:1449 msgid "Sampling Window" msgstr "Sampling-Fenster" -#: app/sample-editor.c:1543 +#: app/sample-editor.c:1549 msgid "" msgstr "" -#: app/sample-editor.c:1573 +#: app/sample-editor.c:1579 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" "Aufgezeichnetes Sample ist zu lang für aktuelles Mixer-Modul. Verwende es " "trotzdem." -#: app/sample-editor.c:1605 +#: app/sample-editor.c:1611 msgid "Normalize" msgstr "Normalisieren" -#: app/sample-editor.c:1606 +#: app/sample-editor.c:1612 msgid "Execute" msgstr "Ausführen" -#: app/sample-editor.c:1616 app/sample-editor.c:1619 +#: app/sample-editor.c:1622 app/sample-editor.c:1625 msgid "Volume Ramping" msgstr "Lautstärke-Anpassung" -#: app/sample-editor.c:1636 +#: app/sample-editor.c:1642 msgid "Perform linear volume fade on Selection" msgstr "Lineare Lautstärkenverringerung auf Markierung" -#: app/sample-editor.c:1648 +#: app/sample-editor.c:1654 msgid "Left [%]:" msgstr "Links [%]:" -#: app/sample-editor.c:1653 +#: app/sample-editor.c:1659 msgid "Right [%]:" msgstr "Rechts [%]:" @@ -1386,15 +1502,284 @@ "das Sample aktivieren und dann auf die Tastatur im Instrumenten-Editor " "klicken." +#: app/track-editor.c:83 +msgid "Arpeggio" +msgstr "" + +#. 0 +#: app/track-editor.c:84 +msgid "Porta up" +msgstr "" + +#. 1 +#: app/track-editor.c:85 +#, fuzzy +msgid "Porta down" +msgstr "Oktave runter" + +#. 2 +#: app/track-editor.c:86 app/track-editor.c:150 +msgid "Tone porta" +msgstr "" + +#. 3 +#: app/track-editor.c:87 app/track-editor.c:146 +#, fuzzy +msgid "Vibrato" +msgstr "Vibrato-Typ:" + +#. 4 +#: app/track-editor.c:88 +msgid "Tone porta + Volume slide" +msgstr "" + +#. 5 +#: app/track-editor.c:89 +msgid "Vibrato + Volume slide" +msgstr "" + +#. 6 +#: app/track-editor.c:90 +#, fuzzy +msgid "Tremolo" +msgstr "Tempo" + +#. 7 +#: app/track-editor.c:91 app/track-editor.c:147 +#, fuzzy +msgid "Set panning" +msgstr "Balance" + +#. 8 +#: app/track-editor.c:92 app/track-editor.c:94 +msgid "Position jump" +msgstr "" + +#. 9 +#: app/track-editor.c:93 app/track-editor.c:95 app/track-editor.c:171 +#, fuzzy +msgid "Set volume" +msgstr "Lautstärke" + +#. C +#: app/track-editor.c:96 +#, fuzzy +msgid "Pattern break" +msgstr "Pattern" + +#. D +#. E +#: app/track-editor.c:98 +msgid "Set tempo/bpm" +msgstr "" + +#. F +#: app/track-editor.c:99 +msgid "Set global volume" +msgstr "" + +#. G +#: app/track-editor.c:100 +msgid "Global volume slide" +msgstr "" + +#. H +#. I +#. J +#: app/track-editor.c:103 +msgid "Key off" +msgstr "" + +#. K +#: app/track-editor.c:104 +msgid "Set envelop position" +msgstr "" + +#. L +#. M +#. N +#. O #: app/track-editor.c:108 +#, fuzzy +msgid "Panning slide" +msgstr "Balance" + +#. P +#: app/track-editor.c:109 +msgid "LP filter resonance" +msgstr "" + +#. Q +#: app/track-editor.c:110 +msgid "Multi retrig note" +msgstr "" + +#. R +#. S +#: app/track-editor.c:112 +#, fuzzy +msgid "Tremor" +msgstr "Tempo" + +#. T +#. U +#. V +#. W +#. X +#. Y +#: app/track-editor.c:118 +msgid "LP filter cutoff" +msgstr "" + +#. 0 +#: app/track-editor.c:123 +msgid "Fine porta up" +msgstr "" + +#. 1 +#: app/track-editor.c:124 +msgid "Fine porta down" +msgstr "" + +#. 2 +#: app/track-editor.c:125 +msgid "Set gliss control" +msgstr "" + +#. 3 +#: app/track-editor.c:126 +msgid "Set vibrato control" +msgstr "" + +#. 4 +#: app/track-editor.c:127 +#, fuzzy +msgid "Set finetune" +msgstr "Feineinstellung" + +#. 5 +#: app/track-editor.c:128 +msgid "Set loop begin/loop" +msgstr "" + +#. 6 +#: app/track-editor.c:129 +msgid "Set tremolo control" +msgstr "" + +#. 7 +#. 8 +#: app/track-editor.c:131 +msgid "Retrig note" +msgstr "" + +#. 9 +#: app/track-editor.c:132 app/track-editor.c:144 +msgid "Fine volume slide up" +msgstr "" + +#. A +#: app/track-editor.c:133 app/track-editor.c:143 +msgid "Fine volume slide down" +msgstr "" + +#. B +#: app/track-editor.c:134 +#, fuzzy +msgid "Note cut" +msgstr "Note:" + +#. C +#: app/track-editor.c:135 +msgid "Note delay" +msgstr "" + +#. D +#: app/track-editor.c:136 +#, fuzzy +msgid "Pattern delay" +msgstr "Pattern" + +#: app/track-editor.c:141 +msgid "Volume slide down" +msgstr "" + +#: app/track-editor.c:142 +#, fuzzy +msgid "Volume slide up" +msgstr "Lautstärke" + +#: app/track-editor.c:145 +#, fuzzy +msgid "Set vibrato speed" +msgstr "Vibrato-Typ:" + +#: app/track-editor.c:148 +#, fuzzy +msgid "Panning slide left" +msgstr "Balance-Hüllkurve" + +#: app/track-editor.c:149 +msgid "Panning slide right" +msgstr "" + +#: app/track-editor.c:154 +#, fuzzy +msgid "sine" +msgstr "Sinus" + +#. 0 +#: app/track-editor.c:155 +#, fuzzy +msgid "ramp down" +msgstr "Oktave runter" + +#. 1 +#: app/track-editor.c:156 +#, fuzzy +msgid "square" +msgstr "Rechteck" + +#: app/track-editor.c:331 msgid "Jazz Edit:" msgstr "Jazz-Edit:" -#: app/track-editor.c:147 +#: app/track-editor.c:373 #, fuzzy msgid "Tracker" msgstr "_Track" +#: app/tracker-settings.c:233 +msgid "Font list" +msgstr "" + +#: app/tracker-settings.c:257 +msgid "Add font" +msgstr "" + +#: app/tracker-settings.c:263 +#, fuzzy +msgid "Delete font" +msgstr "Löschen" + +#: app/tracker-settings.c:269 +msgid "Apply font" +msgstr "" + +#: app/tracker-settings.c:284 +msgid "Up" +msgstr "" + +#: app/tracker-settings.c:287 +#, fuzzy +msgid "Down" +msgstr "Säge Fall" + +#: app/tracker-settings.c:290 +#, fuzzy +msgid "Select font..." +msgstr "_Auswahl" + #: app/transposition.c:166 msgid "Whole Song" msgstr "Ganzer Song" @@ -1471,43 +1856,43 @@ msgid "Instrument 2:" msgstr "Instrument 2:" -#: app/xm.c:170 +#: app/xm.c:171 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "Patternlänge außerhalb des Bereiches: %d.\n" -#: app/xm.c:455 app/xm.c:526 +#: app/xm.c:456 app/xm.c:527 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "Ungültiger vibtype %d, verwende Sinus.\n" -#: app/xm.c:486 +#: app/xm.c:487 msgid "File is no XI instrument." msgstr "Datei ist kein XI-Instrument." -#: app/xm.c:496 +#: app/xm.c:497 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "Unbekannte XI-Version 0x%x\n" -#: app/xm.c:787 app/xm.c:901 +#: app/xm.c:790 app/xm.c:908 msgid "Error while loading patterns." msgstr "Fehler beim Laden der Pattern." -#: app/xm.c:851 +#: app/xm.c:858 msgid "Can't open file" msgstr "Kann Datei nicht öffnen" -#: app/xm.c:865 +#: app/xm.c:872 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "XM-Header-Länge != 276. Vielleicht ein pre-0.0.12 SoundTracker-Modul? :-)\n" -#: app/xm.c:907 +#: app/xm.c:914 msgid "Error while loading instruments." msgstr "Fehler beim Laden der Instrumente." -#: app/xm.c:918 +#: app/xm.c:925 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1516,7 +1901,7 @@ "Modul enthält Sample(s), die zu lang für den aktuellen Mixer sind..\n" "Maximale Sample-Länge ist %d." -#: app/xm.c:1234 +#: app/xm.c:1247 msgid "No FastTracker XM and no supported MOD format!" msgstr "Kein FastTracker XM und kein unterstütztes MOD-Format!" @@ -1564,9 +1949,6 @@ #~ msgid "/Settings/Use Backing Store" #~ msgstr "/Einstellungen/Verwende Backing Store" - -#~ msgid "/Settings/Save Settings on Exit" -#~ msgstr "/Einstellungen/Speichere Einstellungen beim Verlassen" #~ msgid "Resample" #~ msgstr "Neu samplen" Binary files soundtracker-0.5.0/po/fr.gmo and soundtracker-0.5.1/po/fr.gmo differ diff -urN soundtracker-0.5.0/po/fr.po soundtracker-0.5.1/po/fr.po --- soundtracker-0.5.0/po/fr.po Thu Jan 1 01:00:00 1970 +++ soundtracker-0.5.1/po/fr.po Sat Mar 25 11:35:06 2000 @@ -0,0 +1,1350 @@ +# Soundtracker French Translation +# Copyright (C) 1999 Free Software Foundation, Inc. +# Saïd Bougribate , 2000. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: soundtracker-0.5.0\n" +"POT-Creation-Date: 2000-03-20 16:31+0200\n" +"PO-Revision-Date: 2000-03-21 19:19+01:00\n" +"Last-Translator: Saïd Bougribate \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: app/audioconfig.c:55 +msgid "Playback Output" +msgstr "Sortie Sonore" + +#: app/audioconfig.c:61 +msgid "Editing Output" +msgstr "Edition de la Sortie Sonore" + +#: app/audioconfig.c:67 +msgid "Sampling" +msgstr "Echantillonneur" + +#: app/audioconfig.c:178 +msgid "Driver Module" +msgstr "Module de pilote" + +#: app/audioconfig.c:186 app/audioconfig.c:189 +msgid "Audio Configuration" +msgstr "Configuration sonore" + +#: app/drivers/alsa-input.c:125 app/drivers/alsa-output.c:135 +#, c-format +msgid "(%d bytes)" +msgstr "(%d byte)" + +#: app/drivers/alsa-input.c:128 app/drivers/alsa-output.c:138 +#: app/drivers/oss-output.c:139 +#, c-format +msgid "Estimated audio delay: %f microseconds" +msgstr "Delaie estimé: %f microsecondi" + +#: app/drivers/alsa-input.c:193 app/drivers/alsa-output.c:200 +#: app/drivers/oss-output.c:188 +msgid "These changes won't take effect until you restart playing." +msgstr "Les changments ne prendront effet qu'au redémarrage de l'application." + +#: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:212 +#: app/drivers/oss-output.c:200 +msgid "Resolution:" +msgstr "Résolution:" + +#: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:222 +#: app/drivers/oss-output.c:210 +msgid "Channels:" +msgstr "Canaux:" + +#: app/drivers/alsa-input.c:225 app/drivers/alsa-output.c:232 +#: app/drivers/oss-output.c:220 +msgid "Frequency [Hz]:" +msgstr "Frequence [Hz]:" + +#: app/drivers/alsa-input.c:235 app/drivers/alsa-output.c:242 +#: app/drivers/oss-output.c:230 +msgid "Buffer Size:" +msgstr "Taille du buffer:" + +#: app/drivers/alsa-input.c:268 app/drivers/alsa-output.c:275 +msgid "ALSA card number:" +msgstr "Carte ALSA numéro:" + +#: app/drivers/alsa-input.c:283 app/drivers/alsa-output.c:290 +msgid "ALSA device number:" +msgstr "ALSA device numéro:" + +#: app/drivers/alsa-input.c:374 +#, c-format +msgid "" +"Couldn't open ALSA device for sound input (card:%d, device:%d):\n" +"%s" +msgstr "" +"Impossible d'initialiser ALSA pour la sortie sonore (carte:%d, " +"device:%d):\n" +"%s" + +#: app/drivers/alsa-input.c:426 app/drivers/alsa-output.c:427 +#: app/drivers/oss-input.c:221 app/drivers/oss-output.c:390 +msgid "Required sound output format not supported.\n" +msgstr "Le format sonore n'est pas supporté.\n" + +#: app/drivers/alsa-input.c:439 app/drivers/alsa-output.c:442 +msgid "Required sound output parameters not supported.\n" +msgstr "Les parametres sonores ne sont pas supportés.\n" + +#: app/drivers/alsa-output.c:378 +#, c-format +msgid "" +"Couldn't open ALSA device for sound output (card:%d, device:%d):\n" +"%s" +msgstr "" +"Impossible d'ouvrir le device ALSA pour la sortie sonore (carte:%d, " +"device:%d):\n" +"%s" + +#: app/drivers/oss-input.c:90 +msgid "no settings (yet), sorry!" +msgstr "Pas de configuration (pour l'instant), désolé!" + +#: app/drivers/oss-input.c:188 +#, c-format +msgid "" +"Couldn't open /dev/dsp for sampling:\n" +"%s" +msgstr "" +"Impossible d'ouvrir /dev/dsp pour l'échantilloneur:\n" +"%s" + +#: app/drivers/oss-output.c:173 +#, c-format +msgid "(%d samples)" +msgstr "(%d échantillons)" + +#: app/drivers/oss-output.c:357 +#, c-format +msgid "" +"Couldn't open /dev/dsp for sound output:\n" +"%s" +msgstr "" +"Impossible d'ouvrir /dev/dsp pour la sortie sonore:\n" +"%s" + +#: app/effectsconfig.c:56 +msgid "Master Reverb" +msgstr "Reverb Principale" + +#: app/effectsconfig.c:153 app/effectsconfig.c:156 +msgid "Playback Effects Configuration" +msgstr "Configuration des effets audio" + +#: app/envelope-box.c:740 +msgid "Length" +msgstr "Durée" + +#: app/envelope-box.c:741 +msgid "Current" +msgstr "Courant" + +#: app/envelope-box.c:742 +msgid "Offset" +msgstr "Variation" + +#: app/envelope-box.c:743 +msgid "Value" +msgstr "Valeur" + +#: app/envelope-box.c:749 app/gui.c:1078 +msgid "Insert" +msgstr "Insérer" + +#: app/envelope-box.c:755 app/gui.c:1085 +msgid "Delete" +msgstr "Annuler" + +#: app/envelope-box.c:843 +msgid "" +"Graphical\n" +"Envelope\n" +"Editor\n" +"only in\n" +"GNOME Version" +msgstr "" +"Editeur\n" +"Graphique\n" +"D'enveloppe\n" +"Seulement dans la\n" +"Version de GNOME" + +#: app/envelope-box.c:858 +msgid "Sustain" +msgstr "Soutien" + +#: app/envelope-box.c:866 +msgid "Point" +msgstr "Point" + +#: app/envelope-box.c:868 +msgid "Loop" +msgstr "Boucle" + +#: app/envelope-box.c:876 app/sample-editor.c:207 +msgid "Start" +msgstr "Démarrer" + +#: app/envelope-box.c:877 app/sample-editor.c:208 +msgid "End" +msgstr "Fin" + +#: app/gui-settings.c:75 +msgid "Scopes Frequency" +msgstr "Frequence des oscilloscopes" + +#: app/gui-settings.c:78 +msgid "Tracker Frequency" +msgstr "Frequence du tracker" + +#: app/gui-settings.c:161 app/gui-settings.c:164 +msgid "GUI Configuration" +msgstr "Configuration de la GUI" + +#: app/gui-settings.c:189 +msgid "Use Hexadecimal Numbers" +msgstr "Utiliser les nombres hexadécimaux" + +#: app/gui-settings.c:196 +msgid "Advance Cursor in FX Columns" +msgstr "Curseur avancé dans les colonnes des FX" + +#: app/gui-settings.c:203 +msgid "Use anti-aliased envelope editor" +msgstr "Utiliser l'anti-aliase dans l'éditeur d'enveloppe" + +#: app/gui-settings.c:209 +msgid "You need to restart SoundTracker for this change to come into effect." +msgstr "Vous devez redmarrer SoundTracker pour que ces changments prennent effet." + +#: app/gui-settings.c:218 +msgid "Scopes buffer size [MB]" +msgstr "Dimension du buffer des ossilloscopes [MO]" + +#: app/gui-settings.c:237 +msgid "Highlight rows:" +msgstr "Eclairage des rows:" + +#: app/gui-settings.c:255 +msgid "`Save XM' saves all non-empty patterns" +msgstr "`Sauvegarde XM' sauve les patterns non vide" + +#: app/gui-subs.c:386 +msgid "Question" +msgstr "Question" + +#: app/gui-subs.c:403 app/sample-editor.c:1172 +msgid "Cancel" +msgstr "Annuler" + +#: app/gui-subs.c:421 +msgid "Warning" +msgstr "Attention" + +#: app/gui-subs.c:447 +msgid "Error!" +msgstr "Erreur!" + +#: app/gui.c:82 +msgid "Tempo" +msgstr "Tempo" + +#: app/gui.c:211 +msgid "" +"Are you sure you want to free the current project?\n" +"All changes will be lost!" +msgstr "" +"Etes vous sur de vider le projet courant?\n" +"Tous les modifications vont êtres perdues!" + +#: app/gui.c:225 +msgid "Are you sure you want to overwrite the file?" +msgstr "Etes vous sur de vouloir supprimer ce fichier?" + +#: app/gui.c:1069 +msgid "Song length" +msgstr "Duréee de la musique" + +#: app/gui.c:1070 +msgid "Current pos" +msgstr "Position courante" + +#: app/gui.c:1071 app/gui.c:1228 +msgid "Pattern" +msgstr "Pattern" + +#: app/gui.c:1072 +msgid "Restart pos" +msgstr "Redémarre la position" + +#: app/gui.c:1140 +msgid "Load XM..." +msgstr "Charge XM..." + +#: app/gui.c:1142 +msgid "Save XM..." +msgstr "Sauve XM..." + +#: app/gui.c:1181 +msgid "Play Song" +msgstr "Joue la Musique" + +#: app/gui.c:1187 +msgid "Play Pattern" +msgstr "Joue le Pattern" + +#: app/gui.c:1193 +msgid "Stop" +msgstr "Stop" + +#: app/gui.c:1212 +msgid "Number of Channels:" +msgstr "Nombre de canaux:" + +#: app/gui.c:1244 +msgid "PatLength" +msgstr "Durée du pattern" + +#: app/gui.c:1336 +msgid "Octave" +msgstr "Octave" + +#: app/gui.c:1344 +msgid "Jump" +msgstr "Saut" + +#: app/gui.c:1352 +msgid "Instr" +msgstr "Instrument" + +#: app/gui.c:1367 +msgid "Sample" +msgstr "Echantillon" + +#: app/instrument-editor.c:75 +msgid "VolFade" +msgstr "Volume du Fader" + +#: app/instrument-editor.c:76 +msgid "VibSpeed" +msgstr "Vitesse du Vibrato" + +#: app/instrument-editor.c:77 +msgid "VibDepth" +msgstr "Profondeur du vibrato" + +#: app/instrument-editor.c:78 +msgid "VibSweep" +msgstr "Sweep du vibrato" + +#: app/instrument-editor.c:154 +msgid "Can't open file." +msgstr "Impossibile d'ouvrir le fichier." + +#: app/instrument-editor.c:174 +msgid "Saving Instruments not yet supported." +msgstr "La sauvegarde des instruments n'est pas encore supportée." + +#: app/instrument-editor.c:182 +msgid "Sine" +msgstr "Sinus" + +#: app/instrument-editor.c:182 +msgid "Square" +msgstr "Square" + +#: app/instrument-editor.c:182 +msgid "Saw Down" +msgstr "Saw Faible" + +#: app/instrument-editor.c:182 +msgid "Saw Up" +msgstr "Saw Haut" + +#: app/instrument-editor.c:186 +msgid "Instrument Editor" +msgstr "Editeur d'instruments" + +#: app/instrument-editor.c:195 +msgid "Volume envelope" +msgstr "Volume de l'enveloppe" + +#: app/instrument-editor.c:203 +msgid "Panning envelope" +msgstr "volume du panoramique" + +#: app/instrument-editor.c:220 +msgid "Load Instrument.." +msgstr "Charge Instrument" + +#: app/instrument-editor.c:222 +msgid "Save Instrument.." +msgstr "Sauve Instrument.." + +#: app/instrument-editor.c:224 +msgid "Load XI" +msgstr "Charge XI" + +#: app/instrument-editor.c:230 +msgid "Save XI" +msgstr "Sauve XI" + +#: app/instrument-editor.c:250 +msgid "Vibrato Type:" +msgstr "Tipe de vibrato:" + +#: app/instrument-editor.c:322 +msgid "Note:" +msgstr "Note:" + +#: app/instrument-editor.c:340 +msgid "Initialize" +msgstr "Initialise" + +#: app/keys.c:123 +msgid "The key that inserts the special keyoff note for FastTracker modules." +msgstr "" +"La touche qui insert le coupe-note pour les modules FastTracker." + +#: app/keys.c:135 +msgid "Upper Octave Keys.." +msgstr "Touche de l'octave supérieure.." + +#: app/keys.c:136 +msgid "" +"These are the keys on the upper half of the keyboard. The c key is normally " +"the key to the right of the TAB key. The rest of the keys should be ordered " +"in a piano keyboard fashion, including the number keys row above." +msgstr "" +"Ce sont les touches du coin haut du clavier. La touche c est normalement " +"la touche du cote droit de la TABULATION. Le reste des touches doivent etres" +"rangées comme un piano, incluant le nombre de touches." + +#: app/keys.c:142 +msgid "Lower Octave Keys.." +msgstr "Touche de l'octave inférieure.." + +#: app/keys.c:143 +msgid "" +"These are the keys on the lower half of the keyboard. The c key is normally " +"the first character key to the right of the left Shift key. The rest of the " +"keys should be ordered in a piano keyboard fashion, including the row above." +msgstr "" +"Ce sont les touches du coin bas du clavier. La touche c est normalement " +"la premiere touche du cote gauche de la touche SHIFT. Le reste des touches " +"doivent etres rangées comme un piano, incluant le nombre de touches." + +#: app/keys.c:149 +msgid "Other Keys.." +msgstr "Autres touches.." + +#: app/keys.c:150 +msgid "Various other keys" +msgstr "Autres touches variées.." + +#: app/keys.c:433 +msgid "Function" +msgstr "Fonction" + +#: app/keys.c:434 +msgid "Assignment" +msgstr "Assignement" + +#: app/keys.c:443 app/keys.c:446 +msgid "Keyboard Configuration" +msgstr "Configuration du clavier" + +#: app/keys.c:491 +msgid "Key Group Explanation" +msgstr "Exploiation du groupement de touches" + +#: app/keys.c:508 +msgid "Key Explanation" +msgstr "Explotation des touches" + +#: app/keys.c:539 +msgid "Modifiers:" +msgstr "Modificateur:" + +#: app/keys.c:565 +msgid "Learn selected key" +msgstr "Memorise la touche selectionnée" + +#: app/keys.c:571 +msgid "Learn all keys" +msgstr "Memorise toutes les touches" + +#: app/keys.c:577 +msgid "" +"Please press the desired key combination!\n" +"Click into left list to cancel" +msgstr "" +"SVP pressez votre touche de combinaison !\n" +"Cliquez sur la liste de gauche pour annuler" + +#: app/keys.c:635 +msgid "" +"The keyboard configuration file is defective.\n" +"Please use the Keyboard Configuration dialog." +msgstr "" +"Le fichier de la configuration du clavier est corrompu.\n" +"SVP utilisez la boite de dialogue de la Configuration du Clavier." + +#: app/keys.c:845 +msgid "" +"Automatic key configuration unsuccessful.\n" +"Please use the Keyboard Configuration dialog\n" +"in the Settings menu." +msgstr "" +"Echec dans la configuration des touches automatiques.\n" +"SVP utilisez la boite de dialogue de la Configuration du Clavier\n" +"dans le menu Configuration." + +#: app/menubar.c:98 +msgid "Ok" +msgstr "Ok" + +#: app/menubar.c:134 +msgid "" +"Are you sure you want to do this?\n" +"All changes will be lost!" +msgstr "" +"Etes vous sur de vouloir faire cela?\n" +"Toutes les modifications vont êtres perdues!" + +#: app/menubar.c:156 +msgid "" +"Are you sure you want to quit?\n" +"All changes will be lost!" +msgstr "" +"Etes vous sûr de voulour quitter?\n" +"Toutes les modifications vont êtres perdues!" + +#: app/menubar.c:227 +msgid "_Open..." +msgstr "_Ouvrir..." + +#: app/menubar.c:229 +msgid "Save _as..." +msgstr "Sauvegarder _sous..." + +#: app/menubar.c:234 +msgid "_Quit" +msgstr "_Quitter" + +#: app/menubar.c:241 +msgid "Clear _All" +msgstr "Effacer _Tout" + +#: app/menubar.c:243 +msgid "Clear _Patterns Only" +msgstr "Effacer seulement les _Patterns" + +#: app/menubar.c:245 +msgid "_Optimize Module" +msgstr "_Optimise les Modules" + +#: app/menubar.c:252 app/menubar.c:263 app/menubar.c:281 +msgid "C_ut" +msgstr "_Couper" + +#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 +msgid "_Copy" +msgstr "_Copier" + +#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 +msgid "_Paste" +msgstr "_Coller" + +#: app/menubar.c:269 +msgid "_Insert" +msgstr "I_nsérer" + +#: app/menubar.c:271 +msgid "_Delete" +msgstr "A_nnuler" + +#: app/menubar.c:279 +msgid "_Mark" +msgstr "_Maquer" + +#: app/menubar.c:292 +msgid "_Jazz Edit Mode" +msgstr "_Jazz Edition Mode" + +#: app/menubar.c:297 +msgid "Transp_osition..." +msgstr "Transp_osition..." + +#: app/menubar.c:302 app/menubar.c:380 +msgid "_Pattern" +msgstr "_Pattern" + +#: app/menubar.c:303 +msgid "_Track" +msgstr "T_rack" + +#: app/menubar.c:304 +msgid "_Selection" +msgstr "_Sélection" + +#: app/menubar.c:310 +msgid "_Find Unused Pattern" +msgstr "_Trouver les Patterns non utilisés" + +#: app/menubar.c:312 +msgid "_Copy Current to Unused Pattern" +msgstr "_Copier courant dans un Pattern non utilisé" + +#: app/menubar.c:314 +msgid "C_lear Unused Patterns" +msgstr "Effac_er les Patterns non utilisés" + +#: app/menubar.c:316 +msgid "_Pack Patterns" +msgstr "Com_presser les Patterns" + +#: app/menubar.c:323 +msgid "_Load XI..." +msgstr "_Charger XI..." + +#: app/menubar.c:328 +msgid "_Delete Unused Instruments" +msgstr "_Enlever les instruments non utilisés" + +#: app/menubar.c:336 +msgid "Display _Oscilloscopes" +msgstr "Montrer les _Oscilloscopes" + +#: app/menubar.c:338 +msgid "Use _Backing Store" +msgstr "Utiliser les _Backing Store" + +#: app/menubar.c:343 +msgid "_Keyboard Configuration..." +msgstr "_Configuration du Clavier..." + +#: app/menubar.c:345 +msgid "_Audio Configuration..." +msgstr "Configuration _Audio..." + +#: app/menubar.c:347 +msgid "_Playback Effects..." +msgstr "Effects _Audio..." + +#: app/menubar.c:349 +msgid "_GUI Configuration..." +msgstr "Configuration de la _GUI..." + +#: app/menubar.c:354 +msgid "_Save Settings now" +msgstr "_Sauver la configuration maintenant" + +#: app/menubar.c:356 +msgid "Save Settings on _Exit" +msgstr "Sauver la configuration en _Quittant" + +#: app/menubar.c:363 +msgid "_About..." +msgstr "_A propos..." + +#: app/menubar.c:368 +msgid "Show _Tips..." +msgstr "Montrer les A_stuces..." + +#: app/menubar.c:370 +msgid "_XM Effects..." +msgstr "_XM effects..." + +#: app/menubar.c:377 +msgid "_File" +msgstr "_Fichier" + +#: app/menubar.c:378 +msgid "_Module" +msgstr "_Module" + +#: app/menubar.c:379 +msgid "_Edit" +msgstr "_Edition" + +#: app/menubar.c:381 +msgid "_Instrument" +msgstr "_Instrument" + +#: app/menubar.c:382 +msgid "_Settings" +msgstr "_Configuration" + +#: app/menubar.c:383 +msgid "_Help" +msgstr "_Aide" + +#: app/menubar.c:411 +msgid "/_File" +msgstr "/_Fichier" + +#: app/menubar.c:412 +msgid "/File/_Open..." +msgstr "/Fichier/_Ouvrir..." + +#: app/menubar.c:413 +msgid "/File/Save _as..." +msgstr "/Fichier/Sauver _sous..." + +#: app/menubar.c:414 +msgid "/File/-" +msgstr "/Fichier/-" + +#: app/menubar.c:415 +msgid "/File/_Quit" +msgstr "/Fichier/_Quitter" + +#: app/menubar.c:416 +msgid "/_Module" +msgstr "/_Module" + +#: app/menubar.c:417 +msgid "/Module/Clear _All" +msgstr "/Module/Effacer _Tout" + +#: app/menubar.c:418 +msgid "/Module/Clear _Patterns Only" +msgstr "/Module/Effacer seulement les _Patterns" + +#: app/menubar.c:419 +msgid "/Module/_Optimize Module" +msgstr "/Module/_Optimiser le Module" + +#: app/menubar.c:420 +msgid "/_Edit" +msgstr "/_Edition" + +#: app/menubar.c:421 +msgid "/Edit/_Jazz Edit Mode" +msgstr "/Edition/_Jazz Edition Mode" + +#: app/menubar.c:422 app/menubar.c:424 +msgid "/Edit/-" +msgstr "/Edition/-" + +#: app/menubar.c:423 +msgid "/Edit/_Transposition..." +msgstr "/Edition/Tr_ansposition..." + +#: app/menubar.c:425 +msgid "/Edit/_Pattern" +msgstr "/Edition/_Pattern" + +#: app/menubar.c:426 +msgid "/Edit/Pattern/C_ut" +msgstr "/Edition/Pattern/_Couper" + +#: app/menubar.c:427 +msgid "/Edit/Pattern/_Copy" +msgstr "/Edition/Pattern/_Copier" + +#: app/menubar.c:428 +msgid "/Edit/Pattern/_Paste" +msgstr "/Edition/Pattern/_coller" + +#: app/menubar.c:429 +msgid "/Edit/_Track" +msgstr "/Edition/T_rack" + +#: app/menubar.c:430 +msgid "/Edit/Track/C_ut" +msgstr "/Edition/Track/C_ouper" + +#: app/menubar.c:431 +msgid "/Edit/Track/_Copy" +msgstr "/Edition/Tracck/_Copier" + +#: app/menubar.c:432 +msgid "/Edit/Track/_Paste" +msgstr "/Edition/Track/Co_ller" + +#: app/menubar.c:433 +msgid "/Edit/Track/_Insert" +msgstr "/Edition/Track/I_nsérer" + +#: app/menubar.c:434 +msgid "/Edit/Track/_Delete" +msgstr "/Edition/Track/A_nnuler" + +#: app/menubar.c:435 +msgid "/Edit/_Selection" +msgstr "/Edition/_Selection" + +#: app/menubar.c:436 +msgid "/Edit/Selection/_Mark" +msgstr "/Edition/Selection/_Marquer" + +#: app/menubar.c:437 +msgid "/Edit/Selection/C_ut" +msgstr "/Edition/Selection/C_ouper" + +#: app/menubar.c:438 +msgid "/Edit/Selection/_Copy" +msgstr "/Edition/Selection/_Copia" + +#: app/menubar.c:439 +msgid "/Edit/Selection/_Paste" +msgstr "/Edit/Selection/Co_ller" + +#: app/menubar.c:440 +msgid "/_Pattern" +msgstr "/_Pattern" + +#: app/menubar.c:441 +msgid "/Pattern/_Find Unused Pattern" +msgstr "/Pattern/_Trouver les Patterns non utilisés" + +#: app/menubar.c:442 +msgid "/Pattern/_Copy Current to Unused Pattern" +msgstr "/Pattern/_Copier courant dans un Pattern non utilisé" + +#: app/menubar.c:443 +msgid "/Pattern/C_lear Unused Patterns" +msgstr "/Pattern/Ef_facer les Patterns non utilisés" + +#: app/menubar.c:444 +msgid "/Pattern/_Pack Patterns" +msgstr "/Pattern/Com_presser les Patterns" + +#: app/menubar.c:445 +msgid "/_Instrument" +msgstr "/_Instruments" + +#: app/menubar.c:446 +msgid "/Instrument/_Load XI..." +msgstr "/Instruments/_Charger XI..." + +#: app/menubar.c:447 +msgid "/Instrument/-" +msgstr "/Instruments/-" + +#: app/menubar.c:448 +msgid "/Instrument/_Delete Unused Instruments" +msgstr "/Instruments/_Enlever les Instruments non utilisés" + +#: app/menubar.c:449 +msgid "/_Settings" +msgstr "/_Configuration" + +#: app/menubar.c:450 +msgid "/Settings/Display _Oscilloscopes" +msgstr "/Configuration/Montrer les _Oscilloscopes" + +#: app/menubar.c:451 +msgid "/Settings/Use _Backing Store" +msgstr "/Configuration/Utiliser les _Backing Store" + +#: app/menubar.c:452 app/menubar.c:457 +msgid "/Settings/-" +msgstr "/Configuration/-" + +#: app/menubar.c:453 +msgid "/Settings/_Keyboard Configuration..." +msgstr "/Configuration/_Configuration du Clavier..." + +#: app/menubar.c:454 +msgid "/Settings/_Audio Configuration..." +msgstr "/Configuration/Configuration du Son Audio..." + +#: app/menubar.c:455 +msgid "/Settings/_Playback Effects..." +msgstr "/Configuration/Effects _Audio..." + +#: app/menubar.c:456 +msgid "/Settings/_GUI Configuration..." +msgstr "Configuration/Configuration de la _GUI..." + +#: app/menubar.c:458 +msgid "/Settings/_Save Settings now" +msgstr "/Configuration/_Sauver la Configuration maintenant" + +#: app/menubar.c:459 +msgid "/Settings/Save Settings on _Exit" +msgstr "/Configuration/Sauver la Configuration en _Quittant" + +#: app/menubar.c:460 +msgid "/_Help" +msgstr "/_Aide" + +#: app/menubar.c:461 +msgid "/Help/_About..." +msgstr "/Aide/_A Propos..." + +#: app/menubar.c:462 +msgid "/Help/-" +msgstr "/Aide/-" + +#: app/menubar.c:463 +msgid "/Help/Show _Tips..." +msgstr "/Aide/Montrer les _Astuces..." + +#: app/menubar.c:464 +msgid "/Help/_XM Effects..." +msgstr "/Aide/Effects _XM..." + +#: app/menubar.c:478 +msgid "/Settings/Display Oscilloscopes" +msgstr "/Configuration/Montrer les Oscilloscopes" + +#: app/menubar.c:480 +msgid "/Settings/Use Backing Store" +msgstr "/Configuration/Utiliser les Backing Store" + +#: app/menubar.c:482 +msgid "/Settings/Save Settings on Exit" +msgstr "/Configuration/Sauvez la Configuration en Quittant" + +#: app/module-info.c:116 +msgid "Instrument Name" +msgstr "Nom de l'instrument" + +#: app/module-info.c:116 +msgid "#smpl" +msgstr "#échantillon" + +#: app/module-info.c:117 +msgid "Sample Name" +msgstr "Nom de l'échantillon" + +#: app/module-info.c:118 +msgid "Linear" +msgstr "Linéaire" + +#: app/module-info.c:118 app/sample-editor.c:167 +msgid "Amiga" +msgstr "Amiga" + +#: app/module-info.c:125 +msgid "Module Info" +msgstr "Module Information" + +#: app/module-info.c:165 +msgid "Songname:" +msgstr "Titre:" + +#: app/module-info.c:180 +msgid "Frequencies:" +msgstr "Fréquence:" + +#: app/module-info.c:185 +msgid "ProTracker Mode" +msgstr "Mode ProTracker" + +#: app/preferences.c:58 +msgid "" +"A directory called '.soundtracker' has been created in your\n" +"home directory to store configuration files.\n" +msgstr "" +"Un répertoire appeler '.soundtracker' a été créé dans votre\n" +"répertoire maison pour y créer un fichier de sauvegarde .\n" + +#: app/sample-editor.c:166 +msgid "No loop" +msgstr "Pas de boucle" + +#: app/sample-editor.c:168 +msgid "PingPong" +msgstr "Ping Pong" + +#: app/sample-editor.c:172 +msgid "8 bits" +msgstr "8 bits" + +#: app/sample-editor.c:173 +msgid "16 bits" +msgstr "16 bits" + +#: app/sample-editor.c:179 +msgid "Sample Editor" +msgstr "Editeur d'échantillon" + +#: app/sample-editor.c:219 +msgid "Volume" +msgstr "Volume" + +#: app/sample-editor.c:220 +msgid "Panning" +msgstr "Panoramique" + +#: app/sample-editor.c:221 +msgid "Finetune" +msgstr "Regulation affinée" + +#: app/sample-editor.c:232 +msgid "SelStart" +msgstr "InitSelection" + +#: app/sample-editor.c:233 +msgid "SelEnd" +msgstr "FinSelection" + +#: app/sample-editor.c:236 +msgid "Reset Sel" +msgstr "RedémarreSelection" + +#: app/sample-editor.c:241 +msgid "RelNote" +msgstr "NoteRelative" + +#: app/sample-editor.c:242 +msgid "Length: 0" +msgstr "Durée: 0" + +#: app/sample-editor.c:255 +msgid "Load Sample.." +msgstr "Charge Echantillon.." + +#: app/sample-editor.c:256 +msgid "Save WAV.." +msgstr "Sauve WAV.." + +#: app/sample-editor.c:259 +msgid "Load Sample" +msgstr "Charge Echantillon" + +#: app/sample-editor.c:268 +msgid "Save WAV" +msgstr "Sauve WAV" + +#: app/sample-editor.c:278 +msgid "Clear" +msgstr "Effacer" + +#: app/sample-editor.c:284 +msgid "Monitor" +msgstr "Moniteur" + +#: app/sample-editor.c:290 +msgid "Volume Ramp" +msgstr "Rampe du Volume" + +#: app/sample-editor.c:300 +msgid "Zoom to selection" +msgstr "Zoom la sélection" + +#: app/sample-editor.c:306 +msgid "Show all" +msgstr "Montrer tout" + +#: app/sample-editor.c:312 +msgid "Zoom in (+50%)" +msgstr "Zoom avant (+50%)" + +#: app/sample-editor.c:318 +msgid "Zoom out (-50%)" +msgstr "Zoom arrière (-50%)" + +#: app/sample-editor.c:324 +msgid "Resample" +msgstr "Rééchantillone" + +#: app/sample-editor.c:335 +msgid "Cut" +msgstr "Couper" + +#: app/sample-editor.c:341 +msgid "Remove" +msgstr "Enlever" + +#: app/sample-editor.c:347 +msgid "Copy" +msgstr "Copier" + +#: app/sample-editor.c:353 +msgid "Paste" +msgstr "Coller" + +#: app/sample-editor.c:359 +msgid "Filter" +msgstr "Filtre" + +#: app/sample-editor.c:459 +#, c-format +msgid "Length: %d" +msgstr "Durée: %d" + +#: app/sample-editor.c:957 +msgid "" +msgstr "" + +#: app/sample-editor.c:1034 +msgid "Can't read sample" +msgstr "Impossible de lire l'échantillon" + +#: app/sample-editor.c:1040 +msgid "Sample is too long for current mixer module. Loading anyway." +msgstr "L'échantillon est trop long pour le mixer. Continue chargement néanmoins." + +#: app/sample-editor.c:1054 +msgid "Can only handle mono 8 and 16 bit samples" +msgstr "Ne peut supporter que les échantillons mono 8/16 bits" + +#: app/sample-editor.c:1065 +msgid "Read error." +msgstr "Erreur de lecture." + +#: app/sample-editor.c:1120 +msgid "Can't open file for writing." +msgstr "Impossible d'ouvrir le fichier pour l'écriture." + +#: app/sample-editor.c:1157 +msgid "OK" +msgstr "OK" + +#: app/sample-editor.c:1165 +msgid "Start sampling" +msgstr "Démarre l'échantillonage" + +#: app/sample-editor.c:1200 app/sample-editor.c:1203 +msgid "Sampling Window" +msgstr "Fenêtre d'echantillonage" + +#: app/sample-editor.c:1303 +msgid "" +msgstr "" + +#: app/sample-editor.c:1333 +msgid "Recorded sample is too long for current mixer module. Using it anyway." +msgstr "" +"L'échantillon enregistré est trop long pour le mixer. Continue néanmoins." + +#: app/sample-editor.c:1365 +msgid "Normalize" +msgstr "Normaliser" + +#: app/sample-editor.c:1366 +msgid "Execute" +msgstr "Exécuter" + +#: app/sample-editor.c:1367 app/tips-dialog.c:165 +msgid "Close" +msgstr "Fermer" + +#: app/sample-editor.c:1376 app/sample-editor.c:1379 +msgid "Volume Ramping" +msgstr "Rampe du Volume" + +#: app/sample-editor.c:1396 +msgid "Perform linear volume fade on Selection" +msgstr "Appliquer un volume linéaire à la sélection " + +#: app/sample-editor.c:1408 +msgid "Left [%]:" +msgstr "Gauche [%]:" + +#: app/sample-editor.c:1413 +msgid "Right [%]:" +msgstr "Droit [%]:" + +#: app/tips-dialog.c:87 +msgid "SoundTracker Tip of the day" +msgstr "Astuce du jour de Soundtracker" + +#: app/tips-dialog.c:149 +msgid "Previous Tip" +msgstr "Astuce Précédente" + +#: app/tips-dialog.c:157 +msgid "Next Tip" +msgstr "Astuce Suivante" + +#: app/tips-dialog.c:177 +msgid "Show tip next time" +msgstr "Montrer les astuces la prochaine fois" + +#: app/tips-dialog.c:251 +msgid "" +"Welcome to SoundTracker!\n" +"\n" +"If you are new to this type of program, you will want to get hold of\n" +"some XM or MOD files first and play with them." +msgstr "" +"Bienvenue dans SoundTracker!\n" +"\n" +"Si vous êtes nouveau dans ce type de programme, vous devrer obtenir\n" +"quelques XM et MOD avant tout pour jouer avec." + +#: app/tips-dialog.c:256 +msgid "" +"You can make SoundTracker's edit mode more responsive to keyboard\n" +"input by decreasing the mixing buffer size of the \"Editing\" object in\n" +"the Audio Configuration." +msgstr "" +"Vous pouvez rendre le mode d'édition de SoundTracker plus réactif au clavier\n" +"en diminuant la taille du buffer du mixer dans l'objet \"Edition\"\n" +"qui est dans la Configuration Audio." + +#: app/tips-dialog.c:260 +msgid "" +"You can adjust the loop points in the sample editor by holding Shift\n" +"and using the left and right mousebuttons.\n" +msgstr "" +"Vous pouvez ajuster les points de boucle dans l'éditeur d'échantillon en\n" +"pressant la touche Shift et en utilisant le bouton gauche et droit de la\n" +"souris.\n" + +#: app/tips-dialog.c:263 +msgid "" +"If you want to know more about tracking, and how the various commands\n" +"work, have a look at http://www.united-trackers.org/" +msgstr "" +"Si vous voulez en savoir plus sur le tracking, et comment les differentes\n" +"commandes fonctionnent, jetez un oeil sur http://www.united-trackers.org/" + +#: app/tips-dialog.c:266 +msgid "" +"You can assign samples of an instrument to the individual keys by\n" +"activating its sample and then clicking on the keyboard in the\n" +"instrument editor page." +msgstr "" +"Vous pouvez assignez des échantillons d'un instrument à differentes touches\n" +"en activant ses échantillons et en cliquant ensuite sur le clavier dans la\n" +"page de\n" "l'éditeur d'instrument." + +#: app/track-editor.c:82 +msgid "Jazz Edit:" +msgstr "Jazz Edition:" + +#: app/transposition.c:165 +msgid "Whole Song" +msgstr "Musique Totale" + +#: app/transposition.c:166 +msgid "All Patterns" +msgstr "Tout les patterns" + +#: app/transposition.c:167 +msgid "Current Pattern" +msgstr "Pattern Courant" + +#: app/transposition.c:168 +msgid "Current Track" +msgstr "Track Courant" + +#: app/transposition.c:172 +msgid "Current Instrument" +msgstr "Instrument Courant" + +#: app/transposition.c:173 +msgid "All Instruments" +msgstr "Tout les Instruments" + +#: app/transposition.c:177 +msgid "Half note up" +msgstr "Un demi ton au dessus" + +#: app/transposition.c:178 +msgid "Half note down" +msgstr "Un demi ton en dessous" + +#: app/transposition.c:179 +msgid "Octave up" +msgstr "Une octave au dessus" + +#: app/transposition.c:180 +msgid "Octave down" +msgstr "Une octave en dessous" + +#: app/transposition.c:183 +msgid "Exchange 1 <-> 2" +msgstr "Echanger 1 <-> 2" + +#: app/transposition.c:184 +msgid "Change 1 -> 2" +msgstr "Echanger 1 -> 2" + +#: app/transposition.c:193 app/transposition.c:196 +msgid "Transposition Tools" +msgstr "Outils de Transposition.." + +#: app/transposition.c:216 +msgid "Scope of the operation:" +msgstr "Zone d'influence de l'opération:" + +#: app/transposition.c:223 +msgid "Note Transposition" +msgstr "Transposition de la note" + +#: app/transposition.c:253 +msgid "Instrument Changing" +msgstr "Changement d'instrument" + +#: app/transposition.c:268 +msgid "Instrument 1:" +msgstr "Instrument 1:" + +#: app/transposition.c:270 app/transposition.c:280 +msgid "Current instrument" +msgstr "Instrument Courant" + +#: app/transposition.c:278 +msgid "Instrument 2:" +msgstr "Instrument 2:" + +#: app/xm.c:161 +#, c-format +msgid "Pattern length out of range: %d.\n" +msgstr "La durée du pattern est dépassée: %d.\n" + +#: app/xm.c:441 app/xm.c:510 +#, c-format +msgid "Invalid vibtype %d, using Sine.\n" +msgstr "Tipe de vibrato %d invalide, utilise le Sinus.\n" + +#: app/xm.c:472 +msgid "File is no XI instrument." +msgstr "Le fichier n'est pas un instrument XI." + +#: app/xm.c:482 +#, c-format +msgid "Unknown XI version 0x%x\n" +msgstr "Version XI 0x%x inconnue\n" + +#: app/xm.c:702 +msgid "No FastTracker XM and no supported MOD format!" +msgstr "Il n'y a pas de XM FastTracker et de format MOD supporté!" + +#: app/xm.c:716 app/xm.c:816 +msgid "Error while loading patterns." +msgstr "Erreur lors de la lecture des patterns." + +#: app/xm.c:774 +msgid "Can't open file" +msgstr "Ne peut ouvrir le fichier" + +#: app/xm.c:788 +msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" +msgstr "" +"La longueur de l'entête du XM est != 276. Il se peut que ce soit un module\n" +"de la pré-version 0.0.12 de SoundTracker? :-)\n" + +#: app/xm.c:822 +msgid "Error while loading instruments." +msgstr "Erreur lors de la lecture des instruments." + +#: app/xm.c:833 +#, c-format +msgid "" +"Module contains sample(s) that are too long for the current mixer.\n" +"Maximum sample length is %d." +msgstr "" +"Le module contient de(s) sample(s) qui sont trop long pour le mixer.\n" +"La taille maximum est de %d." + Binary files soundtracker-0.5.0/po/it.gmo and soundtracker-0.5.1/po/it.gmo differ diff -urN soundtracker-0.5.0/po/it.po soundtracker-0.5.1/po/it.po --- soundtracker-0.5.0/po/it.po Sat Oct 30 18:52:47 1999 +++ soundtracker-0.5.1/po/it.po Sat Mar 25 11:28:26 2000 @@ -1,80 +1,101 @@ # Soundtracker Italian Translation -# Copyright (C) 1999 Free Software Foundation, Inc. -# Yuri Bongiorno , 1999. +# Copyright (C) 1999, 2000 Free Software Foundation, Inc. +# Yuri Bongiorno , 1999, 2000. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: soundtracker-0.3.4\n" -"POT-Creation-Date: 1999-10-08 16:31+0200\n" -"PO-Revision-Date: 1999-09-25 19:19+01:00\n" +"Project-Id-Version: soundtracker-0.3.10\n" +"POT-Creation-Date: 2000-03-13 13:56+0100\n" +"PO-Revision-Date: 2000-03-19 19:19+01:00\n" "Last-Translator: Yuri Bongiorno \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: app/audioconfig.c:55 +#: app/audioconfig.c:59 msgid "Playback Output" -msgstr "Uscita per il Playback" +msgstr "Output per il Playback" -#: app/audioconfig.c:61 +#: app/audioconfig.c:65 msgid "Editing Output" -msgstr "Uscita per l'Editing" +msgstr "Output per l'Editing" -#: app/audioconfig.c:67 +#: app/audioconfig.c:71 msgid "Sampling" msgstr "Campionamento" -#: app/audioconfig.c:178 +#: app/audioconfig.c:222 msgid "Driver Module" msgstr "Modulo del Driver" -#: app/audioconfig.c:186 app/audioconfig.c:189 +#: app/audioconfig.c:223 +msgid "Mixer Module" +msgstr "Modulo del Mixer" + +#: app/audioconfig.c:224 +msgid "Description" +msgstr "Descrizione" + +#: app/audioconfig.c:232 app/audioconfig.c:235 msgid "Audio Configuration" msgstr "Configurazione dell'Audio" -#: app/drivers/alsa-input.c:125 app/drivers/alsa-output.c:135 +#: app/audioconfig.c:250 +msgid "Drivers" +msgstr "Driver" + +#: app/audioconfig.c:287 +msgid "Mixers" +msgstr "Mixer" + +#: app/audioconfig.c:320 app/gui-settings.c:319 app/sample-editor.c:1607 +#: app/tips-dialog.c:165 app/transposition.c:313 +msgid "Close" +msgstr "Chiudi" + +#: app/drivers/alsa-input.c:125 app/drivers/alsa-output.c:134 #, c-format msgid "(%d bytes)" msgstr "(%d byte)" -#: app/drivers/alsa-input.c:128 app/drivers/alsa-output.c:138 +#: app/drivers/alsa-input.c:128 app/drivers/alsa-output.c:137 #: app/drivers/oss-output.c:139 #, c-format msgid "Estimated audio delay: %f microseconds" msgstr "Ritardo stimato dell'audio: %f microsecondi" -#: app/drivers/alsa-input.c:193 app/drivers/alsa-output.c:200 +#: app/drivers/alsa-input.c:193 app/drivers/alsa-output.c:199 #: app/drivers/oss-output.c:188 msgid "These changes won't take effect until you restart playing." msgstr "Questi cambiamenti avranno effetto alla prossima riproduzione." -#: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:212 +#: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 #: app/drivers/oss-output.c:200 msgid "Resolution:" msgstr "Risoluzione:" -#: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:222 +#: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 #: app/drivers/oss-output.c:210 msgid "Channels:" msgstr "Canali:" -#: app/drivers/alsa-input.c:225 app/drivers/alsa-output.c:232 +#: app/drivers/alsa-input.c:225 app/drivers/alsa-output.c:231 #: app/drivers/oss-output.c:220 msgid "Frequency [Hz]:" msgstr "Frequenza [Hz]:" -#: app/drivers/alsa-input.c:235 app/drivers/alsa-output.c:242 +#: app/drivers/alsa-input.c:235 app/drivers/alsa-output.c:241 #: app/drivers/oss-output.c:230 msgid "Buffer Size:" msgstr "Dimensione del Buffer:" -#: app/drivers/alsa-input.c:268 app/drivers/alsa-output.c:275 +#: app/drivers/alsa-input.c:268 app/drivers/alsa-output.c:274 msgid "ALSA card number:" msgstr "Numero della scheda ALSA:" -#: app/drivers/alsa-input.c:283 app/drivers/alsa-output.c:290 +#: app/drivers/alsa-input.c:283 app/drivers/alsa-output.c:289 msgid "ALSA device number:" msgstr "Numero del dispositivo ALSA:" @@ -84,33 +105,58 @@ "Couldn't open ALSA device for sound input (card:%d, device:%d):\n" "%s" msgstr "" -"Impossibile aprire il dispositivo ALSA per l'ingresso del suono (scheda:%d, " +"Impossibile aprire il dispositivo ALSA per l'input del suono (scheda:%d, " "dispositivo:%d):\n" "%s" -#: app/drivers/alsa-input.c:426 app/drivers/alsa-output.c:427 +#: app/drivers/alsa-input.c:426 app/drivers/alsa-output.c:426 #: app/drivers/oss-input.c:221 app/drivers/oss-output.c:390 msgid "Required sound output format not supported.\n" -msgstr "Il formato sonoro d'uscita richiesto non è supportato.\n" +msgstr "Il formato sonoro di output richiesto non è supportato.\n" -#: app/drivers/alsa-input.c:439 app/drivers/alsa-output.c:442 +#: app/drivers/alsa-input.c:439 app/drivers/alsa-output.c:441 msgid "Required sound output parameters not supported.\n" -msgstr "I parametri sonori d'uscita richiesti non sono supportati.\n" +msgstr "I parametri sonori di output richiesti non sono supportati.\n" -#: app/drivers/alsa-output.c:378 +#: app/drivers/alsa-output.c:377 #, c-format msgid "" "Couldn't open ALSA device for sound output (card:%d, device:%d):\n" "%s" msgstr "" -"Non posso aprire il dispositivo ALSA per l'uscita del suono (scheda:%d, " +"Impossibile aprire il dispositivo ALSA per l'output del suono (scheda:%d, " "dispositivo:%d):\n" "%s" -#: app/drivers/oss-input.c:90 +#: app/drivers/esd-output.c:96 +msgid "" +"Note that the ESD output is unusable in\n" +"interactive mode because of the latency added\n" +"by ESD. Use the OSS or ALSA output plug-ins\n" +"for serious work." +msgstr "" +"Notare che l'output di ESD non è utilizzabile in modo\n" +"interattivo a causa della latenza aggiunta\n" +"da ESD. Usare i plug-in di output OSS o ALSA\n" +"per i lavori seri." + +#: app/drivers/esd-output.c:161 +#, c-format +msgid "" +"Couldn't connect to ESD for sound output:\n" +"%s" +msgstr "" +"Impossibile connettersi a ESD per l'output del suono:\n" +"%s" + +#: app/drivers/file-output.c:86 app/drivers/oss-input.c:90 msgid "no settings (yet), sorry!" msgstr "non ci sono (ancora) impostazioni, mi dispiace!" +#: app/drivers/file-output.c:161 app/sample-editor.c:1312 +msgid "Can't open file for writing." +msgstr "Impossibile aprire il file per la scrittura." + #: app/drivers/oss-input.c:188 #, c-format msgid "" @@ -131,17 +177,9 @@ "Couldn't open /dev/dsp for sound output:\n" "%s" msgstr "" -"Impossibile aprire /dev/dsp per l'uscita del suono:\n" +"Impossibile aprire /dev/dsp per l'output del suono:\n" "%s" -#: app/effectsconfig.c:56 -msgid "Master Reverb" -msgstr "Riverbero Principale" - -#: app/effectsconfig.c:153 app/effectsconfig.c:156 -msgid "Playback Effects Configuration" -msgstr "Configurazione degli effetti di Playback" - #: app/envelope-box.c:740 msgid "Length" msgstr "Lunghezza" @@ -152,17 +190,17 @@ #: app/envelope-box.c:742 msgid "Offset" -msgstr "Variazione" +msgstr "Offset" #: app/envelope-box.c:743 msgid "Value" msgstr "Valore" -#: app/envelope-box.c:749 app/gui.c:1078 +#: app/envelope-box.c:749 app/playlist.c:301 msgid "Insert" msgstr "Inserisce" -#: app/envelope-box.c:755 app/gui.c:1085 +#: app/envelope-box.c:755 app/playlist.c:307 msgid "Delete" msgstr "Cancella" @@ -192,75 +230,120 @@ msgid "Loop" msgstr "Ciclo" -#: app/envelope-box.c:876 app/sample-editor.c:207 +#: app/envelope-box.c:876 app/sample-editor.c:225 msgid "Start" msgstr "Inizio" -#: app/envelope-box.c:877 app/sample-editor.c:208 +#: app/envelope-box.c:877 app/sample-editor.c:226 msgid "End" msgstr "Fine" -#: app/gui-settings.c:75 +#: app/file-operations.c:150 +msgid "Load Module" +msgstr "Carica il Modulo" + +#: app/file-operations.c:151 +msgid "Save Module" +msgstr "Salva il Modulo" + +#: app/file-operations.c:152 +msgid "Render WAV" +msgstr "Riversa su WAV" + +#: app/file-operations.c:153 app/sample-editor.c:325 +msgid "Load Sample" +msgstr "Carica il Campione" + +#: app/file-operations.c:154 +msgid "Save Sample" +msgstr "Salva il Campione" + +#: app/file-operations.c:155 +msgid "Load Instrument" +msgstr "Carica lo strumento" + +#: app/file-operations.c:156 +msgid "Save Instrument" +msgstr "Salva lo strumento" + +#: app/file-operations.c:162 +msgid "File" +msgstr "File" + +#: app/file-operations.c:213 +msgid "Operation not supported." +msgstr "Operazione non supportata." + +#: app/gui-settings.c:86 msgid "Scopes Frequency" msgstr "Frequenza degli Oscilloscopi" -#: app/gui-settings.c:78 +#: app/gui-settings.c:89 msgid "Tracker Frequency" msgstr "Frequenza del Tracker" -#: app/gui-settings.c:161 app/gui-settings.c:164 +#: app/gui-settings.c:188 app/gui-settings.c:191 msgid "GUI Configuration" msgstr "Configurazione della GUI" -#: app/gui-settings.c:189 +#: app/gui-settings.c:217 msgid "Use Hexadecimal Numbers" msgstr "Usa Numeri Esadecimali" -#: app/gui-settings.c:196 -msgid "Advance Cursor in FX Columns" -msgstr "Fa avanzare il Cursore nelle Colonne FX" +#: app/gui-settings.c:224 +msgid "Use upper case letters for hex numbers" +msgstr "Usa le lettere maiuscole per i numeri esadecimali" + +#: app/gui-settings.c:231 +msgid "Advance cursor horizontally in effect columns" +msgstr "Fa avanzare il cursore orizzontalmente nelle colonne effetti" + +#: app/gui-settings.c:238 +msgid "Asynchronous Editing" +msgstr "Editing asincrono" -#: app/gui-settings.c:203 +#: app/gui-settings.c:245 msgid "Use anti-aliased envelope editor" msgstr "Usa l'editor di inviluppo anti-aliased" -#: app/gui-settings.c:209 +#: app/gui-settings.c:251 msgid "You need to restart SoundTracker for this change to come into effect." msgstr "Devi riavviare SoundTracker affinchè questo cambiamento abbia effetto." -#: app/gui-settings.c:218 +#: app/gui-settings.c:260 msgid "Scopes buffer size [MB]" msgstr "Dimensione del buffer degli oscilloscopi [MB]" -#: app/gui-settings.c:237 +#: app/gui-settings.c:279 msgid "Highlight rows:" msgstr "Righe evidenziate:" -#: app/gui-settings.c:255 +#: app/gui-settings.c:297 msgid "`Save XM' saves all non-empty patterns" msgstr "`Salva XM' salva tutti i pattern non vuoti" -#: app/gui-subs.c:386 +#: app/gui-subs.c:430 msgid "Question" msgstr "Domanda" -#: app/gui-subs.c:403 app/sample-editor.c:1172 +#: app/gui-subs.c:447 app/keys.c:702 app/sample-editor.c:1225 +#: app/sample-editor.c:1412 msgid "Cancel" msgstr "Annulla" -#: app/gui-subs.c:421 +#: app/gui-subs.c:465 msgid "Warning" msgstr "Attenzione" -#: app/gui-subs.c:447 +#: app/gui-subs.c:491 msgid "Error!" msgstr "Errore!" -#: app/gui.c:82 +#: app/gui.c:83 msgid "Tempo" msgstr "Tempo" -#: app/gui.c:211 +#: app/gui.c:217 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -268,67 +351,59 @@ "Sei sicuro di volerti liberare dell'attuale progetto?\n" "Tutti i cambiamenti andranno persi!" -#: app/gui.c:225 +#: app/gui.c:231 app/gui.c:245 msgid "Are you sure you want to overwrite the file?" msgstr "Sei sicuro di voler sovrascrivere il file?" -#: app/gui.c:1069 -msgid "Song length" -msgstr "Lunghezza del brano" - -#: app/gui.c:1070 -msgid "Current pos" -msgstr "Posizione attuale" - -#: app/gui.c:1071 app/gui.c:1228 -msgid "Pattern" -msgstr "Pattern" - -#: app/gui.c:1072 -msgid "Restart pos" -msgstr "Ricomincia dalla posizione" - -#: app/gui.c:1140 +#: app/gui.c:1145 msgid "Load XM..." msgstr "Carica XM..." -#: app/gui.c:1142 +#: app/gui.c:1147 msgid "Save XM..." msgstr "Salva XM..." -#: app/gui.c:1181 +#: app/gui.c:1150 +msgid "Render module as WAV..." +msgstr "Riversa il modulo su file WAV..." + +#: app/gui.c:1202 msgid "Play Song" -msgstr "Suona il brano" +msgstr "Suona brano" -#: app/gui.c:1187 +#: app/gui.c:1208 msgid "Play Pattern" -msgstr "Suona il Pattern" +msgstr "Suona Pattern" -#: app/gui.c:1193 +#: app/gui.c:1214 msgid "Stop" msgstr "Stop" -#: app/gui.c:1212 +#: app/gui.c:1233 msgid "Number of Channels:" msgstr "Numero di Canali:" -#: app/gui.c:1244 +#: app/gui.c:1249 app/playlist.c:294 +msgid "Pattern" +msgstr "Pattern" + +#: app/gui.c:1265 msgid "PatLength" -msgstr "Lunghezza del Pattern" +msgstr "Lunghezza Pattern" -#: app/gui.c:1336 +#: app/gui.c:1357 msgid "Octave" msgstr "Ottava" -#: app/gui.c:1344 +#: app/gui.c:1365 msgid "Jump" msgstr "Passo" -#: app/gui.c:1352 +#: app/gui.c:1373 msgid "Instr" msgstr "Strumento" -#: app/gui.c:1367 +#: app/gui.c:1388 msgid "Sample" msgstr "Campione" @@ -348,67 +423,63 @@ msgid "VibSweep" msgstr "Sweep del vibrato" -#: app/instrument-editor.c:154 +#: app/instrument-editor.c:154 app/instrument-editor.c:175 msgid "Can't open file." msgstr "Impossibile aprire il file." -#: app/instrument-editor.c:174 -msgid "Saving Instruments not yet supported." -msgstr "Il salvataggio degli Strumenti non è ancora supportato." - -#: app/instrument-editor.c:182 +#: app/instrument-editor.c:212 msgid "Sine" msgstr "Sinusoidale" -#: app/instrument-editor.c:182 +#: app/instrument-editor.c:212 msgid "Square" msgstr "Quadro" -#: app/instrument-editor.c:182 +#: app/instrument-editor.c:212 msgid "Saw Down" msgstr "Sega giù" -#: app/instrument-editor.c:182 +#: app/instrument-editor.c:212 msgid "Saw Up" msgstr "Sega su" -#: app/instrument-editor.c:186 +#: app/instrument-editor.c:216 msgid "Instrument Editor" msgstr "Editor dello strumento" -#: app/instrument-editor.c:195 +#: app/instrument-editor.c:225 msgid "Volume envelope" msgstr "Inviluppo del volume" -#: app/instrument-editor.c:203 +#: app/instrument-editor.c:233 msgid "Panning envelope" msgstr "Inviluppo del panning" -#: app/instrument-editor.c:220 -msgid "Load Instrument.." -msgstr "Carica lo strumento.." - -#: app/instrument-editor.c:222 -msgid "Save Instrument.." -msgstr "Salva lo strumento.." +#: app/instrument-editor.c:250 +msgid "Load Instrument..." +msgstr "Carica lo strumento..." + +#: app/instrument-editor.c:252 +msgid "Save Instrument..." +msgstr "Salva lo strumento..." -#: app/instrument-editor.c:224 +#: app/instrument-editor.c:254 msgid "Load XI" msgstr "Carica XI" -#: app/instrument-editor.c:230 +#: app/instrument-editor.c:260 msgid "Save XI" msgstr "Salva XI" -#: app/instrument-editor.c:250 +#: app/instrument-editor.c:279 msgid "Vibrato Type:" msgstr "Tipo di vibrato:" -#: app/instrument-editor.c:322 +#: app/instrument-editor.c:351 msgid "Note:" msgstr "Nota:" -#: app/instrument-editor.c:340 +#: app/instrument-editor.c:369 msgid "Initialize" msgstr "Inizializza" @@ -417,11 +488,11 @@ msgstr "" "Il tasto che inserisce il rilascio della nota per i moduli di FastTracker." -#: app/keys.c:135 -msgid "Upper Octave Keys.." -msgstr "Tasti dell'Ottava più alta.." - #: app/keys.c:136 +msgid "Upper Octave Keys..." +msgstr "Tasti dell'Ottava più alta..." + +#: app/keys.c:137 msgid "" "These are the keys on the upper half of the keyboard. The c key is normally " "the key to the right of the TAB key. The rest of the keys should be ordered " @@ -432,11 +503,11 @@ "ordinato come la tastiera del pianoforte, compresa la riga coi numeri, " "quella sopra." -#: app/keys.c:142 -msgid "Lower Octave Keys.." -msgstr "Tasti dell'Ottava più Bassa.." - #: app/keys.c:143 +msgid "Lower Octave Keys..." +msgstr "Tasti dell'Ottava più Bassa..." + +#: app/keys.c:144 msgid "" "These are the keys on the lower half of the keyboard. The c key is normally " "the first character key to the right of the left Shift key. The rest of the " @@ -447,47 +518,47 @@ "tasti dovrebbe essere ordinato come la tastiera del pianoforte, compresa la " "riga sopra." -#: app/keys.c:149 -msgid "Other Keys.." -msgstr "Altri Tasti.." - #: app/keys.c:150 +msgid "Other Keys..." +msgstr "Altri Tasti..." + +#: app/keys.c:151 msgid "Various other keys" msgstr "Altri tasti vari" -#: app/keys.c:433 +#: app/keys.c:504 msgid "Function" msgstr "Funzione" -#: app/keys.c:434 +#: app/keys.c:505 msgid "Assignment" msgstr "Assegnazione" -#: app/keys.c:443 app/keys.c:446 +#: app/keys.c:514 app/keys.c:517 msgid "Keyboard Configuration" msgstr "Configurazione della Tastiera" -#: app/keys.c:491 +#: app/keys.c:566 msgid "Key Group Explanation" msgstr "Spiegazione del Gruppo di Tasti" -#: app/keys.c:508 +#: app/keys.c:583 msgid "Key Explanation" msgstr "Spiegazione del Tasto" -#: app/keys.c:539 +#: app/keys.c:614 msgid "Modifiers:" msgstr "Modificatori:" -#: app/keys.c:565 +#: app/keys.c:640 msgid "Learn selected key" msgstr "Memorizza il tasto selezionato" -#: app/keys.c:571 +#: app/keys.c:646 msgid "Learn all keys" msgstr "Memorizza tutti i tasti" -#: app/keys.c:577 +#: app/keys.c:652 msgid "" "Please press the desired key combination!\n" "Click into left list to cancel" @@ -495,7 +566,15 @@ "Per favore premi la combinazione di tasti desiderata!\n" "Clicca sull'elenco a sinistra per annullare" -#: app/keys.c:635 +#: app/keys.c:682 app/menubar.c:94 +msgid "Ok" +msgstr "Ok" + +#: app/keys.c:692 +msgid "Apply" +msgstr "Applica" + +#: app/keys.c:760 msgid "" "The keyboard configuration file is defective.\n" "Please use the Keyboard Configuration dialog." @@ -503,7 +582,7 @@ "Il file di configurazione della tastiera è difettoso.\n" "Per favore usa la finestra di dialogo Configurazione della Tastiera." -#: app/keys.c:845 +#: app/keys.c:1010 msgid "" "Automatic key configuration unsuccessful.\n" "Please use the Keyboard Configuration dialog\n" @@ -513,11 +592,7 @@ "Per favore usa Configurazione della Tastiera\n" "nel menu Impostazioni." -#: app/menubar.c:98 -msgid "Ok" -msgstr "Ok" - -#: app/menubar.c:134 +#: app/menubar.c:130 msgid "" "Are you sure you want to do this?\n" "All changes will be lost!" @@ -525,7 +600,7 @@ "Sei sicuro di volerlo fare?\n" "Tutti i cambiamenti andranno persi!" -#: app/menubar.c:156 +#: app/menubar.c:152 msgid "" "Are you sure you want to quit?\n" "All changes will be lost!" @@ -533,393 +608,397 @@ "Sei sicuro di voler abbandonare?\n" "Tutti i cambiamenti andranno persi!" -#: app/menubar.c:227 +#: app/menubar.c:223 msgid "_Open..." msgstr "_Apri..." -#: app/menubar.c:229 +#: app/menubar.c:225 msgid "Save _as..." msgstr "Salva _come..." -#: app/menubar.c:234 +#: app/menubar.c:231 +msgid "Save Module as _WAV..." +msgstr "Salva il Modulo come _WAV..." + +#: app/menubar.c:236 msgid "_Quit" msgstr "_Esci" -#: app/menubar.c:241 +#: app/menubar.c:243 msgid "Clear _All" msgstr "Cancella _Tutto" -#: app/menubar.c:243 +#: app/menubar.c:245 msgid "Clear _Patterns Only" msgstr "Cancella solamente i _Pattern" -#: app/menubar.c:245 +#: app/menubar.c:247 msgid "_Optimize Module" msgstr "_Ottimizza il Modulo" -#: app/menubar.c:252 app/menubar.c:263 app/menubar.c:281 +#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 msgid "C_ut" msgstr "_Taglia" -#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 +#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 msgid "_Copy" msgstr "_Copia" -#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 +#: app/menubar.c:258 app/menubar.c:269 app/menubar.c:287 msgid "_Paste" msgstr "_Incolla" -#: app/menubar.c:269 +#: app/menubar.c:271 msgid "_Insert" msgstr "I_nserisce" -#: app/menubar.c:271 +#: app/menubar.c:273 msgid "_Delete" msgstr "C_ancella" -#: app/menubar.c:279 +#: app/menubar.c:281 msgid "_Mark" msgstr "_Marca" -#: app/menubar.c:292 +#: app/menubar.c:294 msgid "_Jazz Edit Mode" msgstr "Modalità _Jazz Edit" -#: app/menubar.c:297 +#: app/menubar.c:299 msgid "Transp_osition..." msgstr "Trasp_osizione..." -#: app/menubar.c:302 app/menubar.c:380 +#: app/menubar.c:304 app/menubar.c:387 msgid "_Pattern" msgstr "_Pattern" -#: app/menubar.c:303 +#: app/menubar.c:305 msgid "_Track" msgstr "T_raccia" -#: app/menubar.c:304 +#: app/menubar.c:306 msgid "_Selection" msgstr "_Selezione" -#: app/menubar.c:310 +#: app/menubar.c:312 msgid "_Find Unused Pattern" msgstr "_Trova i Pattern non usati" -#: app/menubar.c:312 +#: app/menubar.c:314 msgid "_Copy Current to Unused Pattern" msgstr "_Copia l'attuale in un Pattern non usato" -#: app/menubar.c:314 +#: app/menubar.c:316 msgid "C_lear Unused Patterns" msgstr "Cance_lla i Pattern non usati" -#: app/menubar.c:316 +#: app/menubar.c:318 msgid "_Pack Patterns" msgstr "Com_primi i Pattern" -#: app/menubar.c:323 +#: app/menubar.c:325 msgid "_Load XI..." msgstr "_Carica XI..." -#: app/menubar.c:328 +#: app/menubar.c:327 +msgid "_Save XI..." +msgstr "_Salva XI..." + +#: app/menubar.c:332 +msgid "_Clear Current" +msgstr "_Cancella l'Attuale" + +#: app/menubar.c:337 msgid "_Delete Unused Instruments" msgstr "_Elimina gli Strumenti non usati" -#: app/menubar.c:336 +#: app/menubar.c:345 msgid "Display _Oscilloscopes" msgstr "Mostra gli _Oscilloscopi" -#: app/menubar.c:338 +#: app/menubar.c:347 msgid "Use _Backing Store" msgstr "Usa il _Backing Store" -#: app/menubar.c:343 +#: app/menubar.c:352 msgid "_Keyboard Configuration..." msgstr "_Configurazione della Tastiera..." -#: app/menubar.c:345 +#: app/menubar.c:354 msgid "_Audio Configuration..." msgstr "Configurazione dell'_Audio..." -#: app/menubar.c:347 -msgid "_Playback Effects..." -msgstr "Effetti di _Playback..." - -#: app/menubar.c:349 +#: app/menubar.c:356 msgid "_GUI Configuration..." msgstr "Configurazione della _GUI..." -#: app/menubar.c:354 +#: app/menubar.c:361 msgid "_Save Settings now" msgstr "_Salva le Impostazioni ora" -#: app/menubar.c:356 +#: app/menubar.c:363 msgid "Save Settings on _Exit" msgstr "Salva le Impostazioni all'_Uscita" -#: app/menubar.c:363 +#: app/menubar.c:370 msgid "_About..." msgstr "_Informazioni su..." -#: app/menubar.c:368 +#: app/menubar.c:375 msgid "Show _Tips..." msgstr "Mostra i suggerimen_ti..." -#: app/menubar.c:370 +#: app/menubar.c:377 msgid "_XM Effects..." msgstr "Effetti _XM..." -#: app/menubar.c:377 +#: app/menubar.c:384 msgid "_File" msgstr "_File" -#: app/menubar.c:378 +#: app/menubar.c:385 msgid "_Module" msgstr "_Modulo" -#: app/menubar.c:379 +#: app/menubar.c:386 msgid "_Edit" msgstr "_Edit" -#: app/menubar.c:381 +#: app/menubar.c:388 msgid "_Instrument" msgstr "_Strumento" -#: app/menubar.c:382 +#: app/menubar.c:389 msgid "_Settings" msgstr "_Impostazioni" -#: app/menubar.c:383 +#: app/menubar.c:390 msgid "_Help" msgstr "_Aiuto" -#: app/menubar.c:411 +#: app/menubar.c:420 msgid "/_File" msgstr "/_File" -#: app/menubar.c:412 +#: app/menubar.c:421 msgid "/File/_Open..." msgstr "/File/_Apri..." -#: app/menubar.c:413 +#: app/menubar.c:422 msgid "/File/Save _as..." msgstr "/File/Salva _come..." -#: app/menubar.c:414 +#: app/menubar.c:423 app/menubar.c:425 msgid "/File/-" msgstr "/File/-" -#: app/menubar.c:415 +#: app/menubar.c:424 +msgid "/File/Save Module as _WAV..." +msgstr "/File/Salva il Modulo come _WAV..." + +#: app/menubar.c:426 msgid "/File/_Quit" msgstr "/File/_Esci" -#: app/menubar.c:416 +#: app/menubar.c:427 msgid "/_Module" msgstr "/_Modulo" -#: app/menubar.c:417 +#: app/menubar.c:428 msgid "/Module/Clear _All" msgstr "/Modulo/Cancella _Tutto" -#: app/menubar.c:418 +#: app/menubar.c:429 msgid "/Module/Clear _Patterns Only" msgstr "/Modulo/Cancella Solamente i _Pattern" -#: app/menubar.c:419 +#: app/menubar.c:430 msgid "/Module/_Optimize Module" msgstr "/Modulo/_Ottimizza il Modulo" -#: app/menubar.c:420 +#: app/menubar.c:431 msgid "/_Edit" msgstr "/_Edit" -#: app/menubar.c:421 +#: app/menubar.c:432 msgid "/Edit/_Jazz Edit Mode" msgstr "/Edit/Modalità _Jazz Edit" -#: app/menubar.c:422 app/menubar.c:424 +#: app/menubar.c:433 app/menubar.c:435 msgid "/Edit/-" msgstr "/Edit/-" -#: app/menubar.c:423 +#: app/menubar.c:434 msgid "/Edit/_Transposition..." msgstr "/Edit/Tr_asposizione..." -#: app/menubar.c:425 +#: app/menubar.c:436 msgid "/Edit/_Pattern" msgstr "/Edit/_Pattern" -#: app/menubar.c:426 +#: app/menubar.c:437 msgid "/Edit/Pattern/C_ut" msgstr "/Edit/Pattern/_Taglia" -#: app/menubar.c:427 +#: app/menubar.c:438 msgid "/Edit/Pattern/_Copy" msgstr "/Edit/Pattern/_Copia" -#: app/menubar.c:428 +#: app/menubar.c:439 msgid "/Edit/Pattern/_Paste" msgstr "/Edit/Pattern/_Incolla" -#: app/menubar.c:429 +#: app/menubar.c:440 msgid "/Edit/_Track" msgstr "/Edit/T_raccia" -#: app/menubar.c:430 +#: app/menubar.c:441 msgid "/Edit/Track/C_ut" msgstr "/Edit/Traccia/_Taglia" -#: app/menubar.c:431 +#: app/menubar.c:442 msgid "/Edit/Track/_Copy" msgstr "/Edit/Traccia/_Copia" -#: app/menubar.c:432 +#: app/menubar.c:443 msgid "/Edit/Track/_Paste" msgstr "/Edit/Traccia/_Incolla" -#: app/menubar.c:433 +#: app/menubar.c:444 msgid "/Edit/Track/_Insert" msgstr "/Edit/Traccia/I_nserisce" -#: app/menubar.c:434 +#: app/menubar.c:445 msgid "/Edit/Track/_Delete" msgstr "/Edit/Traccia/Ca_ncella" -#: app/menubar.c:435 +#: app/menubar.c:446 msgid "/Edit/_Selection" msgstr "/Edit/_Selezione" -#: app/menubar.c:436 +#: app/menubar.c:447 msgid "/Edit/Selection/_Mark" msgstr "/Edit/Selezione/_Marca" -#: app/menubar.c:437 +#: app/menubar.c:448 msgid "/Edit/Selection/C_ut" msgstr "/Edit/Selezione/_Taglia" -#: app/menubar.c:438 +#: app/menubar.c:449 msgid "/Edit/Selection/_Copy" msgstr "/Edit/Selezione/_Copia" -#: app/menubar.c:439 +#: app/menubar.c:450 msgid "/Edit/Selection/_Paste" msgstr "/Edit/Selezione/_Incolla" -#: app/menubar.c:440 +#: app/menubar.c:451 msgid "/_Pattern" msgstr "/_Pattern" -#: app/menubar.c:441 +#: app/menubar.c:452 msgid "/Pattern/_Find Unused Pattern" msgstr "/Pattern/_Trova i Pattern non usati" -#: app/menubar.c:442 +#: app/menubar.c:453 msgid "/Pattern/_Copy Current to Unused Pattern" msgstr "/Pattern/_Copia l'attuale in un Pattern non usato" -#: app/menubar.c:443 +#: app/menubar.c:454 msgid "/Pattern/C_lear Unused Patterns" msgstr "/Pattern/Cance_lla i Pattern non usati" -#: app/menubar.c:444 +#: app/menubar.c:455 msgid "/Pattern/_Pack Patterns" msgstr "/Pattern/Com_primi i Pattern" -#: app/menubar.c:445 +#: app/menubar.c:456 msgid "/_Instrument" msgstr "/_Strumento" -#: app/menubar.c:446 +#: app/menubar.c:457 msgid "/Instrument/_Load XI..." msgstr "/Strumento/_Carica XI..." -#: app/menubar.c:447 +#: app/menubar.c:458 +msgid "/Instrument/_Save XI..." +msgstr "/Strumento/_Carica XI..." + +#: app/menubar.c:459 app/menubar.c:461 msgid "/Instrument/-" msgstr "/Strumento/-" -#: app/menubar.c:448 +#: app/menubar.c:460 +msgid "/Instrument/_Clear Current" +msgstr "/Strumento/_Cancella l'attuale" + +#: app/menubar.c:462 msgid "/Instrument/_Delete Unused Instruments" msgstr "/Strumento/_Elimina gli Strumenti non usati" -#: app/menubar.c:449 +#: app/menubar.c:463 msgid "/_Settings" msgstr "/_Impostazioni" -#: app/menubar.c:450 +#: app/menubar.c:464 msgid "/Settings/Display _Oscilloscopes" msgstr "/Impostazioni/Mostra gli _Oscilloscopi" -#: app/menubar.c:451 +#: app/menubar.c:465 msgid "/Settings/Use _Backing Store" msgstr "/Impostazioni/Usa il _Backing Store" -#: app/menubar.c:452 app/menubar.c:457 +#: app/menubar.c:466 app/menubar.c:470 msgid "/Settings/-" msgstr "/Impostazioni/-" -#: app/menubar.c:453 +#: app/menubar.c:467 msgid "/Settings/_Keyboard Configuration..." msgstr "/Impostazioni/_Configurazione della Tastiera..." -#: app/menubar.c:454 +#: app/menubar.c:468 msgid "/Settings/_Audio Configuration..." msgstr "/Impostazioni/Configurazione dell'_Audio..." -#: app/menubar.c:455 -msgid "/Settings/_Playback Effects..." -msgstr "/Impostazioni/Effetti di _Playback..." - -#: app/menubar.c:456 +#: app/menubar.c:469 msgid "/Settings/_GUI Configuration..." msgstr "Impostazioni/Configurazione della _GUI..." -#: app/menubar.c:458 +#: app/menubar.c:471 msgid "/Settings/_Save Settings now" msgstr "/Impostazioni/_Salva le Impostazioni ora" -#: app/menubar.c:459 +#: app/menubar.c:472 msgid "/Settings/Save Settings on _Exit" msgstr "/Impostazioni/Salva le Impostazioni all'_Uscita" -#: app/menubar.c:460 +#: app/menubar.c:473 msgid "/_Help" msgstr "/_Aiuto" -#: app/menubar.c:461 +#: app/menubar.c:474 msgid "/Help/_About..." msgstr "/Aiuto/_Informazioni su..." -#: app/menubar.c:462 +#: app/menubar.c:475 msgid "/Help/-" msgstr "/Aiuto/-" -#: app/menubar.c:463 +#: app/menubar.c:476 msgid "/Help/Show _Tips..." msgstr "/Aiuto/Mostra i suggerimen_ti..." -#: app/menubar.c:464 +#: app/menubar.c:477 msgid "/Help/_XM Effects..." msgstr "/Aiuto/Effetti _XM..." -#: app/menubar.c:478 -msgid "/Settings/Display Oscilloscopes" -msgstr "/Impostazioni/Mostra gli Oscilloscopi" - -#: app/menubar.c:480 -msgid "/Settings/Use Backing Store" -msgstr "/Impostazioni/Usa il Backing Store" - -#: app/menubar.c:482 -msgid "/Settings/Save Settings on Exit" -msgstr "/Impostazioni/Salva le Impostazioni all'Uscita" - #: app/module-info.c:116 msgid "Instrument Name" msgstr "Nome dello Strumento" #: app/module-info.c:116 msgid "#smpl" -msgstr "#campione" +msgstr "#smpl" #: app/module-info.c:117 msgid "Sample Name" @@ -929,7 +1008,7 @@ msgid "Linear" msgstr "Lineare" -#: app/module-info.c:118 app/sample-editor.c:167 +#: app/module-info.c:118 app/sample-editor.c:185 msgid "Amiga" msgstr "Amiga" @@ -949,6 +1028,18 @@ msgid "ProTracker Mode" msgstr "Modalità ProTracker" +#: app/playlist.c:292 +msgid "Song length" +msgstr "Lunghezza brano" + +#: app/playlist.c:293 +msgid "Current pos" +msgstr "Attuale posizione" + +#: app/playlist.c:295 +msgid "Restart pos" +msgstr "Ricomincia da" + #: app/preferences.c:58 msgid "" "A directory called '.soundtracker' has been created in your\n" @@ -957,201 +1048,224 @@ "Una directory chiamata '.soundtracker' è stata creata nella tua\n" "home directory per immagazzinare i file di configurazione.\n" -#: app/sample-editor.c:166 +#: app/sample-editor.c:184 msgid "No loop" msgstr "Nessun ciclo" -#: app/sample-editor.c:168 +#: app/sample-editor.c:186 msgid "PingPong" msgstr "Ping Pong" -#: app/sample-editor.c:172 +#: app/sample-editor.c:190 msgid "8 bits" msgstr "8 bit" -#: app/sample-editor.c:173 +#: app/sample-editor.c:191 msgid "16 bits" msgstr "16 bit" -#: app/sample-editor.c:179 +#: app/sample-editor.c:197 msgid "Sample Editor" msgstr "Editor del Campione" -#: app/sample-editor.c:219 +#: app/sample-editor.c:237 msgid "Volume" msgstr "Volume" -#: app/sample-editor.c:220 +#: app/sample-editor.c:238 msgid "Panning" msgstr "Panning" -#: app/sample-editor.c:221 +#: app/sample-editor.c:239 msgid "Finetune" msgstr "Regolazione fine" -#: app/sample-editor.c:232 -msgid "SelStart" -msgstr "Inizio Selezione" - -#: app/sample-editor.c:233 -msgid "SelEnd" -msgstr "Fine Selezione" - -#: app/sample-editor.c:236 -msgid "Reset Sel" -msgstr "Reimposta la Selezione" +#: app/sample-editor.c:259 +msgid "Selection:" +msgstr "Selezione:" -#: app/sample-editor.c:241 +#: app/sample-editor.c:263 +msgid "None" +msgstr "Niente" + +#: app/sample-editor.c:269 +msgid "All" +msgstr "Tutto" + +#: app/sample-editor.c:290 +msgid "Length:" +msgstr "Lunghezza:" + +#: app/sample-editor.c:306 msgid "RelNote" msgstr "Nota relativa" -#: app/sample-editor.c:242 -msgid "Length: 0" -msgstr "Lunghezza: 0" - -#: app/sample-editor.c:255 -msgid "Load Sample.." -msgstr "Carica il Campione.." - -#: app/sample-editor.c:256 -msgid "Save WAV.." -msgstr "Salva WAV.." - -#: app/sample-editor.c:259 -msgid "Load Sample" -msgstr "Carica il Campione" +#: app/sample-editor.c:317 +msgid "Load Sample..." +msgstr "Carica il Campione..." + +#: app/sample-editor.c:319 +msgid "Save WAV..." +msgstr "Salva WAV..." + +#: app/sample-editor.c:321 +msgid "Save region as WAV..." +msgstr "Salva la regione come WAV..." -#: app/sample-editor.c:268 +#: app/sample-editor.c:334 msgid "Save WAV" msgstr "Salva WAV" -#: app/sample-editor.c:278 -msgid "Clear" -msgstr "Cancella" +#: app/sample-editor.c:344 +msgid "Save Region" +msgstr "Salva la regione" -#: app/sample-editor.c:284 +#: app/sample-editor.c:355 msgid "Monitor" msgstr "Monitor" -#: app/sample-editor.c:290 +#: app/sample-editor.c:361 msgid "Volume Ramp" msgstr "Rampa di Volume" -#: app/sample-editor.c:300 +#: app/sample-editor.c:371 msgid "Zoom to selection" msgstr "Zoom sulla selezione" -#: app/sample-editor.c:306 +#: app/sample-editor.c:377 msgid "Show all" msgstr "Mostra tutto" -#: app/sample-editor.c:312 +#: app/sample-editor.c:383 msgid "Zoom in (+50%)" msgstr "Zoom avanti (+50%)" -#: app/sample-editor.c:318 +#: app/sample-editor.c:389 msgid "Zoom out (-50%)" msgstr "Zoom indietro (-50%)" -#: app/sample-editor.c:324 -msgid "Resample" -msgstr "Ricampiona" +#: app/sample-editor.c:395 +msgid "Reverse" +msgstr "Riversa" -#: app/sample-editor.c:335 +#: app/sample-editor.c:405 msgid "Cut" msgstr "Taglia" -#: app/sample-editor.c:341 +#: app/sample-editor.c:411 msgid "Remove" msgstr "Rimuove" -#: app/sample-editor.c:347 +#: app/sample-editor.c:417 msgid "Copy" msgstr "Copia" -#: app/sample-editor.c:353 +#: app/sample-editor.c:423 msgid "Paste" msgstr "Incolla" -#: app/sample-editor.c:359 -msgid "Filter" -msgstr "Filtro" +#: app/sample-editor.c:429 +msgid "Clear Sample" +msgstr "Cancella campione" + +#: app/sample-editor.c:467 +msgid "(no selection)" +msgstr "(nessuna selezione)" -#: app/sample-editor.c:459 -#, c-format -msgid "Length: %d" -msgstr "Lunghezza: %d" - -#: app/sample-editor.c:957 +#: app/sample-editor.c:1000 msgid "" msgstr "" -#: app/sample-editor.c:1034 +#: app/sample-editor.c:1076 +msgid "Read error." +msgstr "Errore di lettura." + +#: app/sample-editor.c:1181 +msgid "Load stereo sample" +msgstr "Carica il campione stereo" + +#: app/sample-editor.c:1189 +msgid "" +"You have selected a stereo sample!\n" +"(SoundTracker can only handle mono samples!)\n" +"\n" +"Please choose which channel to load:" +msgstr "" +"Hai selezionato un campione stereo!\n" +"(SoundTracker può solo gestire campioni mono!)\n" +"\n" +"Per favore scegli quale canale caricare:" + +#: app/sample-editor.c:1200 +msgid "Left" +msgstr "Sinistra" + +#: app/sample-editor.c:1206 +msgid "Mix" +msgstr "Mix" + +#: app/sample-editor.c:1212 +msgid "Right" +msgstr "Destra" + +#: app/sample-editor.c:1251 msgid "Can't read sample" msgstr "Impossibile leggere il campione" -#: app/sample-editor.c:1040 +#: app/sample-editor.c:1257 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "Il campione è troppo lungo per l'attuale mixer. Lo carico comunque." -#: app/sample-editor.c:1054 -msgid "Can only handle mono 8 and 16 bit samples" -msgstr "Può solo gestire campioni mono da 8 e 16 bit" - -#: app/sample-editor.c:1065 -msgid "Read error." -msgstr "Errore di lettura." +#: app/sample-editor.c:1271 +msgid "Can only handle 8 and 16 bit samples with up to 2 channels" +msgstr "Può solo gestire campioni da 8 e 16 bit fino a 2 canali" + +#: app/sample-editor.c:1370 +msgid "Nothing to save." +msgstr "Niente da salvare." -#: app/sample-editor.c:1120 -msgid "Can't open file for writing." -msgstr "Non posso aprire il file per la scrittura." - -#: app/sample-editor.c:1157 +#: app/sample-editor.c:1397 msgid "OK" msgstr "OK" -#: app/sample-editor.c:1165 +#: app/sample-editor.c:1405 msgid "Start sampling" msgstr "Inizia il campionamento" -#: app/sample-editor.c:1200 app/sample-editor.c:1203 +#: app/sample-editor.c:1440 app/sample-editor.c:1443 msgid "Sampling Window" msgstr "Finestra di Campionamento" -#: app/sample-editor.c:1303 +#: app/sample-editor.c:1543 msgid "" msgstr "" -#: app/sample-editor.c:1333 +#: app/sample-editor.c:1573 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" "Il campione registrato è troppo lungo per l'attuale mixer. Lo uso comunque." -#: app/sample-editor.c:1365 +#: app/sample-editor.c:1605 msgid "Normalize" msgstr "Normalizza" -#: app/sample-editor.c:1366 +#: app/sample-editor.c:1606 msgid "Execute" msgstr "Esegui" -#: app/sample-editor.c:1367 app/tips-dialog.c:165 -msgid "Close" -msgstr "Chiudi" - -#: app/sample-editor.c:1376 app/sample-editor.c:1379 +#: app/sample-editor.c:1616 app/sample-editor.c:1619 msgid "Volume Ramping" msgstr "Rampa di Volume" -#: app/sample-editor.c:1396 +#: app/sample-editor.c:1636 msgid "Perform linear volume fade on Selection" msgstr "Esegue una dissolvenza lineare del volume sulla Selezione" -#: app/sample-editor.c:1408 +#: app/sample-editor.c:1648 msgid "Left [%]:" msgstr "Sinistra [%]:" -#: app/sample-editor.c:1413 +#: app/sample-editor.c:1653 msgid "Right [%]:" msgstr "Destra [%]:" @@ -1219,128 +1333,128 @@ "il suo campione e poi cliccando sulla tastiera nella pagina dell'Editor\n" "di strumento." -#: app/track-editor.c:82 +#: app/track-editor.c:108 msgid "Jazz Edit:" msgstr "Jazz Edit:" -#: app/transposition.c:165 +#: app/track-editor.c:147 +msgid "Tracker" +msgstr "Tracker" + +#: app/transposition.c:166 msgid "Whole Song" msgstr "L'intero brano" -#: app/transposition.c:166 +#: app/transposition.c:167 msgid "All Patterns" msgstr "Tutti i Pattern" -#: app/transposition.c:167 +#: app/transposition.c:168 msgid "Current Pattern" msgstr "L'attuale Pattern" -#: app/transposition.c:168 +#: app/transposition.c:169 msgid "Current Track" msgstr "L'attuale Traccia" -#: app/transposition.c:172 +#: app/transposition.c:173 msgid "Current Instrument" msgstr "Lo Strumento attuale" -#: app/transposition.c:173 +#: app/transposition.c:174 msgid "All Instruments" msgstr "Tutti gli Strumenti" -#: app/transposition.c:177 +#: app/transposition.c:178 msgid "Half note up" msgstr "Un semitono su" -#: app/transposition.c:178 +#: app/transposition.c:179 msgid "Half note down" msgstr "Un semitono giù" -#: app/transposition.c:179 +#: app/transposition.c:180 msgid "Octave up" msgstr "Un'ottava su" -#: app/transposition.c:180 +#: app/transposition.c:181 msgid "Octave down" msgstr "Un'ottava giù" -#: app/transposition.c:183 +#: app/transposition.c:184 msgid "Exchange 1 <-> 2" msgstr "Scambia 1 <-> 2" -#: app/transposition.c:184 +#: app/transposition.c:185 msgid "Change 1 -> 2" msgstr "Cambia 1 -> 2" -#: app/transposition.c:193 app/transposition.c:196 +#: app/transposition.c:194 app/transposition.c:197 msgid "Transposition Tools" -msgstr "Atrezzi per la Trasposizione.." +msgstr "Strumenti per la Trasposizione" -#: app/transposition.c:216 +#: app/transposition.c:218 msgid "Scope of the operation:" msgstr "Zona d'influenza dell'operazione:" -#: app/transposition.c:223 +#: app/transposition.c:225 msgid "Note Transposition" msgstr "Trasposizione della Nota" -#: app/transposition.c:253 +#: app/transposition.c:255 msgid "Instrument Changing" msgstr "Cambiamento dello Strumento" -#: app/transposition.c:268 +#: app/transposition.c:270 msgid "Instrument 1:" msgstr "Strumento 1:" -#: app/transposition.c:270 app/transposition.c:280 +#: app/transposition.c:272 app/transposition.c:282 msgid "Current instrument" msgstr "Strumento attuale" -#: app/transposition.c:278 +#: app/transposition.c:280 msgid "Instrument 2:" msgstr "Strumento 2:" -#: app/xm.c:161 +#: app/xm.c:170 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "La lunghezza del pattern è fuori dall'intervallo: %d.\n" -#: app/xm.c:441 app/xm.c:510 +#: app/xm.c:455 app/xm.c:526 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "Tipo di vibrato %d non valido, uso il Seno.\n" -#: app/xm.c:472 +#: app/xm.c:486 msgid "File is no XI instrument." msgstr "Il file non è uno strumento XI." -#: app/xm.c:482 +#: app/xm.c:496 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "Versione XI 0x%x sconosciuta\n" -#: app/xm.c:702 -msgid "No FastTracker XM and no supported MOD format!" -msgstr "Non è un XM di FastTracker nè un formato MOD supportato!" - -#: app/xm.c:716 app/xm.c:816 +#: app/xm.c:787 app/xm.c:901 msgid "Error while loading patterns." msgstr "Errore durante il caricamento dei pattern." -#: app/xm.c:774 +#: app/xm.c:851 msgid "Can't open file" -msgstr "Non posso aprire il file" +msgstr "Impossibile aprire il file" -#: app/xm.c:788 +#: app/xm.c:865 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "La lunghezza dell'header è != 276. Forse il modulo appartiene a una versione " "di Soundtracker precedente alla 0.0.12? :-)\n" -#: app/xm.c:822 +#: app/xm.c:907 msgid "Error while loading instruments." msgstr "Errore durante il caricamento degli strumenti." -#: app/xm.c:833 +#: app/xm.c:918 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1349,3 +1463,6 @@ "Il modulo contiene campioni che sono troppo lunghi per l'attuale mixer.\n" "La lunghezza massima del campione è %d." +#: app/xm.c:1234 +msgid "No FastTracker XM and no supported MOD format!" +msgstr "Non è un XM di FastTracker nè un formato MOD supportato!" Binary files soundtracker-0.5.0/po/ja.gmo and soundtracker-0.5.1/po/ja.gmo differ diff -urN soundtracker-0.5.0/po/ja.po soundtracker-0.5.1/po/ja.po --- soundtracker-0.5.0/po/ja.po Fri Feb 11 15:16:14 2000 +++ soundtracker-0.5.1/po/ja.po Tue Mar 14 18:59:15 2000 @@ -1,4 +1,4 @@ -# ja.po(0.3.10-0) for SoundTracker +# ja.po(0.5.0-0) for SoundTracker # Copyright (C) 1998-2000 Michael Krause . # Translators: Atsushi Yamagata , 1999, 2000. # Yuuki NINOMIYA , 1999, 2000. @@ -7,33 +7,54 @@ msgid "" msgstr "" "Project-Id-Version: SoundTracker 0.3.10\n" -"POT-Creation-Date: 2000-01-22 15:32+0100\n" -"PO-Revision-Date: 2000-01-28 10:06+09:00\n" +"POT-Creation-Date: 2000-03-13 13:56+0100\n" +"PO-Revision-Date: 2000-03-14 10:36+09:00\n" "Last-Translator: Atsushi Yamagata \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8-bit\n" -#: app/audioconfig.c:55 +#: app/audioconfig.c:59 msgid "Playback Output" msgstr "ºÆÀ¸½ÐÎÏ" -#: app/audioconfig.c:61 +#: app/audioconfig.c:65 msgid "Editing Output" msgstr "ÊÔ½¸½ÐÎÏ" -#: app/audioconfig.c:67 +#: app/audioconfig.c:71 msgid "Sampling" msgstr "¥µ¥ó¥×¥ê¥ó¥°" -#: app/audioconfig.c:179 +#: app/audioconfig.c:222 msgid "Driver Module" msgstr "¥É¥é¥¤¥Ð¡¦¥â¥¸¥å¡¼¥ë" -#: app/audioconfig.c:187 app/audioconfig.c:190 +#: app/audioconfig.c:223 +msgid "Mixer Module" +msgstr "¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë" + +#: app/audioconfig.c:224 +msgid "Description" +msgstr "ÀâÌÀ" + +#: app/audioconfig.c:232 app/audioconfig.c:235 msgid "Audio Configuration" msgstr "¥ª¡¼¥Ç¥£¥ªÀßÄê" +#: app/audioconfig.c:250 +msgid "Drivers" +msgstr "¥É¥é¥¤¥Ð" + +#: app/audioconfig.c:287 +msgid "Mixers" +msgstr "¥ß¥­¥µ" + +#: app/audioconfig.c:320 app/gui-settings.c:319 app/sample-editor.c:1607 +#: app/tips-dialog.c:165 app/transposition.c:313 +msgid "Close" +msgstr "ÊĤ¸¤ë" + #: app/drivers/alsa-input.c:125 app/drivers/alsa-output.c:134 #, c-format msgid "(%d bytes)" @@ -130,7 +151,7 @@ msgid "no settings (yet), sorry!" msgstr "¤¹¤ß¤Þ¤»¤ó¡¢(¤Þ¤À)ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1364 +#: app/drivers/file-output.c:161 app/sample-editor.c:1312 msgid "Can't open file for writing." msgstr "½ñ¤­¹þ¤ß¤Î¤¿¤á¤Ë¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£" @@ -157,14 +178,6 @@ "¥µ¥¦¥ó¥É½ÐÎϤËÂФ·¤Æ/dev/dsp¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿:\n" "%s" -#: app/effectsconfig.c:56 -msgid "Master Reverb" -msgstr "¥Þ¥¹¥¿¡¦¥ê¥Ð¡¼¥Ö" - -#: app/effectsconfig.c:153 app/effectsconfig.c:156 -msgid "Playback Effects Configuration" -msgstr "ºÆÀ¸¸ú²ÌÀßÄê" - #: app/envelope-box.c:740 msgid "Length" msgstr "Ťµ" @@ -215,91 +228,95 @@ msgid "Loop" msgstr "¥ë¡¼¥×" -#: app/envelope-box.c:876 app/sample-editor.c:222 +#: app/envelope-box.c:876 app/sample-editor.c:225 msgid "Start" msgstr "³«»Ï" -#: app/envelope-box.c:877 app/sample-editor.c:223 +#: app/envelope-box.c:877 app/sample-editor.c:226 msgid "End" msgstr "½ªÎ»" -#: app/file-operations.c:145 +#: app/file-operations.c:150 msgid "Load Module" msgstr "¥â¥¸¥å¡¼¥ë¡¦¥í¡¼¥É" -#: app/file-operations.c:146 +#: app/file-operations.c:151 msgid "Save Module" msgstr "¥â¥¸¥å¡¼¥ëÊݸ" -#: app/file-operations.c:147 +#: app/file-operations.c:152 msgid "Render WAV" msgstr "WAV¥ì¥ó¥À" -#: app/file-operations.c:148 app/sample-editor.c:290 +#: app/file-operations.c:153 app/sample-editor.c:325 msgid "Load Sample" msgstr "¥µ¥ó¥×¥ë¡¦¥í¡¼¥É" -#: app/file-operations.c:149 +#: app/file-operations.c:154 msgid "Save Sample" msgstr "¥µ¥ó¥×¥ëÊݸ" -#: app/file-operations.c:150 +#: app/file-operations.c:155 msgid "Load Instrument" msgstr "³Ú´ï¥í¡¼¥É" -#: app/file-operations.c:151 +#: app/file-operations.c:156 msgid "Save Instrument" msgstr "³Ú´ïÊݸ" -#: app/file-operations.c:157 +#: app/file-operations.c:162 msgid "File" msgstr "¥Õ¥¡¥¤¥ë" -#: app/file-operations.c:208 +#: app/file-operations.c:213 msgid "Operation not supported." msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤Áàºî¤Ç¤¹¡£" -#: app/gui-settings.c:78 +#: app/gui-settings.c:86 msgid "Scopes Frequency" msgstr "¥¹¥³¡¼¥×¼þÇÈ¿ô" -#: app/gui-settings.c:81 +#: app/gui-settings.c:89 msgid "Tracker Frequency" msgstr "¥È¥é¥Ã¥«¡¼¼þÇÈ¿ô" -#: app/gui-settings.c:173 app/gui-settings.c:176 +#: app/gui-settings.c:188 app/gui-settings.c:191 msgid "GUI Configuration" msgstr "GUIÀßÄê" -#: app/gui-settings.c:201 +#: app/gui-settings.c:217 msgid "Use Hexadecimal Numbers" msgstr "16¿Ê¿ô¤ò»ÈÍÑ" -#: app/gui-settings.c:208 +#: app/gui-settings.c:224 msgid "Use upper case letters for hex numbers" msgstr "16¿Ê¿ô¤Ë¤ÏÂçʸ»ú¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤" -#: app/gui-settings.c:215 -msgid "Advance Cursor in FX Columns" -msgstr "FX¥«¥é¥à¤Ç¤Î¥¢¥É¥Ð¥ó¥¹¡¦¥«¡¼¥½¥ë" +#: app/gui-settings.c:231 +msgid "Advance cursor horizontally in effect columns" +msgstr "¥¨¥Õ¥§¥¯¥ÈÎó¤Ç¥«¡¼¥½¥ë¤ò¿Ê¤á¤ë" + +#: app/gui-settings.c:238 +msgid "Asynchronous Editing" +msgstr "ÈóƱ´üÊÔ½¸" -#: app/gui-settings.c:222 +#: app/gui-settings.c:245 msgid "Use anti-aliased envelope editor" msgstr "¥¢¥ó¥Á¡¦¥¨¥¤¥ê¥¢¥¹¡¦¥¨¥ó¥Ù¥í¡¼¥×¡¦¥¨¥Ç¥£¥¿»ÈÍÑ" -#: app/gui-settings.c:228 +#: app/gui-settings.c:251 msgid "You need to restart SoundTracker for this change to come into effect." msgstr "¤³¤ÎÊѹ¹¤òÈ¿±Ç¤¹¤ë¤Ë¤ÏSoundTracker¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" -#: app/gui-settings.c:237 +#: app/gui-settings.c:260 msgid "Scopes buffer size [MB]" msgstr "¥¹¥³¡¼¥×¡¦¥Ð¥Ã¥Õ¥¡¡¦¥µ¥¤¥º [MB]" -#: app/gui-settings.c:256 +#: app/gui-settings.c:279 msgid "Highlight rows:" msgstr "¥í¥¦¶¯Ä´:" -#: app/gui-settings.c:274 +#: app/gui-settings.c:297 msgid "`Save XM' saves all non-empty patterns" msgstr "`ÊݸXM'¤ÇÁ´¤Æ¤Î¶õ¤Ç¤Ê¤¤¥Ñ¥¿¡¼¥ó¤òÊݸ" @@ -307,7 +324,8 @@ msgid "Question" msgstr "¼ÁÌä" -#: app/gui-subs.c:447 app/sample-editor.c:1277 app/sample-editor.c:1457 +#: app/gui-subs.c:447 app/keys.c:702 app/sample-editor.c:1225 +#: app/sample-editor.c:1412 msgid "Cancel" msgstr "¼è¾Ã" @@ -323,7 +341,7 @@ msgid "Tempo" msgstr "¥Æ¥ó¥Ý" -#: app/gui.c:214 +#: app/gui.c:217 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -331,59 +349,59 @@ "¥«¥ì¥ó¥È¡¦¥×¥í¥¸¥§¥¯¥È¤ò²òÊü¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?\n" "Á´¤Æ¤ÎÊѹ¹¤¬¼º¤ï¤ì¤Þ¤¹!" -#: app/gui.c:228 app/gui.c:242 +#: app/gui.c:231 app/gui.c:245 msgid "Are you sure you want to overwrite the file?" msgstr "¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?" -#: app/gui.c:1119 +#: app/gui.c:1145 msgid "Load XM..." msgstr "XM¥í¡¼¥É..." -#: app/gui.c:1121 +#: app/gui.c:1147 msgid "Save XM..." msgstr "XMÊݸ..." -#: app/gui.c:1124 +#: app/gui.c:1150 msgid "Render module as WAV..." msgstr "WAV¤È¤·¤Æ¥â¥¸¥å¡¼¥ë¤ò¥ì¥ó¥À¥ê¥ó¥°¤¹¤ë..." -#: app/gui.c:1176 +#: app/gui.c:1202 msgid "Play Song" msgstr "¶ÊºÆÀ¸" -#: app/gui.c:1182 +#: app/gui.c:1208 msgid "Play Pattern" msgstr "¥Ñ¥¿¡¼¥óºÆÀ¸" -#: app/gui.c:1188 +#: app/gui.c:1214 msgid "Stop" msgstr "Ää»ß" -#: app/gui.c:1207 +#: app/gui.c:1233 msgid "Number of Channels:" msgstr "¥Á¥ã¥ó¥Í¥ë¿ô:" -#: app/gui.c:1223 app/playlist.c:294 +#: app/gui.c:1249 app/playlist.c:294 msgid "Pattern" msgstr "¥Ñ¥¿¡¼¥ó" -#: app/gui.c:1239 +#: app/gui.c:1265 msgid "PatLength" msgstr "¥Ñ¥¿¡¼¥óĹ" -#: app/gui.c:1331 +#: app/gui.c:1357 msgid "Octave" msgstr "¥ª¥¯¥¿¡¼¥Ö" -#: app/gui.c:1339 +#: app/gui.c:1365 msgid "Jump" msgstr "¥¸¥ã¥ó¥×" -#: app/gui.c:1347 +#: app/gui.c:1373 msgid "Instr" msgstr "³Ú´ï" -#: app/gui.c:1362 +#: app/gui.c:1388 msgid "Sample" msgstr "¥µ¥ó¥×¥ë" @@ -467,11 +485,11 @@ msgid "The key that inserts the special keyoff note for FastTracker modules." msgstr "ÁÞÆþ¤µ¤ì¤¿¥­¡¼¤ÏFastTracker¥â¥¸¥å¡¼¥ë¤Ë´Ø¤¹¤ëÆÃÊ̤ʥ­¡¼¥ª¥Õ²»Éä¤Ç¤¹¡£" -#: app/keys.c:135 +#: app/keys.c:136 msgid "Upper Octave Keys..." msgstr "¥ª¥¯¥¿¡¼¥Ö¾å¤Î¥­¡¼..." -#: app/keys.c:136 +#: app/keys.c:137 msgid "" "These are the keys on the upper half of the keyboard. The c key is normally " "the key to the right of the TAB key. The rest of the keys should be ordered " @@ -480,11 +498,11 @@ "¸°ÈפξåȾʬ¤Ë¥­¡¼¤¬¤¢¤ê¤Þ¤¹¡£¥­¡¼c¤ÏÉáÄÌTAB¥­¡¼¤Î±¦¤Î¥­¡¼¤Ç¤¹¡£»Ä¤ê¤Î\n" "¥­¡¼¤Ï¡¢¾åÉô¤Î¿ô»ú¥­¡¼¤Î¹Ô¤ò´Þ¤ó¤Ç¡¢¥Ô¥¢¥Î¤Î¸°ÈפΤ褦¤Ëʤó¤Ç¤¤¤Þ¤¹¡£" -#: app/keys.c:142 +#: app/keys.c:143 msgid "Lower Octave Keys..." msgstr "¥ª¥¯¥¿¡¼¥Ö²¼¤Î¥­¡¼..." -#: app/keys.c:143 +#: app/keys.c:144 msgid "" "These are the keys on the lower half of the keyboard. The c key is normally " "the first character key to the right of the left Shift key. The rest of the " @@ -493,47 +511,47 @@ "¸°Èפβ¼È¾Ê¬¤Ë¥­¡¼¤¬¤¢¤ê¤Þ¤¹¡£¥­¡¼c¤ÏÉáÄ̺¸Shift¥­¡¼¤Î±¦¤ÎºÇ½é¤Îʸ»ú¥­¡¼\n" "¤Ç¤¹¡£»Ä¤ê¤Î¥­¡¼¤Ï¡¢¾åÉô¤Î¹Ô¤ò´Þ¤ó¤Ç¡¢¥Ô¥¢¥Î¤Î¸°ÈפΤ褦¤Ëʤó¤Ç¤¤¤Þ¤¹¡£" -#: app/keys.c:149 +#: app/keys.c:150 msgid "Other Keys..." msgstr "¾¤Î¥­¡¼..." -#: app/keys.c:150 +#: app/keys.c:151 msgid "Various other keys" msgstr "¾¤Î³Æ¼ï¥­¡¼" -#: app/keys.c:437 +#: app/keys.c:504 msgid "Function" msgstr "µ¡Ç½" -#: app/keys.c:438 +#: app/keys.c:505 msgid "Assignment" msgstr "³äÅö" -#: app/keys.c:447 app/keys.c:450 +#: app/keys.c:514 app/keys.c:517 msgid "Keyboard Configuration" msgstr "¥­¡¼¥Ü¡¼¥ÉÀßÄê" -#: app/keys.c:495 +#: app/keys.c:566 msgid "Key Group Explanation" msgstr "¥­¡¼¡¦¥°¥ë¡¼¥×ÀâÌÀ" -#: app/keys.c:512 +#: app/keys.c:583 msgid "Key Explanation" msgstr "¥­¡¼ÀâÌÀ" -#: app/keys.c:543 +#: app/keys.c:614 msgid "Modifiers:" msgstr "¥â¥Ç¥£¥Õ¥¡¥¤¥¢" -#: app/keys.c:569 +#: app/keys.c:640 msgid "Learn selected key" msgstr "ÁªÂò¤µ¤ì¤¿¥­¡¼¤ò³Ð¤¨¤ë" -#: app/keys.c:575 +#: app/keys.c:646 msgid "Learn all keys" msgstr "Á´¤Æ¤Î¥­¡¼¤ò³Ð¤¨¤ë" -#: app/keys.c:581 +#: app/keys.c:652 msgid "" "Please press the desired key combination!\n" "Click into left list to cancel" @@ -541,7 +559,15 @@ "¤ªË¾¤ß¤ÎÁȹ礻¤Î¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤!\n" "¼è¾Ã¤¹¤Ë¤Ïº¸¤Î°ìÍ÷¤Ç¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤" -#: app/keys.c:645 +#: app/keys.c:682 app/menubar.c:94 +msgid "Ok" +msgstr "λ²ò" + +#: app/keys.c:692 +msgid "Apply" +msgstr "ŬÍÑ" + +#: app/keys.c:760 msgid "" "The keyboard configuration file is defective.\n" "Please use the Keyboard Configuration dialog." @@ -549,7 +575,7 @@ "¥­¡¼¥Ü¡¼¥ÉÀßÄê¥Õ¥¡¥¤¥ë¤¬ÉÔ´°Á´¤Ç¤¹¡£\n" "¥­¡¼¥Ü¡¼¥ÉÀßÄê¥À¥¤¥¢¥í¥°¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£" -#: app/keys.c:895 +#: app/keys.c:1010 msgid "" "Automatic key configuration unsuccessful.\n" "Please use the Keyboard Configuration dialog\n" @@ -559,11 +585,7 @@ "ÀßÄê¥á¥Ë¥å¡¼¤Î¥­¡¼¥Ü¡¼¥ÉÀßÄê¥À¥¤¥¢¥í¥°¤ò»ÈÍÑ\n" "¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: app/menubar.c:95 -msgid "Ok" -msgstr "λ²ò" - -#: app/menubar.c:131 +#: app/menubar.c:130 msgid "" "Are you sure you want to do this?\n" "All changes will be lost!" @@ -571,7 +593,7 @@ "¤³¤¦¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?\n" "Á´¤Æ¤ÎÊѹ¹¤¬¼º¤ï¤ì¤Þ¤¹!" -#: app/menubar.c:153 +#: app/menubar.c:152 msgid "" "Are you sure you want to quit?\n" "All changes will be lost!" @@ -579,395 +601,387 @@ "½ªÎ»¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?\n" "Á´¤Æ¤ÎÊѹ¹¤¬¼º¤ï¤ì¤Þ¤¹!" -#: app/menubar.c:224 +#: app/menubar.c:223 msgid "_Open..." msgstr "³«¤¯(_O)..." -#: app/menubar.c:226 +#: app/menubar.c:225 msgid "Save _as..." msgstr "Êݸ(_a)..." -#: app/menubar.c:232 +#: app/menubar.c:231 msgid "Save Module as _WAV..." msgstr "_WAV¤È¤·¤Æ¥â¥¸¥å¡¼¥ë¤òÊݸ..." -#: app/menubar.c:237 +#: app/menubar.c:236 msgid "_Quit" msgstr "½ªÎ»(_Q)" -#: app/menubar.c:244 +#: app/menubar.c:243 msgid "Clear _All" msgstr "Á´¤Æ¾Ãµî(_A)" -#: app/menubar.c:246 +#: app/menubar.c:245 msgid "Clear _Patterns Only" msgstr "¥Ñ¥¿¡¼¥ó¤Î¤ß¾Ãµî(_P)" -#: app/menubar.c:248 +#: app/menubar.c:247 msgid "_Optimize Module" msgstr "¥â¥¸¥å¡¼¥ëºÇŬ²½(_O)" -#: app/menubar.c:255 app/menubar.c:266 app/menubar.c:284 +#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 msgid "C_ut" msgstr "ÀÚ¼è(_u)" -#: app/menubar.c:257 app/menubar.c:268 app/menubar.c:286 +#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 msgid "_Copy" msgstr "¥³¥Ô¡¼(_C)" -#: app/menubar.c:259 app/menubar.c:270 app/menubar.c:288 +#: app/menubar.c:258 app/menubar.c:269 app/menubar.c:287 msgid "_Paste" msgstr "ŽÉÕ(_P)" -#: app/menubar.c:272 +#: app/menubar.c:271 msgid "_Insert" msgstr "ÁÞÆþ(_I)" -#: app/menubar.c:274 +#: app/menubar.c:273 msgid "_Delete" msgstr "ºï½ü(_D)" -#: app/menubar.c:282 +#: app/menubar.c:281 msgid "_Mark" msgstr "¥Þ¡¼¥¯(_M)" -#: app/menubar.c:295 +#: app/menubar.c:294 msgid "_Jazz Edit Mode" msgstr "_JazzÊÔ½¸¥â¡¼¥É" -#: app/menubar.c:300 +#: app/menubar.c:299 msgid "Transp_osition..." msgstr "°ÜÄ´(_o)..." -#: app/menubar.c:305 app/menubar.c:390 +#: app/menubar.c:304 app/menubar.c:387 msgid "_Pattern" msgstr "¥Ñ¥¿¡¼¥ó(_P)" -#: app/menubar.c:306 +#: app/menubar.c:305 msgid "_Track" msgstr "¥È¥é¥Ã¥¯(_T)" -#: app/menubar.c:307 +#: app/menubar.c:306 msgid "_Selection" msgstr "ÁªÂò(_S)" -#: app/menubar.c:313 +#: app/menubar.c:312 msgid "_Find Unused Pattern" msgstr "̤»ÈÍѥѥ¿¡¼¥ó¸¡º÷(_F)" -#: app/menubar.c:315 +#: app/menubar.c:314 msgid "_Copy Current to Unused Pattern" msgstr "̤»ÈÍѥѥ¿¡¼¥ó¤Ë¥«¥ì¥ó¥È¤ò¥³¥Ô¡¼(_C)" -#: app/menubar.c:317 +#: app/menubar.c:316 msgid "C_lear Unused Patterns" msgstr "̤»ÈÍѥѥ¿¡¼¥ó¾Ãµî(_l)" -#: app/menubar.c:319 +#: app/menubar.c:318 msgid "_Pack Patterns" msgstr "¥Ñ¥¿¡¼¥ó¡¦¥Ñ¥Ã¥¯(_P)" -#: app/menubar.c:326 +#: app/menubar.c:325 msgid "_Load XI..." msgstr "XI¥í¡¼¥É(_L)..." -#: app/menubar.c:328 +#: app/menubar.c:327 msgid "_Save XI..." msgstr "XIÊݸ(_S)..." -#: app/menubar.c:333 +#: app/menubar.c:332 msgid "_Clear Current" msgstr "¥«¥ì¥ó¥È¾Ãµî(_C)" -#: app/menubar.c:338 +#: app/menubar.c:337 msgid "_Delete Unused Instruments" msgstr "̤»ÈÍѳڴïºï½ü(_D)" -#: app/menubar.c:346 +#: app/menubar.c:345 msgid "Display _Oscilloscopes" msgstr "¥ª¥·¥í¥¹¥³¡¼¥×ɽ¼¨(_O)" -#: app/menubar.c:348 +#: app/menubar.c:347 msgid "Use _Backing Store" msgstr "¥Ð¥Ã¥­¥ó¥°¡¦¥¹¥È¥¢»ÈÍÑ(_B)" -#: app/menubar.c:353 +#: app/menubar.c:352 msgid "_Keyboard Configuration..." msgstr "¥­¡¼¥Ü¡¼¥ÉÀßÄê(_K)..." -#: app/menubar.c:355 +#: app/menubar.c:354 msgid "_Audio Configuration..." msgstr "¥ª¡¼¥Ç¥£¥ªÀßÄê(_A)..." -#: app/menubar.c:357 -msgid "_Playback Effects..." -msgstr "ºÆÀ¸¸ú²Ì(_P)..." - -#: app/menubar.c:359 +#: app/menubar.c:356 msgid "_GUI Configuration..." msgstr "GUIÀßÄê(_G)..." -#: app/menubar.c:364 +#: app/menubar.c:361 msgid "_Save Settings now" msgstr "ÀßÄê¤òº£Êݸ(_S)" -#: app/menubar.c:366 +#: app/menubar.c:363 msgid "Save Settings on _Exit" msgstr "½ªÎ»»þ¤ËÀßÄê¤òÊݸ(_E)" -#: app/menubar.c:373 +#: app/menubar.c:370 msgid "_About..." msgstr "¾ðÊó(_A)..." -#: app/menubar.c:378 +#: app/menubar.c:375 msgid "Show _Tips..." msgstr "µ»¤Îɽ¼¨(_T)..." -#: app/menubar.c:380 +#: app/menubar.c:377 msgid "_XM Effects..." msgstr "_XM¸ú²Ì..." -#: app/menubar.c:387 +#: app/menubar.c:384 msgid "_File" msgstr "¥Õ¥¡¥¤¥ë(_F)" -#: app/menubar.c:388 +#: app/menubar.c:385 msgid "_Module" msgstr "¥â¥¸¥å¡¼¥ë(_M)" -#: app/menubar.c:389 +#: app/menubar.c:386 msgid "_Edit" msgstr "ÊÔ½¸(_E)" -#: app/menubar.c:391 +#: app/menubar.c:388 msgid "_Instrument" msgstr "³Ú´ï(_I)" -#: app/menubar.c:392 +#: app/menubar.c:389 msgid "_Settings" msgstr "ÀßÄê(_S)" -#: app/menubar.c:393 +#: app/menubar.c:390 msgid "_Help" msgstr "¥Ø¥ë¥×(_H)" -#: app/menubar.c:423 +#: app/menubar.c:420 msgid "/_File" msgstr "/¥Õ¥¡¥¤¥ë" -#: app/menubar.c:424 +#: app/menubar.c:421 msgid "/File/_Open..." msgstr "/¥Õ¥¡¥¤¥ë/³«¤¯(_O)..." -#: app/menubar.c:425 +#: app/menubar.c:422 msgid "/File/Save _as..." msgstr "/¥Õ¥¡¥¤¥ë/Êݸ(_a)..." -#: app/menubar.c:426 app/menubar.c:428 +#: app/menubar.c:423 app/menubar.c:425 msgid "/File/-" msgstr "/¥Õ¥¡¥¤¥ë/-" -#: app/menubar.c:427 +#: app/menubar.c:424 msgid "/File/Save Module as _WAV..." msgstr "/¥Õ¥¡¥¤¥ë/_WAV¤È¤·¤Æ¥â¥¸¥å¡¼¥ë¤òÊݸ..." -#: app/menubar.c:429 +#: app/menubar.c:426 msgid "/File/_Quit" msgstr "/¥Õ¥¡¥¤¥ë/½ªÎ»(_Q)" -#: app/menubar.c:430 +#: app/menubar.c:427 msgid "/_Module" msgstr "/¥â¥¸¥å¡¼¥ë" -#: app/menubar.c:431 +#: app/menubar.c:428 msgid "/Module/Clear _All" msgstr "/¥â¥¸¥å¡¼¥ë/Á´¤Æ¾Ãµî(_A)" -#: app/menubar.c:432 +#: app/menubar.c:429 msgid "/Module/Clear _Patterns Only" msgstr "/¥â¥¸¥å¡¼¥ë/¥Ñ¥¿¡¼¥ó¤Î¤ß¾Ãµî(_P)" -#: app/menubar.c:433 +#: app/menubar.c:430 msgid "/Module/_Optimize Module" msgstr "/¥â¥¸¥å¡¼¥ë/¥â¥¸¥å¡¼¥ëºÇŬ²½(_O)" -#: app/menubar.c:434 +#: app/menubar.c:431 msgid "/_Edit" msgstr "/ÊÔ½¸" -#: app/menubar.c:435 +#: app/menubar.c:432 msgid "/Edit/_Jazz Edit Mode" msgstr "/ÊÔ½¸/_JazzÊÔ½¸¥â¡¼¥É" -#: app/menubar.c:436 app/menubar.c:438 +#: app/menubar.c:433 app/menubar.c:435 msgid "/Edit/-" msgstr "/ÊÔ½¸/-" -#: app/menubar.c:437 +#: app/menubar.c:434 msgid "/Edit/_Transposition..." msgstr "/ÊÔ½¸/°ÜÄ´(_T)..." -#: app/menubar.c:439 +#: app/menubar.c:436 msgid "/Edit/_Pattern" msgstr "/ÊÔ½¸/¥Ñ¥¿¡¼¥ó" -#: app/menubar.c:440 +#: app/menubar.c:437 msgid "/Edit/Pattern/C_ut" msgstr "/ÊÔ½¸/¥Ñ¥¿¡¼¥ó/ÀÚ¼è(_u)" -#: app/menubar.c:441 +#: app/menubar.c:438 msgid "/Edit/Pattern/_Copy" msgstr "/ÊÔ½¸/¥Ñ¥¿¡¼¥ó/¥³¥Ô¡¼(_C)" -#: app/menubar.c:442 +#: app/menubar.c:439 msgid "/Edit/Pattern/_Paste" msgstr "/ÊÔ½¸/¥Ñ¥¿¡¼¥ó/ŽÉÕ(_P)" -#: app/menubar.c:443 +#: app/menubar.c:440 msgid "/Edit/_Track" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯" -#: app/menubar.c:444 +#: app/menubar.c:441 msgid "/Edit/Track/C_ut" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ÀÚ¼è(_u)" -#: app/menubar.c:445 +#: app/menubar.c:442 msgid "/Edit/Track/_Copy" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/¥³¥Ô¡¼(_C)" -#: app/menubar.c:446 +#: app/menubar.c:443 msgid "/Edit/Track/_Paste" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ŽÉÕ(_P)" -#: app/menubar.c:447 +#: app/menubar.c:444 msgid "/Edit/Track/_Insert" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ÁÞÆþ(_I)" -#: app/menubar.c:448 +#: app/menubar.c:445 msgid "/Edit/Track/_Delete" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ºï½ü(_D)" -#: app/menubar.c:449 +#: app/menubar.c:446 msgid "/Edit/_Selection" msgstr "/ÊÔ½¸/ÁªÂò" -#: app/menubar.c:450 +#: app/menubar.c:447 msgid "/Edit/Selection/_Mark" msgstr "/ÊÔ½¸/ÁªÂò/¥Þ¡¼¥¯(_M)" -#: app/menubar.c:451 +#: app/menubar.c:448 msgid "/Edit/Selection/C_ut" msgstr "/ÊÔ½¸/ÁªÂò/ÀÚ¼è(_u)" -#: app/menubar.c:452 +#: app/menubar.c:449 msgid "/Edit/Selection/_Copy" msgstr "/ÊÔ½¸/ÁªÂò/¥³¥Ô¡¼(_C)" -#: app/menubar.c:453 +#: app/menubar.c:450 msgid "/Edit/Selection/_Paste" msgstr "/ÊÔ½¸/ÁªÂò/ŽÉÕ(_P)" -#: app/menubar.c:454 +#: app/menubar.c:451 msgid "/_Pattern" msgstr "/¥Ñ¥¿¡¼¥ó" -#: app/menubar.c:455 +#: app/menubar.c:452 msgid "/Pattern/_Find Unused Pattern" msgstr "/¥Ñ¥¿¡¼¥ó/̤»ÈÍѥѥ¿¡¼¥ó¸¡º÷(_F)" -#: app/menubar.c:456 +#: app/menubar.c:453 msgid "/Pattern/_Copy Current to Unused Pattern" msgstr "/¥Ñ¥¿¡¼¥ó/̤»ÈÍѥѥ¿¡¼¥ó¤Ë¥«¥ì¥ó¥È¤ò¥³¥Ô¡¼(_C)" -#: app/menubar.c:457 +#: app/menubar.c:454 msgid "/Pattern/C_lear Unused Patterns" msgstr "/¥Ñ¥¿¡¼¥ó/̤»ÈÍѥѥ¿¡¼¥ó¾Ãµî(_l)" -#: app/menubar.c:458 +#: app/menubar.c:455 msgid "/Pattern/_Pack Patterns" msgstr "/¥Ñ¥¿¡¼¥ó/¥Ñ¥¿¡¼¥ó¡¦¥Ñ¥Ã¥¯(_P)" -#: app/menubar.c:459 +#: app/menubar.c:456 msgid "/_Instrument" msgstr "/³Ú´ï" -#: app/menubar.c:460 +#: app/menubar.c:457 msgid "/Instrument/_Load XI..." msgstr "/³Ú´ï/XI¥í¡¼¥É(_L)..." -#: app/menubar.c:461 +#: app/menubar.c:458 msgid "/Instrument/_Save XI..." msgstr "/³Ú´ï/XIÊݸ(_S)..." -#: app/menubar.c:462 app/menubar.c:464 +#: app/menubar.c:459 app/menubar.c:461 msgid "/Instrument/-" msgstr "/³Ú´ï/-" -#: app/menubar.c:463 +#: app/menubar.c:460 msgid "/Instrument/_Clear Current" msgstr "/³Ú´ï/¥«¥ì¥ó¥È¾Ãµî(_C)" -#: app/menubar.c:465 +#: app/menubar.c:462 msgid "/Instrument/_Delete Unused Instruments" msgstr "/³Ú´ï/̤»ÈÍѳڴïºï½ü(_D)" -#: app/menubar.c:466 +#: app/menubar.c:463 msgid "/_Settings" msgstr "/ÀßÄê" -#: app/menubar.c:467 +#: app/menubar.c:464 msgid "/Settings/Display _Oscilloscopes" msgstr "/ÀßÄê/¥ª¥·¥í¥¹¥³¡¼¥×ɽ¼¨(_O)" -#: app/menubar.c:468 +#: app/menubar.c:465 msgid "/Settings/Use _Backing Store" msgstr "/ÀßÄê/¥Ð¥Ã¥­¥ó¥°¡¦¥¹¥È¥¢»ÈÍÑ(_B)" -#: app/menubar.c:469 app/menubar.c:474 +#: app/menubar.c:466 app/menubar.c:470 msgid "/Settings/-" msgstr "/ÀßÄê/-" -#: app/menubar.c:470 +#: app/menubar.c:467 msgid "/Settings/_Keyboard Configuration..." msgstr "/ÀßÄê/¥­¡¼¥Ü¡¼¥ÉÀßÄê(_K)..." -#: app/menubar.c:471 +#: app/menubar.c:468 msgid "/Settings/_Audio Configuration..." msgstr "/ÀßÄê/¥ª¡¼¥Ç¥£¥ªÀßÄê(_A)..." -#: app/menubar.c:472 -msgid "/Settings/_Playback Effects..." -msgstr "/ÀßÄê/ºÆÀ¸¸ú²Ì(_P)..." - -#: app/menubar.c:473 +#: app/menubar.c:469 msgid "/Settings/_GUI Configuration..." msgstr "/ÀßÄê/GUIÀßÄê(_G)..." -#: app/menubar.c:475 +#: app/menubar.c:471 msgid "/Settings/_Save Settings now" msgstr "/ÀßÄê/ÀßÄê¤òº£Êݸ(_S)" -#: app/menubar.c:476 +#: app/menubar.c:472 msgid "/Settings/Save Settings on _Exit" msgstr "/ÀßÄê/½ªÎ»»þ¤ËÀßÄê¤òÊݸ(_E)" -#: app/menubar.c:477 +#: app/menubar.c:473 msgid "/_Help" msgstr "/¥Ø¥ë¥×" -#: app/menubar.c:478 +#: app/menubar.c:474 msgid "/Help/_About..." msgstr "/¥Ø¥ë¥×/¾ðÊó(_A)..." -#: app/menubar.c:479 +#: app/menubar.c:475 msgid "/Help/-" msgstr "/¥Ø¥ë¥×/-" -#: app/menubar.c:480 +#: app/menubar.c:476 msgid "/Help/Show _Tips..." msgstr "/¥Ø¥ë¥×/µ»¤Îɽ¼¨(_T)..." -#: app/menubar.c:481 +#: app/menubar.c:477 msgid "/Help/_XM Effects..." msgstr "/¥Ø¥ë¥×/_XM¸ú²Ì..." @@ -987,7 +1001,7 @@ msgid "Linear" msgstr "Àþ·¿" -#: app/module-info.c:118 app/sample-editor.c:182 +#: app/module-info.c:118 app/sample-editor.c:185 msgid "Amiga" msgstr "Amiga" @@ -1027,148 +1041,143 @@ "ÀßÄê¥Õ¥¡¥¤¥ë¤òµ­²±¤¹¤ë¤¿¤á¡¢¤¢¤Ê¤¿¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë\n" "¥Ç¥£¥ì¥¯¥È¥ê'.soundtracker'¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\n" -#: app/sample-editor.c:181 +#: app/sample-editor.c:184 msgid "No loop" msgstr "¥ë¡¼¥×̵¤·" -#: app/sample-editor.c:183 +#: app/sample-editor.c:186 msgid "PingPong" msgstr "¥Ô¥ó¥Ý¥ó" -#: app/sample-editor.c:187 +#: app/sample-editor.c:190 msgid "8 bits" msgstr "8¥Ó¥Ã¥È" -#: app/sample-editor.c:188 +#: app/sample-editor.c:191 msgid "16 bits" msgstr "16¥Ó¥Ã¥È" -#: app/sample-editor.c:194 +#: app/sample-editor.c:197 msgid "Sample Editor" msgstr "¥µ¥ó¥×¥ëÊÔ½¸" -#: app/sample-editor.c:234 +#: app/sample-editor.c:237 msgid "Volume" msgstr "²»ÎÌ" -#: app/sample-editor.c:235 +#: app/sample-editor.c:238 msgid "Panning" msgstr "¥Ñ¥ó" -#: app/sample-editor.c:236 +#: app/sample-editor.c:239 msgid "Finetune" msgstr "ÈùÄ´À°" -#: app/sample-editor.c:247 -msgid "SelStart" -msgstr "ÁªÂò»ÏÅÀ" - -#: app/sample-editor.c:248 -msgid "SelEnd" -msgstr "ÁªÂò½ªÅÀ" - -#: app/sample-editor.c:256 -msgid "Sel None" -msgstr "̵ÁªÂò" - -#: app/sample-editor.c:262 -msgid "Sel All" -msgstr "Á´ÁªÂò" +#: app/sample-editor.c:259 +msgid "Selection:" +msgstr "ÁªÂò:" + +#: app/sample-editor.c:263 +msgid "None" +msgstr "̵" + +#: app/sample-editor.c:269 +msgid "All" +msgstr "Á´¤Æ" -#: app/sample-editor.c:268 +#: app/sample-editor.c:290 +msgid "Length:" +msgstr "Ťµ:" + +#: app/sample-editor.c:306 msgid "RelNote" msgstr "Relnote" -#: app/sample-editor.c:269 -msgid "Length: 0" -msgstr "Ťµ: 0" - -#: app/sample-editor.c:282 +#: app/sample-editor.c:317 msgid "Load Sample..." msgstr "¥µ¥ó¥×¥ë¡¦¥í¡¼¥É..." -#: app/sample-editor.c:284 +#: app/sample-editor.c:319 msgid "Save WAV..." msgstr "WAVÊݸ..." -#: app/sample-editor.c:286 +#: app/sample-editor.c:321 msgid "Save region as WAV..." msgstr "WAV¤È¤·¤ÆÈÏ°ÏÊݸ..." -#: app/sample-editor.c:299 +#: app/sample-editor.c:334 msgid "Save WAV" msgstr "WAVÊݸ" -#: app/sample-editor.c:309 +#: app/sample-editor.c:344 msgid "Save Region" msgstr "ÈÏ°ÏÊݸ" -#: app/sample-editor.c:320 +#: app/sample-editor.c:355 msgid "Monitor" msgstr "¥â¥Ë¥¿" -#: app/sample-editor.c:326 +#: app/sample-editor.c:361 msgid "Volume Ramp" msgstr "Volume Ramp" -#: app/sample-editor.c:336 +#: app/sample-editor.c:371 msgid "Zoom to selection" msgstr "ÁªÂòÉôʬ³ÈÂç" -#: app/sample-editor.c:342 +#: app/sample-editor.c:377 msgid "Show all" msgstr "Á´¤Æɽ¼¨" -#: app/sample-editor.c:348 +#: app/sample-editor.c:383 msgid "Zoom in (+50%)" msgstr "³ÈÂç(+50%)" -#: app/sample-editor.c:354 +#: app/sample-editor.c:389 msgid "Zoom out (-50%)" msgstr "½Ì¾®(-50%)" -#: app/sample-editor.c:360 +#: app/sample-editor.c:395 msgid "Reverse" msgstr "¥ê¥Ð¡¼¥¹" -#: app/sample-editor.c:370 +#: app/sample-editor.c:405 msgid "Cut" msgstr "ÀÚ¼è" -#: app/sample-editor.c:376 +#: app/sample-editor.c:411 msgid "Remove" msgstr "°ÜÆ°" -#: app/sample-editor.c:382 +#: app/sample-editor.c:417 msgid "Copy" msgstr "¥³¥Ô¡¼" -#: app/sample-editor.c:388 +#: app/sample-editor.c:423 msgid "Paste" msgstr "ŽÉÕ" -#: app/sample-editor.c:394 +#: app/sample-editor.c:429 msgid "Clear Sample" msgstr "¥µ¥ó¥×¥ë¾Ãµî" -#: app/sample-editor.c:481 -#, c-format -msgid "Length: %d" -msgstr "Ťµ: %d" +#: app/sample-editor.c:467 +msgid "(no selection)" +msgstr "(̵ÁªÂò)" -#: app/sample-editor.c:1033 +#: app/sample-editor.c:1000 msgid "" msgstr "<º£Å½ÉÕ¤±¤µ¤ì¤Þ¤·¤¿>" -#: app/sample-editor.c:1117 +#: app/sample-editor.c:1076 msgid "Read error." msgstr "Æɤ߹þ¤ß¥¨¥é¡¼¡£" -#: app/sample-editor.c:1233 +#: app/sample-editor.c:1181 msgid "Load stereo sample" msgstr "¥¹¥Æ¥ì¥ª¡¦¥µ¥ó¥×¥ë¡¦¥í¡¼¥É" -#: app/sample-editor.c:1241 +#: app/sample-editor.c:1189 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1180,83 +1189,79 @@ "\n" "¥í¡¼¥É¤¹¤ë¤¿¤á¤Î¥Á¥ã¥ó¥Í¥ë¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤:" -#: app/sample-editor.c:1252 +#: app/sample-editor.c:1200 msgid "Left" msgstr "º¸" -#: app/sample-editor.c:1258 +#: app/sample-editor.c:1206 msgid "Mix" msgstr "¥ß¥Ã¥¯¥¹" -#: app/sample-editor.c:1264 +#: app/sample-editor.c:1212 msgid "Right" msgstr "±¦" -#: app/sample-editor.c:1303 +#: app/sample-editor.c:1251 msgid "Can't read sample" msgstr "¥µ¥ó¥×¥ë¤¬Æɤ߹þ¤á¤Þ¤»¤ó" -#: app/sample-editor.c:1309 +#: app/sample-editor.c:1257 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "" "¥µ¥ó¥×¥ë¤¬¸½ºß¤Î¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë¤Ë¤ÏĹ²á¤®¤Þ¤¹¡£\n" "¤È¤Ë¤«¤¯¥í¡¼¥É¤·¤Þ¤¹¡£" -#: app/sample-editor.c:1323 +#: app/sample-editor.c:1271 msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "2¥Á¥ã¥ó¥Í¥ë¤Þ¤Ç¤Ç 8¡¢16¥Ó¥Ã¥È¡¦¥µ¥ó¥×¥ë¤Î¤ß½èÍý¤Ç¤­¤Þ¤¹" -#: app/sample-editor.c:1415 +#: app/sample-editor.c:1370 msgid "Nothing to save." msgstr "²¿¤âÊݸ¤·¤Ê¤¤¡£" -#: app/sample-editor.c:1442 +#: app/sample-editor.c:1397 msgid "OK" msgstr "λ²ò" -#: app/sample-editor.c:1450 +#: app/sample-editor.c:1405 msgid "Start sampling" msgstr "¥µ¥ó¥×¥ê¥ó¥°³«»Ï" -#: app/sample-editor.c:1485 app/sample-editor.c:1488 +#: app/sample-editor.c:1440 app/sample-editor.c:1443 msgid "Sampling Window" msgstr "¥µ¥ó¥×¥ê¥ó¥°¡¦¥¦¥£¥ó¥É¥¦" -#: app/sample-editor.c:1588 +#: app/sample-editor.c:1543 msgid "" msgstr "<º£¥µ¥ó¥×¥ê¥ó¥°¤·¤Þ¤·¤¿>" -#: app/sample-editor.c:1618 +#: app/sample-editor.c:1573 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" "Ï¿²»¤·¤¿¥µ¥ó¥×¥ë¤¬¸½ºß¤Î¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë¤Ë¤ÏĹ²á¤®¤Þ¤¹¡£\n" "¤È¤Ë¤«¤¯¤½¤ì¤ò»È¤¤¤Þ¤¹¡£" -#: app/sample-editor.c:1650 +#: app/sample-editor.c:1605 msgid "Normalize" msgstr "µ¬³Ê²½" -#: app/sample-editor.c:1651 +#: app/sample-editor.c:1606 msgid "Execute" msgstr "¼Â¹Ô" -#: app/sample-editor.c:1652 app/tips-dialog.c:165 -msgid "Close" -msgstr "ÊĤ¸¤ë" - -#: app/sample-editor.c:1661 app/sample-editor.c:1664 +#: app/sample-editor.c:1616 app/sample-editor.c:1619 msgid "Volume Ramping" msgstr "Volume Ramping" -#: app/sample-editor.c:1681 +#: app/sample-editor.c:1636 msgid "Perform linear volume fade on Selection" msgstr "ÁªÂò»þ¤Ë²»Î̤òÀþ·¿¤Ë¥Õ¥§¡¼¥É¤¹¤ë" -#: app/sample-editor.c:1693 +#: app/sample-editor.c:1648 msgid "Left [%]:" msgstr "º¸ [%]:" -#: app/sample-editor.c:1698 +#: app/sample-editor.c:1653 msgid "Right [%]:" msgstr "±¦ [%]:" @@ -1383,73 +1388,68 @@ msgid "Transposition Tools" msgstr "°ÜÄ´¥Ä¡¼¥ë" -#: app/transposition.c:217 +#: app/transposition.c:218 msgid "Scope of the operation:" msgstr "Áàºî¥¹¥³¡¼¥×:" -#: app/transposition.c:224 +#: app/transposition.c:225 msgid "Note Transposition" msgstr "°ÜÄ´¤ÎÄ´" -#: app/transposition.c:254 +#: app/transposition.c:255 msgid "Instrument Changing" msgstr "³Ú´ï¸ò´¹" -#: app/transposition.c:269 +#: app/transposition.c:270 msgid "Instrument 1:" msgstr "³Ú´ï 1:" -#: app/transposition.c:271 app/transposition.c:281 +#: app/transposition.c:272 app/transposition.c:282 msgid "Current instrument" msgstr "¸½ºß¤Î³Ú´ï" -#: app/transposition.c:279 +#: app/transposition.c:280 msgid "Instrument 2:" msgstr "³Ú´ï 2:" -#: app/xm.c:161 +#: app/xm.c:170 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "¥Ñ¥¿¡¼¥óŤ¬ÈϰϤò±Û¤¨¤Þ¤·¤¿: %d.\n" -#: app/xm.c:441 app/xm.c:512 +#: app/xm.c:455 app/xm.c:526 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "ÉÔÀµ¤Ê¥Ð¥¤¥Ö¥ì¡¼¥·¥ç¥ó·¿%d¡¢Àµ¸¹ÇȤò»ÈÍѤ·¤Þ¤¹¡£\n" -#: app/xm.c:472 +#: app/xm.c:486 msgid "File is no XI instrument." msgstr "¥Õ¥¡¥¤¥ë¤¬XI³Ú´ï¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£" -#: app/xm.c:482 +#: app/xm.c:496 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "̤ÃΤÎXI¥Ð¡¼¥¸¥ç¥ó0x%x¤Ç¤¹\n" -#: app/xm.c:757 -msgid "No FastTracker XM and no supported MOD format!" -msgstr "" -"FastTracker XM¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤¿MOD¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤â¤¢¤ê¤Þ¤»¤ó!" - -#: app/xm.c:771 app/xm.c:876 +#: app/xm.c:787 app/xm.c:901 msgid "Error while loading patterns." msgstr "¥Ñ¥¿¡¼¥ó¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼¡£" -#: app/xm.c:829 +#: app/xm.c:851 msgid "Can't open file" msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó" -#: app/xm.c:843 +#: app/xm.c:865 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "XM¥Ø¥Ã¥ÀŤ¬276¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n" "¶²¤é¤¯pre-0.0.12 SoundTracker¥â¥¸¥å¡¼¥ë¤Ç¤Ï? :-)\n" -#: app/xm.c:882 +#: app/xm.c:907 msgid "Error while loading instruments." msgstr "³Ú´ï¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼¡£" -#: app/xm.c:893 +#: app/xm.c:918 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1457,3 +1457,8 @@ msgstr "" "¥â¥¸¥å¡¼¥ë¤¬¸½ºß¤Î¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë¤Ë¤ÏĹ²á¤®¤ë¥µ¥ó¥×¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£\n" "¥µ¥ó¥×¥ë¤ÎºÇÂçŤÏ%d¤Ç¤¹¡£" + +#: app/xm.c:1234 +msgid "No FastTracker XM and no supported MOD format!" +msgstr "" +"FastTracker XM¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤¿MOD¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤â¤¢¤ê¤Þ¤»¤ó!" diff -urN soundtracker-0.5.0/po/soundtracker.pot soundtracker-0.5.1/po/soundtracker.pot --- soundtracker-0.5.0/po/soundtracker.pot Mon Mar 13 13:56:03 2000 +++ soundtracker-0.5.1/po/soundtracker.pot Sat Mar 25 11:24:56 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-03-13 13:56+0100\n" +"POT-Creation-Date: 2000-03-25 11:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgid "Mixers" msgstr "" -#: app/audioconfig.c:320 app/gui-settings.c:319 app/sample-editor.c:1607 +#: app/audioconfig.c:320 app/gui-settings.c:377 app/sample-editor.c:1613 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "" @@ -141,7 +141,7 @@ msgid "no settings (yet), sorry!" msgstr "" -#: app/drivers/file-output.c:161 app/sample-editor.c:1312 +#: app/drivers/file-output.c:161 app/sample-editor.c:1316 msgid "Can't open file for writing." msgstr "" @@ -253,137 +253,209 @@ msgid "Operation not supported." msgstr "" -#: app/gui-settings.c:86 +#: app/gui-settings.c:83 msgid "Scopes Frequency" msgstr "" -#: app/gui-settings.c:89 +#: app/gui-settings.c:86 msgid "Tracker Frequency" msgstr "" -#: app/gui-settings.c:188 app/gui-settings.c:191 +#: app/gui-settings.c:211 app/gui-settings.c:214 msgid "GUI Configuration" msgstr "" -#: app/gui-settings.c:217 +#: app/gui-settings.c:248 msgid "Use Hexadecimal Numbers" msgstr "" -#: app/gui-settings.c:224 +#: app/gui-settings.c:255 msgid "Use upper case letters for hex numbers" msgstr "" -#: app/gui-settings.c:231 +#: app/gui-settings.c:262 msgid "Advance cursor horizontally in effect columns" msgstr "" -#: app/gui-settings.c:238 +#: app/gui-settings.c:269 msgid "Asynchronous Editing" msgstr "" -#: app/gui-settings.c:245 +#: app/gui-settings.c:276 +msgid "Show zeroes" +msgstr "" + +#: app/gui-settings.c:283 +msgid "Channel numbering" +msgstr "" + +#: app/gui-settings.c:290 msgid "Use anti-aliased envelope editor" msgstr "" -#: app/gui-settings.c:251 +#: app/gui-settings.c:296 msgid "You need to restart SoundTracker for this change to come into effect." msgstr "" -#: app/gui-settings.c:260 +#: app/gui-settings.c:305 msgid "Scopes buffer size [MB]" msgstr "" -#: app/gui-settings.c:279 +#: app/gui-settings.c:324 msgid "Highlight rows:" msgstr "" -#: app/gui-settings.c:297 +#: app/gui-settings.c:342 msgid "`Save XM' saves all non-empty patterns" msgstr "" -#: app/gui-subs.c:430 +#: app/gui-subs.c:32 +msgid "Idle." +msgstr "" + +#: app/gui-subs.c:33 +msgid "Playing song..." +msgstr "" + +#: app/gui-subs.c:34 +msgid "Playing pattern..." +msgstr "" + +#: app/gui-subs.c:35 +msgid "Loading module..." +msgstr "" + +#: app/gui-subs.c:36 +msgid "Module loaded." +msgstr "" + +#: app/gui-subs.c:37 +msgid "Saving module..." +msgstr "" + +#: app/gui-subs.c:38 +msgid "Module saved." +msgstr "" + +#: app/gui-subs.c:39 +msgid "Loading sample..." +msgstr "" + +#: app/gui-subs.c:40 +msgid "Sample loaded." +msgstr "" + +#: app/gui-subs.c:41 +msgid "Saving sample..." +msgstr "" + +#: app/gui-subs.c:42 +msgid "Sample saved." +msgstr "" + +#: app/gui-subs.c:43 +msgid "Loading instrument..." +msgstr "" + +#: app/gui-subs.c:44 +msgid "Instrument loaded." +msgstr "" + +#: app/gui-subs.c:45 +msgid "Saving instrument..." +msgstr "" + +#: app/gui-subs.c:46 +msgid "Instrument saved." +msgstr "" + +#: app/gui-subs.c:459 msgid "Question" msgstr "" -#: app/gui-subs.c:447 app/keys.c:702 app/sample-editor.c:1225 -#: app/sample-editor.c:1412 +#: app/gui-subs.c:476 app/keys.c:702 app/sample-editor.c:1227 +#: app/sample-editor.c:1418 msgid "Cancel" msgstr "" -#: app/gui-subs.c:465 +#: app/gui-subs.c:494 msgid "Warning" msgstr "" -#: app/gui-subs.c:491 +#: app/gui-subs.c:520 msgid "Error!" msgstr "" -#: app/gui.c:83 +#: app/gui.c:87 msgid "Tempo" msgstr "" -#: app/gui.c:217 +#: app/gui.c:221 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" msgstr "" -#: app/gui.c:231 app/gui.c:245 +#: app/gui.c:235 app/gui.c:249 msgid "Are you sure you want to overwrite the file?" msgstr "" -#: app/gui.c:1145 +#: app/gui.c:1167 msgid "Load XM..." msgstr "" -#: app/gui.c:1147 +#: app/gui.c:1169 msgid "Save XM..." msgstr "" -#: app/gui.c:1150 +#: app/gui.c:1172 msgid "Render module as WAV..." msgstr "" -#: app/gui.c:1202 +#: app/gui.c:1224 msgid "Play Song" msgstr "" -#: app/gui.c:1208 +#: app/gui.c:1230 msgid "Play Pattern" msgstr "" -#: app/gui.c:1214 +#: app/gui.c:1236 msgid "Stop" msgstr "" -#: app/gui.c:1233 +#: app/gui.c:1255 msgid "Number of Channels:" msgstr "" -#: app/gui.c:1249 app/playlist.c:294 +#: app/gui.c:1271 app/playlist.c:294 msgid "Pattern" msgstr "" -#: app/gui.c:1265 +#: app/gui.c:1287 msgid "PatLength" msgstr "" -#: app/gui.c:1357 +#: app/gui.c:1379 msgid "Octave" msgstr "" -#: app/gui.c:1365 +#: app/gui.c:1387 msgid "Jump" msgstr "" -#: app/gui.c:1373 +#: app/gui.c:1395 msgid "Instr" msgstr "" -#: app/gui.c:1388 +#: app/gui.c:1410 msgid "Sample" msgstr "" +#: app/gui.c:1448 +msgid "%M:%S" +msgstr "" + #: app/instrument-editor.c:75 msgid "VolFade" msgstr "" @@ -400,63 +472,63 @@ msgid "VibSweep" msgstr "" -#: app/instrument-editor.c:154 app/instrument-editor.c:175 +#: app/instrument-editor.c:156 app/instrument-editor.c:179 msgid "Can't open file." msgstr "" -#: app/instrument-editor.c:212 +#: app/instrument-editor.c:216 msgid "Sine" msgstr "" -#: app/instrument-editor.c:212 +#: app/instrument-editor.c:216 msgid "Square" msgstr "" -#: app/instrument-editor.c:212 +#: app/instrument-editor.c:216 msgid "Saw Down" msgstr "" -#: app/instrument-editor.c:212 +#: app/instrument-editor.c:216 msgid "Saw Up" msgstr "" -#: app/instrument-editor.c:216 +#: app/instrument-editor.c:220 msgid "Instrument Editor" msgstr "" -#: app/instrument-editor.c:225 +#: app/instrument-editor.c:229 msgid "Volume envelope" msgstr "" -#: app/instrument-editor.c:233 +#: app/instrument-editor.c:237 msgid "Panning envelope" msgstr "" -#: app/instrument-editor.c:250 +#: app/instrument-editor.c:254 msgid "Load Instrument..." msgstr "" -#: app/instrument-editor.c:252 +#: app/instrument-editor.c:256 msgid "Save Instrument..." msgstr "" -#: app/instrument-editor.c:254 +#: app/instrument-editor.c:258 msgid "Load XI" msgstr "" -#: app/instrument-editor.c:260 +#: app/instrument-editor.c:264 msgid "Save XI" msgstr "" -#: app/instrument-editor.c:279 +#: app/instrument-editor.c:283 msgid "Vibrato Type:" msgstr "" -#: app/instrument-editor.c:351 +#: app/instrument-editor.c:355 msgid "Note:" msgstr "" -#: app/instrument-editor.c:369 +#: app/instrument-editor.c:373 msgid "Initialize" msgstr "" @@ -532,7 +604,7 @@ "Click into left list to cancel" msgstr "" -#: app/keys.c:682 app/menubar.c:94 +#: app/keys.c:682 app/menubar.c:95 msgid "Ok" msgstr "" @@ -553,399 +625,423 @@ "in the Settings menu." msgstr "" -#: app/menubar.c:130 +#: app/menubar.c:131 msgid "" "Are you sure you want to do this?\n" "All changes will be lost!" msgstr "" -#: app/menubar.c:152 +#: app/menubar.c:153 msgid "" "Are you sure you want to quit?\n" "All changes will be lost!" msgstr "" -#: app/menubar.c:223 +#: app/menubar.c:237 msgid "_Open..." msgstr "" -#: app/menubar.c:225 +#: app/menubar.c:239 msgid "Save _as..." msgstr "" -#: app/menubar.c:231 +#: app/menubar.c:245 msgid "Save Module as _WAV..." msgstr "" -#: app/menubar.c:236 +#: app/menubar.c:250 msgid "_Quit" msgstr "" -#: app/menubar.c:243 +#: app/menubar.c:257 msgid "Clear _All" msgstr "" -#: app/menubar.c:245 +#: app/menubar.c:259 msgid "Clear _Patterns Only" msgstr "" -#: app/menubar.c:247 +#: app/menubar.c:261 msgid "_Optimize Module" msgstr "" -#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 +#: app/menubar.c:268 app/menubar.c:279 app/menubar.c:297 msgid "C_ut" msgstr "" -#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 +#: app/menubar.c:270 app/menubar.c:281 app/menubar.c:299 msgid "_Copy" msgstr "" -#: app/menubar.c:258 app/menubar.c:269 app/menubar.c:287 +#: app/menubar.c:272 app/menubar.c:283 app/menubar.c:301 msgid "_Paste" msgstr "" -#: app/menubar.c:271 +#: app/menubar.c:285 msgid "_Insert" msgstr "" -#: app/menubar.c:273 +#: app/menubar.c:287 msgid "_Delete" msgstr "" -#: app/menubar.c:281 +#: app/menubar.c:295 msgid "_Mark" msgstr "" -#: app/menubar.c:294 +#: app/menubar.c:308 msgid "_Jazz Edit Mode" msgstr "" -#: app/menubar.c:299 +#: app/menubar.c:313 msgid "Transp_osition..." msgstr "" -#: app/menubar.c:304 app/menubar.c:387 +#: app/menubar.c:318 app/menubar.c:413 msgid "_Pattern" msgstr "" -#: app/menubar.c:305 +#: app/menubar.c:319 msgid "_Track" msgstr "" -#: app/menubar.c:306 +#: app/menubar.c:320 msgid "_Selection" msgstr "" -#: app/menubar.c:312 +#: app/menubar.c:326 msgid "_Find Unused Pattern" msgstr "" -#: app/menubar.c:314 +#: app/menubar.c:328 msgid "_Copy Current to Unused Pattern" msgstr "" -#: app/menubar.c:316 +#: app/menubar.c:330 msgid "C_lear Unused Patterns" msgstr "" -#: app/menubar.c:318 +#: app/menubar.c:332 msgid "_Pack Patterns" msgstr "" -#: app/menubar.c:325 +#: app/menubar.c:339 msgid "_Load XI..." msgstr "" -#: app/menubar.c:327 +#: app/menubar.c:341 msgid "_Save XI..." msgstr "" -#: app/menubar.c:332 +#: app/menubar.c:346 msgid "_Clear Current" msgstr "" -#: app/menubar.c:337 +#: app/menubar.c:351 msgid "_Delete Unused Instruments" msgstr "" -#: app/menubar.c:345 +#: app/menubar.c:358 +msgid "Use _Backing Store" +msgstr "" + +#: app/menubar.c:361 +msgid "_Previous font" +msgstr "" + +#: app/menubar.c:363 +msgid "_Next font" +msgstr "" + +#: app/menubar.c:371 msgid "Display _Oscilloscopes" msgstr "" -#: app/menubar.c:347 -msgid "Use _Backing Store" +#: app/menubar.c:374 +msgid "_Tracker" msgstr "" -#: app/menubar.c:352 +#: app/menubar.c:378 msgid "_Keyboard Configuration..." msgstr "" -#: app/menubar.c:354 +#: app/menubar.c:380 msgid "_Audio Configuration..." msgstr "" -#: app/menubar.c:356 +#: app/menubar.c:382 msgid "_GUI Configuration..." msgstr "" -#: app/menubar.c:361 +#: app/menubar.c:387 msgid "_Save Settings now" msgstr "" -#: app/menubar.c:363 +#: app/menubar.c:389 msgid "Save Settings on _Exit" msgstr "" -#: app/menubar.c:370 +#: app/menubar.c:396 msgid "_About..." msgstr "" -#: app/menubar.c:375 +#: app/menubar.c:401 msgid "Show _Tips..." msgstr "" -#: app/menubar.c:377 +#: app/menubar.c:403 msgid "_XM Effects..." msgstr "" -#: app/menubar.c:384 +#: app/menubar.c:410 msgid "_File" msgstr "" -#: app/menubar.c:385 +#: app/menubar.c:411 msgid "_Module" msgstr "" -#: app/menubar.c:386 +#: app/menubar.c:412 msgid "_Edit" msgstr "" -#: app/menubar.c:388 +#: app/menubar.c:414 msgid "_Instrument" msgstr "" -#: app/menubar.c:389 +#: app/menubar.c:415 msgid "_Settings" msgstr "" -#: app/menubar.c:390 +#: app/menubar.c:416 msgid "_Help" msgstr "" -#: app/menubar.c:420 +#: app/menubar.c:446 msgid "/_File" msgstr "" -#: app/menubar.c:421 +#: app/menubar.c:447 msgid "/File/_Open..." msgstr "" -#: app/menubar.c:422 +#: app/menubar.c:448 msgid "/File/Save _as..." msgstr "" -#: app/menubar.c:423 app/menubar.c:425 +#: app/menubar.c:449 app/menubar.c:451 msgid "/File/-" msgstr "" -#: app/menubar.c:424 +#: app/menubar.c:450 msgid "/File/Save Module as _WAV..." msgstr "" -#: app/menubar.c:426 +#: app/menubar.c:452 msgid "/File/_Quit" msgstr "" -#: app/menubar.c:427 +#: app/menubar.c:453 msgid "/_Module" msgstr "" -#: app/menubar.c:428 +#: app/menubar.c:454 msgid "/Module/Clear _All" msgstr "" -#: app/menubar.c:429 +#: app/menubar.c:455 msgid "/Module/Clear _Patterns Only" msgstr "" -#: app/menubar.c:430 +#: app/menubar.c:456 msgid "/Module/_Optimize Module" msgstr "" -#: app/menubar.c:431 +#: app/menubar.c:457 msgid "/_Edit" msgstr "" -#: app/menubar.c:432 +#: app/menubar.c:458 msgid "/Edit/_Jazz Edit Mode" msgstr "" -#: app/menubar.c:433 app/menubar.c:435 +#: app/menubar.c:459 app/menubar.c:461 msgid "/Edit/-" msgstr "" -#: app/menubar.c:434 +#: app/menubar.c:460 msgid "/Edit/_Transposition..." msgstr "" -#: app/menubar.c:436 +#: app/menubar.c:462 msgid "/Edit/_Pattern" msgstr "" -#: app/menubar.c:437 +#: app/menubar.c:463 msgid "/Edit/Pattern/C_ut" msgstr "" -#: app/menubar.c:438 +#: app/menubar.c:464 msgid "/Edit/Pattern/_Copy" msgstr "" -#: app/menubar.c:439 +#: app/menubar.c:465 msgid "/Edit/Pattern/_Paste" msgstr "" -#: app/menubar.c:440 +#: app/menubar.c:466 msgid "/Edit/_Track" msgstr "" -#: app/menubar.c:441 +#: app/menubar.c:467 msgid "/Edit/Track/C_ut" msgstr "" -#: app/menubar.c:442 +#: app/menubar.c:468 msgid "/Edit/Track/_Copy" msgstr "" -#: app/menubar.c:443 +#: app/menubar.c:469 msgid "/Edit/Track/_Paste" msgstr "" -#: app/menubar.c:444 +#: app/menubar.c:470 msgid "/Edit/Track/_Insert" msgstr "" -#: app/menubar.c:445 +#: app/menubar.c:471 msgid "/Edit/Track/_Delete" msgstr "" -#: app/menubar.c:446 +#: app/menubar.c:472 msgid "/Edit/_Selection" msgstr "" -#: app/menubar.c:447 +#: app/menubar.c:473 msgid "/Edit/Selection/_Mark" msgstr "" -#: app/menubar.c:448 +#: app/menubar.c:474 msgid "/Edit/Selection/C_ut" msgstr "" -#: app/menubar.c:449 +#: app/menubar.c:475 msgid "/Edit/Selection/_Copy" msgstr "" -#: app/menubar.c:450 +#: app/menubar.c:476 msgid "/Edit/Selection/_Paste" msgstr "" -#: app/menubar.c:451 +#: app/menubar.c:477 msgid "/_Pattern" msgstr "" -#: app/menubar.c:452 +#: app/menubar.c:478 msgid "/Pattern/_Find Unused Pattern" msgstr "" -#: app/menubar.c:453 +#: app/menubar.c:479 msgid "/Pattern/_Copy Current to Unused Pattern" msgstr "" -#: app/menubar.c:454 +#: app/menubar.c:480 msgid "/Pattern/C_lear Unused Patterns" msgstr "" -#: app/menubar.c:455 +#: app/menubar.c:481 msgid "/Pattern/_Pack Patterns" msgstr "" -#: app/menubar.c:456 +#: app/menubar.c:482 msgid "/_Instrument" msgstr "" -#: app/menubar.c:457 +#: app/menubar.c:483 msgid "/Instrument/_Load XI..." msgstr "" -#: app/menubar.c:458 +#: app/menubar.c:484 msgid "/Instrument/_Save XI..." msgstr "" -#: app/menubar.c:459 app/menubar.c:461 +#: app/menubar.c:485 app/menubar.c:487 msgid "/Instrument/-" msgstr "" -#: app/menubar.c:460 +#: app/menubar.c:486 msgid "/Instrument/_Clear Current" msgstr "" -#: app/menubar.c:462 +#: app/menubar.c:488 msgid "/Instrument/_Delete Unused Instruments" msgstr "" -#: app/menubar.c:463 +#: app/menubar.c:489 msgid "/_Settings" msgstr "" -#: app/menubar.c:464 +#: app/menubar.c:490 msgid "/Settings/Display _Oscilloscopes" msgstr "" -#: app/menubar.c:465 -msgid "/Settings/Use _Backing Store" +#: app/menubar.c:491 +msgid "/Settings/_Tracker" +msgstr "" + +#: app/menubar.c:492 +msgid "/Settings/Tracker/Use _Backing Store" msgstr "" -#: app/menubar.c:466 app/menubar.c:470 +#: app/menubar.c:493 +msgid "/Settings/Tracker/_Previous font" +msgstr "" + +#: app/menubar.c:494 +msgid "/Settings/Tracker/_Next font" +msgstr "" + +#: app/menubar.c:495 app/menubar.c:499 msgid "/Settings/-" msgstr "" -#: app/menubar.c:467 +#: app/menubar.c:496 msgid "/Settings/_Keyboard Configuration..." msgstr "" -#: app/menubar.c:468 +#: app/menubar.c:497 msgid "/Settings/_Audio Configuration..." msgstr "" -#: app/menubar.c:469 +#: app/menubar.c:498 msgid "/Settings/_GUI Configuration..." msgstr "" -#: app/menubar.c:471 +#: app/menubar.c:500 msgid "/Settings/_Save Settings now" msgstr "" -#: app/menubar.c:472 +#: app/menubar.c:501 msgid "/Settings/Save Settings on _Exit" msgstr "" -#: app/menubar.c:473 +#: app/menubar.c:502 msgid "/_Help" msgstr "" -#: app/menubar.c:474 +#: app/menubar.c:503 msgid "/Help/_About..." msgstr "" -#: app/menubar.c:475 +#: app/menubar.c:504 msgid "/Help/-" msgstr "" -#: app/menubar.c:476 +#: app/menubar.c:505 msgid "/Help/Show _Tips..." msgstr "" -#: app/menubar.c:477 +#: app/menubar.c:506 msgid "/Help/_XM Effects..." msgstr "" @@ -1039,7 +1135,7 @@ msgid "Selection:" msgstr "" -#: app/sample-editor.c:263 +#: app/sample-editor.c:263 app/track-editor.c:168 app/track-editor.c:178 msgid "None" msgstr "" @@ -1127,19 +1223,19 @@ msgid "(no selection)" msgstr "" -#: app/sample-editor.c:1000 +#: app/sample-editor.c:999 msgid "" msgstr "" -#: app/sample-editor.c:1076 +#: app/sample-editor.c:1075 msgid "Read error." msgstr "" -#: app/sample-editor.c:1181 +#: app/sample-editor.c:1183 msgid "Load stereo sample" msgstr "" -#: app/sample-editor.c:1189 +#: app/sample-editor.c:1191 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1147,75 +1243,75 @@ "Please choose which channel to load:" msgstr "" -#: app/sample-editor.c:1200 +#: app/sample-editor.c:1202 msgid "Left" msgstr "" -#: app/sample-editor.c:1206 +#: app/sample-editor.c:1208 msgid "Mix" msgstr "" -#: app/sample-editor.c:1212 +#: app/sample-editor.c:1214 msgid "Right" msgstr "" -#: app/sample-editor.c:1251 +#: app/sample-editor.c:1253 msgid "Can't read sample" msgstr "" -#: app/sample-editor.c:1257 +#: app/sample-editor.c:1259 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "" -#: app/sample-editor.c:1271 +#: app/sample-editor.c:1273 msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "" -#: app/sample-editor.c:1370 +#: app/sample-editor.c:1376 msgid "Nothing to save." msgstr "" -#: app/sample-editor.c:1397 +#: app/sample-editor.c:1403 msgid "OK" msgstr "" -#: app/sample-editor.c:1405 +#: app/sample-editor.c:1411 msgid "Start sampling" msgstr "" -#: app/sample-editor.c:1440 app/sample-editor.c:1443 +#: app/sample-editor.c:1446 app/sample-editor.c:1449 msgid "Sampling Window" msgstr "" -#: app/sample-editor.c:1543 +#: app/sample-editor.c:1549 msgid "" msgstr "" -#: app/sample-editor.c:1573 +#: app/sample-editor.c:1579 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" -#: app/sample-editor.c:1605 +#: app/sample-editor.c:1611 msgid "Normalize" msgstr "" -#: app/sample-editor.c:1606 +#: app/sample-editor.c:1612 msgid "Execute" msgstr "" -#: app/sample-editor.c:1616 app/sample-editor.c:1619 +#: app/sample-editor.c:1622 app/sample-editor.c:1625 msgid "Volume Ramping" msgstr "" -#: app/sample-editor.c:1636 +#: app/sample-editor.c:1642 msgid "Perform linear volume fade on Selection" msgstr "" -#: app/sample-editor.c:1648 +#: app/sample-editor.c:1654 msgid "Left [%]:" msgstr "" -#: app/sample-editor.c:1653 +#: app/sample-editor.c:1659 msgid "Right [%]:" msgstr "" @@ -1269,14 +1365,263 @@ "instrument editor page." msgstr "" +#: app/track-editor.c:83 +msgid "Arpeggio" +msgstr "" + +#. 0 +#: app/track-editor.c:84 +msgid "Porta up" +msgstr "" + +#. 1 +#: app/track-editor.c:85 +msgid "Porta down" +msgstr "" + +#. 2 +#: app/track-editor.c:86 app/track-editor.c:150 +msgid "Tone porta" +msgstr "" + +#. 3 +#: app/track-editor.c:87 app/track-editor.c:146 +msgid "Vibrato" +msgstr "" + +#. 4 +#: app/track-editor.c:88 +msgid "Tone porta + Volume slide" +msgstr "" + +#. 5 +#: app/track-editor.c:89 +msgid "Vibrato + Volume slide" +msgstr "" + +#. 6 +#: app/track-editor.c:90 +msgid "Tremolo" +msgstr "" + +#. 7 +#: app/track-editor.c:91 app/track-editor.c:147 +msgid "Set panning" +msgstr "" + +#. 8 +#: app/track-editor.c:92 app/track-editor.c:94 +msgid "Position jump" +msgstr "" + +#. 9 +#: app/track-editor.c:93 app/track-editor.c:95 app/track-editor.c:171 +msgid "Set volume" +msgstr "" + +#. C +#: app/track-editor.c:96 +msgid "Pattern break" +msgstr "" + +#. D +#. E +#: app/track-editor.c:98 +msgid "Set tempo/bpm" +msgstr "" + +#. F +#: app/track-editor.c:99 +msgid "Set global volume" +msgstr "" + +#. G +#: app/track-editor.c:100 +msgid "Global volume slide" +msgstr "" + +#. H +#. I +#. J +#: app/track-editor.c:103 +msgid "Key off" +msgstr "" + +#. K +#: app/track-editor.c:104 +msgid "Set envelop position" +msgstr "" + +#. L +#. M +#. N +#. O #: app/track-editor.c:108 +msgid "Panning slide" +msgstr "" + +#. P +#: app/track-editor.c:109 +msgid "LP filter resonance" +msgstr "" + +#. Q +#: app/track-editor.c:110 +msgid "Multi retrig note" +msgstr "" + +#. R +#. S +#: app/track-editor.c:112 +msgid "Tremor" +msgstr "" + +#. T +#. U +#. V +#. W +#. X +#. Y +#: app/track-editor.c:118 +msgid "LP filter cutoff" +msgstr "" + +#. 0 +#: app/track-editor.c:123 +msgid "Fine porta up" +msgstr "" + +#. 1 +#: app/track-editor.c:124 +msgid "Fine porta down" +msgstr "" + +#. 2 +#: app/track-editor.c:125 +msgid "Set gliss control" +msgstr "" + +#. 3 +#: app/track-editor.c:126 +msgid "Set vibrato control" +msgstr "" + +#. 4 +#: app/track-editor.c:127 +msgid "Set finetune" +msgstr "" + +#. 5 +#: app/track-editor.c:128 +msgid "Set loop begin/loop" +msgstr "" + +#. 6 +#: app/track-editor.c:129 +msgid "Set tremolo control" +msgstr "" + +#. 7 +#. 8 +#: app/track-editor.c:131 +msgid "Retrig note" +msgstr "" + +#. 9 +#: app/track-editor.c:132 app/track-editor.c:144 +msgid "Fine volume slide up" +msgstr "" + +#. A +#: app/track-editor.c:133 app/track-editor.c:143 +msgid "Fine volume slide down" +msgstr "" + +#. B +#: app/track-editor.c:134 +msgid "Note cut" +msgstr "" + +#. C +#: app/track-editor.c:135 +msgid "Note delay" +msgstr "" + +#. D +#: app/track-editor.c:136 +msgid "Pattern delay" +msgstr "" + +#: app/track-editor.c:141 +msgid "Volume slide down" +msgstr "" + +#: app/track-editor.c:142 +msgid "Volume slide up" +msgstr "" + +#: app/track-editor.c:145 +msgid "Set vibrato speed" +msgstr "" + +#: app/track-editor.c:148 +msgid "Panning slide left" +msgstr "" + +#: app/track-editor.c:149 +msgid "Panning slide right" +msgstr "" + +#: app/track-editor.c:154 +msgid "sine" +msgstr "" + +#. 0 +#: app/track-editor.c:155 +msgid "ramp down" +msgstr "" + +#. 1 +#: app/track-editor.c:156 +msgid "square" +msgstr "" + +#: app/track-editor.c:331 msgid "Jazz Edit:" msgstr "" -#: app/track-editor.c:147 +#: app/track-editor.c:373 msgid "Tracker" msgstr "" +#: app/tracker-settings.c:233 +msgid "Font list" +msgstr "" + +#: app/tracker-settings.c:257 +msgid "Add font" +msgstr "" + +#: app/tracker-settings.c:263 +msgid "Delete font" +msgstr "" + +#: app/tracker-settings.c:269 +msgid "Apply font" +msgstr "" + +#: app/tracker-settings.c:284 +msgid "Up" +msgstr "" + +#: app/tracker-settings.c:287 +msgid "Down" +msgstr "" + +#: app/tracker-settings.c:290 +msgid "Select font..." +msgstr "" + #: app/transposition.c:166 msgid "Whole Song" msgstr "" @@ -1353,48 +1698,48 @@ msgid "Instrument 2:" msgstr "" -#: app/xm.c:170 +#: app/xm.c:171 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "" -#: app/xm.c:455 app/xm.c:526 +#: app/xm.c:456 app/xm.c:527 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "" -#: app/xm.c:486 +#: app/xm.c:487 msgid "File is no XI instrument." msgstr "" -#: app/xm.c:496 +#: app/xm.c:497 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "" -#: app/xm.c:787 app/xm.c:901 +#: app/xm.c:790 app/xm.c:908 msgid "Error while loading patterns." msgstr "" -#: app/xm.c:851 +#: app/xm.c:858 msgid "Can't open file" msgstr "" -#: app/xm.c:865 +#: app/xm.c:872 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" -#: app/xm.c:907 +#: app/xm.c:914 msgid "Error while loading instruments." msgstr "" -#: app/xm.c:918 +#: app/xm.c:925 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" "Maximum sample length is %d." msgstr "" -#: app/xm.c:1234 +#: app/xm.c:1247 msgid "No FastTracker XM and no supported MOD format!" msgstr "" diff -urN soundtracker-0.5.0/soundtracker.spec soundtracker-0.5.1/soundtracker.spec --- soundtracker-0.5.0/soundtracker.spec Mon Mar 13 14:02:01 2000 +++ soundtracker-0.5.1/soundtracker.spec Sat Mar 25 11:30:26 2000 @@ -1,6 +1,6 @@ %define name soundtracker -%define version 0.5.0 -%define release 12 +%define version 0.5.1 +%define release 13 %define prefix /usr Summary: Sound modules editor/player @@ -13,7 +13,7 @@ Url: http://www.soundtracker.org/ -Source: ftp://ftp.soundtracker.org/pub/soundtracker/v0.3/soundtracker-%{version}.tar.gz +Source: ftp://ftp.soundtracker.org/pub/soundtracker/v0.5/soundtracker-%{version}.tar.gz Buildroot: /var/tmp/%{name}-%{version}-%{release}-root %description @@ -26,7 +26,7 @@ %setup %build -LINGUAS="de es it pl ja ru" CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} +LINGUAS="de es fr it pl ja ru" CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} gmake %install