diff -urN soundtracker-0.6.1/AUTHORS soundtracker-0.6.2/AUTHORS --- soundtracker-0.6.1/AUTHORS Fri Oct 20 18:28:43 2000 +++ soundtracker-0.6.2/AUTHORS Wed Jan 3 14:46:41 2001 @@ -89,6 +89,7 @@ Michael Shigorin (ru) Saïd Bougribate +??? (fr) Matej Erman (sl) diff -urN soundtracker-0.6.1/ChangeLog soundtracker-0.6.2/ChangeLog --- soundtracker-0.6.1/ChangeLog Sun Oct 22 20:45:48 2000 +++ soundtracker-0.6.2/ChangeLog Wed Jan 3 15:03:54 2001 @@ -1,3 +1,49 @@ +2001-01-03 Michael Krause + + * Released v0.6.2 + +2000-12-27 Michael Krause + + * app/sample-editor.c (sample_editor_save_wav_main): Check for + existence of dynamic loader functions, and use audiofile-0.2.0 + code if not. + +2000-12-23 Michael Krause + + * app/sample-editor.c (sample_editor_save_wav_main): Fix sample + format initialization for libaudiofile-0.2.0. + +2000-12-20 Michael Krause + + * app/tracker-settings.c (trackersettings_read_fontlist), + app/tracker.c (tracker_init): Default font is now 'fixed'. 7x13 + appears not to be present on all X installations (Florian Heinz + ) pointed this out. + +2000-12-16 Michael Krause + + * app/fr.po: Updated french translation (XxKarLKoXxX@aol.com) + +2000-12-09 Rob Adamson + + * app/xm.c: Escape filenames that are passed to the shell for + decompressing. + +2000-10-30 Michael Krause + + * app/gui.c (keyevent): Removed old "capture_keys" logic, and + replaced it by a simple check if the window's current focus lies + on an entry widget. Finally, the spin buttons are editable using + the keyboard! + + * app/gui.c: Replaced all gtk_spin_button_new() by + extspinbutton_new() plus disabled size hack (in order to get the + "changed" callback mentioned below into effect). + + * app/extspinbutton.c: Added option to disable the horizontal size + hack, and added "changed" callback that immediately removes focus + from widget if the value has been changed using the mouse. + 2000-10-22 Michael Krause * Released v0.6.1 diff -urN soundtracker-0.6.1/INSTALL soundtracker-0.6.2/INSTALL --- soundtracker-0.6.1/INSTALL Sun Sep 24 14:24:35 2000 +++ soundtracker-0.6.2/INSTALL Wed Jan 3 14:11:31 2001 @@ -11,6 +11,7 @@ - optionally, audiofile library 0.1.5 audiofile-config --version (available from http://www.68k.org/~michael/audiofile/) + (versions 0.2.0+ are also supported) - optionally, GNOME 1.0.1 gnome-config --version (available from http://www.gnome.org/) @@ -80,9 +81,9 @@ --------------------------------------------------- Note that this binary is compiled without GNOME and NLS support, and -linked against glibc-2.1 and gtk+-1.2 (it will probably work on -glibc-2.0 systems as well). If you want GNOME or NLS support, compile -the package on your own, or get the RPM package. +linked against glibc-2.1, gtk+-1.2 and audiofile-0.1 (it will probably +work on glibc-2.0 systems as well). If you want GNOME or NLS support, +compile the package on your own, or get the RPM package. 1. Copy the soundtracker executable to /usr/local/bin. diff -urN soundtracker-0.6.1/Makefile.am soundtracker-0.6.2/Makefile.am --- soundtracker-0.6.1/Makefile.am Sat May 27 10:52:30 2000 +++ soundtracker-0.6.2/Makefile.am Tue Oct 24 20:36:41 2000 @@ -31,9 +31,9 @@ ## disthelp is to be executed by root so that the rpm -tb works well disthelp: make dist - cp soundtracker-$(VERSION).tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.5/ + cp soundtracker-$(VERSION).tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.6/ make bindist - cp soundtracker-$(VERSION)-bin.tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.5/ + cp soundtracker-$(VERSION)-bin.tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.6/ /home/rawstyle/dev/soundtracker/bin/rpm -tb soundtracker-$(VERSION).tar.gz - cp /usr/src/packages/RPMS/i386/soundtracker-$(VERSION)-* /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.5/ + cp /usr/src/packages/RPMS/i386/soundtracker-$(VERSION)-* /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.6/ chown -R rawstyle.users /home/rawstyle/dev/soundtracker/* diff -urN soundtracker-0.6.1/Makefile.in soundtracker-0.6.2/Makefile.in --- soundtracker-0.6.1/Makefile.in Fri Oct 20 18:31:08 2000 +++ soundtracker-0.6.2/Makefile.in Wed Jan 3 15:04:15 2001 @@ -422,11 +422,11 @@ disthelp: make dist - cp soundtracker-$(VERSION).tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.5/ + cp soundtracker-$(VERSION).tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.6/ make bindist - cp soundtracker-$(VERSION)-bin.tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.5/ + cp soundtracker-$(VERSION)-bin.tar.gz /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.6/ /home/rawstyle/dev/soundtracker/bin/rpm -tb soundtracker-$(VERSION).tar.gz - cp /usr/src/packages/RPMS/i386/soundtracker-$(VERSION)-* /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.5/ + cp /usr/src/packages/RPMS/i386/soundtracker-$(VERSION)-* /home/rawstyle/dev/soundtracker/FTP/soundtracker/v0.6/ chown -R rawstyle.users /home/rawstyle/dev/soundtracker/* # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN soundtracker-0.6.1/NEWS soundtracker-0.6.2/NEWS --- soundtracker-0.6.1/NEWS Sun Oct 22 20:45:39 2000 +++ soundtracker-0.6.2/NEWS Wed Jan 3 14:52:41 2001 @@ -4,6 +4,17 @@ responsible for having coded a particular feature (full names in AUTHORS file). +What is new in soundtracker-0.6.2 (03-Jan-2001): + +* All spin buttons can be edited with the keyboard now, + and some weird situations in which the widget focus was "trapped" in + these widgets are prevented +* Fixes for libaudiofile-0.2 +* Filename escaping for the archive loader +* Updated french translation +* Default font is 'fixed' instead of '7x13' which is not + present everywhere + What is new in soundtracker-0.6.1 (22-Oct-2000): * MIDI updates (doesn't require GNOME any longer) (ltanguay) diff -urN soundtracker-0.6.1/README soundtracker-0.6.2/README --- soundtracker-0.6.1/README Sun Oct 22 20:43:00 2000 +++ soundtracker-0.6.2/README Wed Jan 3 14:11:59 2001 @@ -4,9 +4,9 @@ http://www.soundtracker.org/ -------------------------------------------------------------- - v0.6.1 + v0.6.2 - Written and (C) 1998-2000 + Written and (C) 1998-2001 by Michael Krause [ raw style / lego ] m.krause@tu-harburg.de, http://www.tu-harburg.de/~semk2104/ @@ -209,3 +209,25 @@ Once you have joined `soundtracker-discuss', you can send mails to the list by writing to `soundtracker-discuss@soundtracker.org'. + + +CVS REPOSITORY +============== + +If you always want the latest and greatest, check out the current +development status through CVS. + +So, if you want to give it a try (from SourceForge CVS howto): + + cvs -d:pserver:anonymous@cvs.soundtracker.sourceforge.net:/cvsroot/soundtracker login + +After anonymously logging in: + + cvs -z8 -d:pserver:anonymous@cvs.soundtracker.sourceforge.net:/cvsroot/soundtracker co soundtracker + +After the initial checkout, you can change into this directory and +execute cvs commands without the -d option. For example: + + cvs update + +Watch the ChangeLog for detailed information about what has changed. diff -urN soundtracker-0.6.1/TODO soundtracker-0.6.2/TODO --- soundtracker-0.6.1/TODO Fri Oct 20 18:35:06 2000 +++ soundtracker-0.6.2/TODO Sat Dec 23 15:48:37 2000 @@ -1,236 +1,2 @@ -things to do and known bugs (in no particular order) -------------------------------------------------------- - -NOTE: If you want to work on SoundTracker, try to get the latest -development version (v0.7.x). - - - - -=== GTK+ / GNOME bugs ===== - -bug: start st, go to instrument page, go back to tracker page, hit -shift+space. jazz edit box is NOT displayed, this works only after -you use the menu bar once to toggle the box on. ---> BUG IN -GTK+/GNOME: in keyevent, the events are not being stopped, so _my_ -code is not buggy. If you change the responsible key combo from -"Shift+Space" to something else, for example "Ctrl+R", it works -without problems. - - - -====== GUI ========= - -What about a "Name Pattern" feature which allows you to attach names to any pattern you like, so -that they can be more easily recognised? I`m sure that this info could cimply be appended to any -.xm file therefore not making it unreadable by other trackers. You see, i`m making a mod at the -moment which is kind of a mess, and i`m constantly getting lost... ;) -The right place for the widget for this would be in the Tracker page -of the main window. Also, the pattern length widget should be there -rather than in the upper part of the main window. We could also have -the "number of channels" spin down there and make it a per-pattern -property. - -> 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. -> It's more keystrokes but less flipping through groups of samples. - -filereq: show only *.xm, *.zip etc. - -right-shift: start playing and editing, with scrolling -enabled. optional quantization. - -statusbar: gtk_widget_usize() on gtk_clock is ugly... - -> * '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 - -> I think it would be nice, if you had an option to load only the samples -> from a module, not the whole module, just like in my old OctaMed. - -delink / link tab!!! - -MAIN WINDOW "CONTROL PANEL": the scopes must be able to be replaced by -an instrument list or something similarly useful in case you don't -want the scopes there. the scopes could be put into their own window -or to the pre-0.1.1 position then. - -SAMPLE LIST: like in good old MED - -TRACKER WIDGET: should work with arbitrary note types, effects, and so -on. should support per-cell background/foreground colors, fonts -should be configurable etc. extend xmnote. - -CLAVIER: highlight currently played notes! - -GUI-SETTINGS / TRACKER: h <-> b - -GNOME / AUTOMAKE: Use official gnome macros instead of the xchat -configure.in code (but that sucks, since it's so much, -cf. gnome-libs-2 proposal) - -SAMPLE EDITOR: lowpass / highpass / bandpass, mix two samples, -resampling functions. - -SCOPE GROUP: toggle display of channel numbers. - -PLAYLIST WIDGET: write a playlist widget which always displays the -current pattern in the middle of the scrollable area (can be used for -the numerical envelope editor, too??). make this configurable: -protracker (current one) or fasttracker like playlist. ONLY -PLAYLIST.[CH] HAVE TO BE ALTERED. - -GUI: assign samples to numberpad. Then numberpad could act as a -drumpad (one key plays given sample at given frequency). -> you could add a bass drum to "7", snare to "8", closed hat to "9", ride to -> "4", timpany G to "5", etc.. all at the correct note for that sample. -> Then you just switch to edit mode and knock out a drum beat with single -> keypresses! - -LOGO: add it somewhere - -> - editor should be colourful (customize colors of samples, commands) - -ENVELOPE-BOX: add a kind of "mixer position" like display - -ENVELOPE-BOX: make sustain and loop points graphically editable - -ENVELOPE-BOX: provide some standard curves - -some kind of undo, especially for block operations - -> ctrl+d - file requester -> ctrl+t - tracker -> ctrl+i - instrument editor -> ctrl+s - sample editor -> ctrl+m - module info - -file-operations: after saving, the directory must be rescanned! -unfortunately, there's no gtk+ call for this :( - -> - IT has different shortcuts for selections: -> alt-b (begin) alt-e (end) -> alt-l (whole column) alt-l twice (whole pattern) -> alt-k in the volume column slides the volume in the selection -> alt-x in the effect column slides the effects in the selection -> alt-x twice wipe out all effect data -> shift while pressing a note scrolls to the next column (depressing -> shift returns to the original position) this is useful for chords. -> 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. - -> (4) there are several people in the todo list that are asking "why don't you -> make the keys more like scream tracker?" or "why don't you make the keys more -> like impulse tracker?" I know you are trying to emulate the fasttracker 2 -> setup (at least to a degree) and I like the ft2 key layout the best, but -> maybe a way to make everyone happy would be to make something in the layout -> settings that says "make key layouts resemble:" and pulldown menu or -> selection menu for ft2, st3, it, pt, etc..? ->-----> need to put ALL the keys handling to keys.c (no more GDK_* cases in ->track-editor.c, for example) - -tracker: some fonts (for example lucida console 80) report strange -font heights so that the tracker's rows overlap sometimes. or am i -miscalculating something? - - -====== PLAYER / LOADER ======== - -check endianness conversion for {audiofile / raw} sample {loader / saver}. - -load 15 sample mods - -iff loading - -XM.C / MOD LOADER: mod.Anette has strange loop points - -PLAYER BUGS: e96-sache in flowerpower.main!, mod.rstchip.09, -mod.savage, spotlight madmix, alice d., abyss-tr -- fix note -retriggering when only instrument column is set. - -mod saver - -GUS patch (.pat) loading - - -====== MIXER ====== - -the idea of having mixer modules is a bit silly, especially when the -mixer has to do more jobs than now. - -virtual channel support (for impulse tracker modules) - -sample-stream input support (as opposed to fixed samples) -- then it's -only a short way to unit-generator support such as Buzz or Octal have -it. - -(global filter, kb's xm extension) - - -====== DRIVERS ======= - -OSS-OUTPUT.C: make preferences come in effect immediately, without -having to restart the song. - -OSS-INPUT.C: add settings widget, including sampling source and volume -slider. - -SAMPLE-EDITOR.C / SAMPLING: support for other formats than 16 bit / -mono. - -drivers/file-output.c::file_open(): check if the user is allowed to -create the file first! - -file output: some users report that the generated WAV has a lower -quality than direct output?!? - -esd output: --espeaker command line option doesn't work (but is -displayed in --help output). - - -====== MISC ====== - -idea why realtime scheduling doesn't work: mutexes in player thread -are spinloops, so they take up 100% cpu time when waiting and the main -thread can't release the mutexes. - -> >From within soundtracker, it is possible to render the module -> as wav. My question is: Is it also possible to -> do it from the (Unix) command line? Something like -> `soundtracker --render song.xm song.wav' ? - -extend tips dialog - -scopes under irix with integer32 don't work - -nls under irix doesn't work - -save wav's with a sample rate that would be set by the xm player at -C-6. - - - -====== FUTURE ======= - -MIDI out - -Module format plugins (Might be interesting to see what the -linux-audio-dev guys are developing) - -MIXER: the pitchbend function is cool. what would be even cooler is if -SoundTracker could play two mods simultaneously; it could be used as a -pseudo-turntable module mixer then. something i always wanted to do. +If you want to work on SoundTracker, get the latest development +version (v0.7.x) or check out the CVS repository. diff -urN soundtracker-0.6.1/app/Makefile.in soundtracker-0.6.2/app/Makefile.in --- soundtracker-0.6.1/app/Makefile.in Fri Oct 20 18:31:24 2000 +++ soundtracker-0.6.2/app/Makefile.in Wed Jan 3 15:04:26 2001 @@ -316,6 +316,112 @@ || exit 1; \ fi; \ done +audio.o: audio.c ../config.h poll.h i18n.h audio.h mixer.h driver-out.h \ + driver.h preferences.h time-buffer.h event-waiter.h main.h xm.h \ + xm-player.h endian-conv.h scope-group.h sample-display.h \ + errors.h gui-settings.h +audioconfig.o: audioconfig.c ../config.h i18n.h audioconfig.h gui-subs.h \ + audio.h mixer.h driver-out.h driver.h preferences.h \ + time-buffer.h event-waiter.h sample-editor.h xm.h driver-in.h \ + gui.h +cheat-sheet.o: cheat-sheet.c ../config.h i18n.h +clavier.o: clavier.c clavier.h +endian-conv.o: endian-conv.c ../config.h endian-conv.h +envelope-box.o: envelope-box.c ../config.h i18n.h gui-subs.h \ + envelope-box.h xm.h mixer.h gui-settings.h +errors.o: errors.c audio.h mixer.h driver-out.h driver.h preferences.h \ + time-buffer.h event-waiter.h +event-waiter.o: event-waiter.c event-waiter.h +extspinbutton.o: extspinbutton.c extspinbutton.h gui.h gui-subs.h \ + audio.h mixer.h driver-out.h driver.h preferences.h \ + time-buffer.h event-waiter.h +file-operations.o: file-operations.c ../config.h i18n.h \ + file-operations.h keys.h track-editor.h tracker.h xm.h mixer.h \ + tracker-settings.h gui-subs.h gui.h audio.h driver-out.h \ + driver.h preferences.h time-buffer.h event-waiter.h errors.h +gui-settings.o: gui-settings.c ../config.h i18n.h gui.h gui-subs.h \ + audio.h mixer.h driver-out.h driver.h preferences.h \ + time-buffer.h event-waiter.h gui-settings.h scope-group.h \ + sample-display.h track-editor.h tracker.h xm.h \ + tracker-settings.h extspinbutton.h +gui-subs.o: gui-subs.c ../config.h i18n.h gui.h gui-subs.h audio.h \ + mixer.h driver-out.h driver.h preferences.h time-buffer.h \ + event-waiter.h extspinbutton.h +gui.o: gui.c ../config.h poll.h i18n.h gui.h gui-subs.h audio.h mixer.h \ + driver-out.h driver.h preferences.h time-buffer.h \ + event-waiter.h xm.h st-subs.h xm-player.h tracker.h main.h \ + keys.h instrument-editor.h sample-editor.h driver-in.h \ + track-editor.h tracker-settings.h scope-group.h \ + sample-display.h module-info.h menubar.h tips-dialog.h \ + gui-settings.h file-operations.h playlist.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 audio.h driver-out.h driver.h preferences.h \ + time-buffer.h event-waiter.h keys.h track-editor.h tracker.h \ + tracker-settings.h clavier.h errors.h sample-editor.h \ + driver-in.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 audio.h \ + mixer.h driver-out.h driver.h preferences.h time-buffer.h \ + event-waiter.h menubar.h +main.o: main.c ../config.h i18n.h gui.h gui-subs.h audio.h mixer.h \ + driver-out.h driver.h preferences.h time-buffer.h \ + event-waiter.h xm.h keys.h gui-settings.h audioconfig.h \ + tips-dialog.h menubar.h track-editor.h tracker.h \ + tracker-settings.h midi.h midi-settings.h +menubar.o: menubar.c ../config.h i18n.h menubar.h gui.h gui-subs.h \ + audio.h mixer.h driver-out.h driver.h preferences.h \ + time-buffer.h event-waiter.h main.h xm.h st-subs.h keys.h \ + module-info.h scope-group.h sample-display.h track-editor.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 midi-settings.h +midi-settings.o: midi-settings.c ../config.h +midi-utils.o: midi-utils.c ../config.h +midi.o: midi.c ../config.h +module-info.o: module-info.c i18n.h ../config.h module-info.h gui.h \ + gui-subs.h audio.h mixer.h driver-out.h driver.h preferences.h \ + time-buffer.h event-waiter.h xm.h st-subs.h main.h \ + sample-editor.h driver-in.h instrument-editor.h keys.h \ + track-editor.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 ../config.h i18n.h gui-subs.h preferences.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 preferences.h st-subs.h gui.h \ + gui-subs.h audio.h driver-out.h time-buffer.h event-waiter.h \ + instrument-editor.h sample-display.h endian-conv.h keys.h \ + track-editor.h tracker.h tracker-settings.h errors.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 preferences.h \ + time-buffer.h event-waiter.h gui-subs.h gui-settings.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 \ + tracker.h xm.h mixer.h tracker-settings.h gui.h gui-subs.h \ + audio.h driver-out.h driver.h preferences.h time-buffer.h \ + event-waiter.h st-subs.h keys.h xm-player.h main.h \ + gui-settings.h menubar.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 +tracker.o: tracker.c tracker.h xm.h mixer.h main.h gui-settings.h +transposition.o: transposition.c i18n.h ../config.h transposition.h \ + main.h xm.h mixer.h gui-subs.h gui.h audio.h driver-out.h \ + driver.h preferences.h time-buffer.h event-waiter.h st-subs.h \ + track-editor.h tracker.h tracker-settings.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 preferences.h \ + time-buffer.h event-waiter.h +xm.o: xm.c i18n.h ../config.h gui-settings.h xm.h mixer.h xm-player.h \ + endian-conv.h st-subs.h recode.h errors.h audio.h driver-out.h \ + driver.h preferences.h time-buffer.h event-waiter.h + info-am: info: info-recursive dvi-am: diff -urN soundtracker-0.6.1/app/audio.c soundtracker-0.6.2/app/audio.c --- soundtracker-0.6.1/app/audio.c Mon Sep 25 12:33:15 2000 +++ soundtracker-0.6.2/app/audio.c Wed Jan 3 14:24:06 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Audio handling thread * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/audio.h soundtracker-0.6.2/app/audio.h --- soundtracker-0.6.1/app/audio.h Mon Sep 25 12:26:58 2000 +++ soundtracker-0.6.2/app/audio.h Wed Jan 3 14:24:06 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Audio handling thread (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/audioconfig.c soundtracker-0.6.2/app/audioconfig.c --- soundtracker-0.6.1/app/audioconfig.c Tue Sep 19 17:00:48 2000 +++ soundtracker-0.6.2/app/audioconfig.c Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Audio configuration dialog * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/audioconfig.h soundtracker-0.6.2/app/audioconfig.h --- soundtracker-0.6.1/app/audioconfig.h Sun Mar 12 19:57:29 2000 +++ soundtracker-0.6.2/app/audioconfig.h Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Audio configuration dialog (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/cheat-sheet.c soundtracker-0.6.2/app/cheat-sheet.c --- soundtracker-0.6.1/app/cheat-sheet.c Wed May 10 16:14:31 2000 +++ soundtracker-0.6.2/app/cheat-sheet.c Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - XM effects cheat sheet * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/cheat-sheet.h soundtracker-0.6.2/app/cheat-sheet.h --- soundtracker-0.6.1/app/cheat-sheet.h Sat Feb 19 11:58:35 2000 +++ soundtracker-0.6.2/app/cheat-sheet.h Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - XM effects cheat sheet (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/clavier.c soundtracker-0.6.2/app/clavier.c --- soundtracker-0.6.1/app/clavier.c Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/clavier.c Wed Jan 3 14:24:07 2001 @@ -1,6 +1,6 @@ /* clavier.c - GTK+ "Clavier" Widget -- based on clavier-0.1.3 * Copyright (C) 1998 Simon Kågedal - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/clavier.h soundtracker-0.6.2/app/clavier.h --- soundtracker-0.6.1/app/clavier.h Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/clavier.h Wed Jan 3 14:24:07 2001 @@ -1,6 +1,6 @@ /* clavier.h - GTK+ "Clavier" Widget * Copyright (C) 1998 Simon Kågedal - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/driver-in.h soundtracker-0.6.2/app/driver-in.h --- soundtracker-0.6.1/app/driver-in.h Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/driver-in.h Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Input (sampling) driver module definitions * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/driver-out.h soundtracker-0.6.2/app/driver-out.h --- soundtracker-0.6.1/app/driver-out.h Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/driver-out.h Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Output driver module definitions * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/driver.h soundtracker-0.6.2/app/driver.h --- soundtracker-0.6.1/app/driver.h Tue Sep 19 16:57:11 2000 +++ soundtracker-0.6.2/app/driver.h Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Common driver module definitions * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/drivers/Makefile.in soundtracker-0.6.2/app/drivers/Makefile.in --- soundtracker-0.6.1/app/drivers/Makefile.in Fri Oct 20 18:31:25 2000 +++ soundtracker-0.6.2/app/drivers/Makefile.in Wed Jan 3 15:04:28 2001 @@ -218,6 +218,27 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done +alsa-input.o: alsa-input.c ../../config.h +alsa-output.o: alsa-output.c ../../config.h +alsa2-input.o: alsa2-input.c ../../config.h +alsa2-output.o: alsa2-output.c ../../config.h +dsound-output.o: dsound-output.c ../../config.h +dummy-drivers.o: dummy-drivers.c ../../config.h ../i18n.h ../driver-in.h \ + ../driver.h ../preferences.h ../driver-out.h +esd-output.o: esd-output.c ../../config.h ../i18n.h ../driver-out.h \ + ../driver.h ../preferences.h ../mixer.h ../errors.h \ + ../gui-subs.h +file-output.o: file-output.c ../../config.h ../i18n.h ../driver-out.h \ + ../driver.h ../preferences.h ../mixer.h ../errors.h \ + ../gui-subs.h +irix-output.o: irix-output.c ../../config.h +oss-input.o: oss-input.c ../../config.h ../i18n.h ../driver-in.h \ + ../driver.h ../preferences.h ../mixer.h ../errors.h \ + ../gui-subs.h +oss-output.o: oss-output.c ../../config.h ../i18n.h ../driver-out.h \ + ../driver.h ../preferences.h ../mixer.h ../errors.h \ + ../gui-subs.h + info-am: info: info-am dvi-am: diff -urN soundtracker-0.6.1/app/drivers/dummy-drivers.c soundtracker-0.6.2/app/drivers/dummy-drivers.c --- soundtracker-0.6.1/app/drivers/dummy-drivers.c Sun Sep 24 18:19:39 2000 +++ soundtracker-0.6.2/app/drivers/dummy-drivers.c Wed Jan 3 14:24:11 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Dummy drivers * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 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 diff -urN soundtracker-0.6.1/app/drivers/esd-output.c soundtracker-0.6.2/app/drivers/esd-output.c --- soundtracker-0.6.1/app/drivers/esd-output.c Tue Sep 19 16:59:18 2000 +++ soundtracker-0.6.2/app/drivers/esd-output.c Wed Jan 3 14:24:11 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - ESD (output) driver. * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/drivers/file-output.c soundtracker-0.6.2/app/drivers/file-output.c --- soundtracker-0.6.1/app/drivers/file-output.c Tue Sep 19 16:59:18 2000 +++ soundtracker-0.6.2/app/drivers/file-output.c Wed Jan 3 14:24:11 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - File (output) driver. * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/drivers/irix-output.c soundtracker-0.6.2/app/drivers/irix-output.c --- soundtracker-0.6.1/app/drivers/irix-output.c Sun Sep 24 22:50:08 2000 +++ soundtracker-0.6.2/app/drivers/irix-output.c Wed Jan 3 14:24:11 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - IRIX 5.x (output) driver. * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 Michael Krause * Inspired by libmikmod's drv_sgi.c * * This program is free software; you can redistribute it and/or modify diff -urN soundtracker-0.6.1/app/drivers/oss-input.c soundtracker-0.6.2/app/drivers/oss-input.c --- soundtracker-0.6.1/app/drivers/oss-input.c Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/drivers/oss-input.c Wed Jan 3 14:24:11 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - OSS (input) driver. * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/drivers/oss-output.c soundtracker-0.6.2/app/drivers/oss-output.c --- soundtracker-0.6.1/app/drivers/oss-output.c Sun Sep 24 18:23:16 2000 +++ soundtracker-0.6.2/app/drivers/oss-output.c Wed Jan 3 14:24:11 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - OSS (output) driver. * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/endian-conv.c soundtracker-0.6.2/app/endian-conv.c --- soundtracker-0.6.1/app/endian-conv.c Mon Sep 25 12:05:51 2000 +++ soundtracker-0.6.2/app/endian-conv.c Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Endianness conversion * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/endian-conv.h soundtracker-0.6.2/app/endian-conv.h --- soundtracker-0.6.1/app/endian-conv.h Mon Sep 25 12:06:21 2000 +++ soundtracker-0.6.2/app/endian-conv.h Wed Jan 3 14:24:07 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Endianness conversion * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/envelope-box.c soundtracker-0.6.2/app/envelope-box.c --- soundtracker-0.6.1/app/envelope-box.c Tue Sep 19 16:30:30 2000 +++ soundtracker-0.6.2/app/envelope-box.c Wed Jan 3 14:34:51 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ envelope editor box * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/envelope-box.h soundtracker-0.6.2/app/envelope-box.h --- soundtracker-0.6.1/app/envelope-box.h Sun Mar 26 12:03:07 2000 +++ soundtracker-0.6.2/app/envelope-box.h Wed Jan 3 14:24:08 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ envelope editor box (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/errors.c soundtracker-0.6.2/app/errors.c --- soundtracker-0.6.1/app/errors.c Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/errors.c Wed Jan 3 14:24:08 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - error handling functions * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/errors.h soundtracker-0.6.2/app/errors.h --- soundtracker-0.6.1/app/errors.h Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/errors.h Wed Jan 3 14:24:08 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - error handling functions (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/event-waiter.c soundtracker-0.6.2/app/event-waiter.c --- soundtracker-0.6.1/app/event-waiter.c Sun Sep 17 18:02:10 2000 +++ soundtracker-0.6.2/app/event-waiter.c Wed Jan 3 14:24:08 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - event waiter * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 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 diff -urN soundtracker-0.6.1/app/event-waiter.h soundtracker-0.6.2/app/event-waiter.h --- soundtracker-0.6.1/app/event-waiter.h Sun Sep 17 18:01:05 2000 +++ soundtracker-0.6.2/app/event-waiter.h Wed Jan 3 14:24:08 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - event waiter (header) * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 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 diff -urN soundtracker-0.6.1/app/extspinbutton.c soundtracker-0.6.2/app/extspinbutton.c --- soundtracker-0.6.1/app/extspinbutton.c Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/extspinbutton.c Wed Jan 3 14:35:01 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ Spinbutton extensions * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 @@ -22,6 +22,7 @@ #include #include "extspinbutton.h" +#include "gui.h" /* These two defines have been taken from gtkspinbutton.c in gtk+-1.2.1 Unfortunately there's no cleaner solution */ @@ -52,13 +53,27 @@ GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); - requisition->width = MAX (MIN_SPIN_BUTTON_WIDTH, - extspinbutton_find_display_digits(GTK_SPIN_BUTTON(widget)->adjustment) - * gdk_string_width(widget->style->font, "X")) - + ARROW_SIZE - + 2 * widget->style->klass->xthickness; + if(EXTSPINBUTTON(widget)->size_hack) { + requisition->width = MAX (MIN_SPIN_BUTTON_WIDTH, + extspinbutton_find_display_digits(GTK_SPIN_BUTTON(widget)->adjustment) + * gdk_string_width(widget->style->font, "X")) + + ARROW_SIZE + + 2 * widget->style->klass->xthickness; + } else { + // This is the normal size_request() from gtk+-1.2.8 + requisition->width = MIN_SPIN_BUTTON_WIDTH + ARROW_SIZE + + 2 * widget->style->klass->xthickness; + } } +static void +extspinbutton_value_changed (GtkSpinButton *spin) +{ + if(spin->button != 0) { + // Should only do this if this widget is really in the main window. + gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); + } +} GtkWidget * extspinbutton_new (GtkAdjustment *adjustment, @@ -68,9 +83,19 @@ ExtSpinButton *s; s = gtk_type_new(extspinbutton_get_type()); + s->size_hack = TRUE; gtk_spin_button_configure(GTK_SPIN_BUTTON(s), adjustment, climb_rate, digits); + gtk_signal_connect(GTK_OBJECT(s), "changed", + GTK_SIGNAL_FUNC(extspinbutton_value_changed), NULL); + return GTK_WIDGET(s); +} + +void +extspinbutton_disable_size_hack (ExtSpinButton *b) +{ + b->size_hack = FALSE; } static void diff -urN soundtracker-0.6.1/app/extspinbutton.h soundtracker-0.6.2/app/extspinbutton.h --- soundtracker-0.6.1/app/extspinbutton.h Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/extspinbutton.h Wed Jan 3 12:20:49 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ Spinbutton extensions (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 @@ -34,6 +34,8 @@ struct _ExtSpinButton { GtkSpinButton spin; + + gboolean size_hack; }; struct _ExtSpinButtonClass @@ -45,5 +47,6 @@ GtkWidget* extspinbutton_new (GtkAdjustment *adjustment, gfloat climb_rate, guint digits); +void extspinbutton_disable_size_hack (ExtSpinButton *b); #endif /* _EXTSPINBUTTON_H */ diff -urN soundtracker-0.6.1/app/file-operations.c soundtracker-0.6.2/app/file-operations.c --- soundtracker-0.6.1/app/file-operations.c Sat Apr 29 17:19:09 2000 +++ soundtracker-0.6.2/app/file-operations.c Wed Jan 3 14:24:08 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - file operations page * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/file-operations.h soundtracker-0.6.2/app/file-operations.h --- soundtracker-0.6.1/app/file-operations.h Sat Apr 29 17:19:09 2000 +++ soundtracker-0.6.2/app/file-operations.h Wed Jan 3 14:24:08 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - file operations page (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/gui-settings.c soundtracker-0.6.2/app/gui-settings.c --- soundtracker-0.6.1/app/gui-settings.c Tue Sep 19 17:14:07 2000 +++ soundtracker-0.6.2/app/gui-settings.c Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GUI configuration dialog * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/gui-settings.h soundtracker-0.6.2/app/gui-settings.h --- soundtracker-0.6.1/app/gui-settings.h Sun Sep 17 18:06:57 2000 +++ soundtracker-0.6.2/app/gui-settings.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GUI configuration dialog (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/gui-subs.c soundtracker-0.6.2/app/gui-subs.c --- soundtracker-0.6.1/app/gui-subs.c Mon Sep 18 11:30:14 2000 +++ soundtracker-0.6.2/app/gui-subs.c Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GUI support routines * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 @@ -204,8 +204,6 @@ gtk_signal_connect_object(GTK_OBJECT (GTK_FILE_SELECTION (window)->cancel_button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_hide), GTK_OBJECT (window)); - - gui_add_text_entry_capture(GTK_FILE_SELECTION(window)->selection_entry); return window; } diff -urN soundtracker-0.6.1/app/gui-subs.h soundtracker-0.6.2/app/gui-subs.h --- soundtracker-0.6.1/app/gui-subs.h Wed May 10 16:34:31 2000 +++ soundtracker-0.6.2/app/gui-subs.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GUI support routines (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/gui.c soundtracker-0.6.2/app/gui.c --- soundtracker-0.6.1/app/gui.c Mon Sep 25 12:26:58 2000 +++ soundtracker-0.6.2/app/gui.c Wed Jan 3 14:37:53 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - main user interface handling * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 @@ -58,6 +58,7 @@ #include "gui-settings.h" #include "file-operations.h" #include "playlist.h" +#include "extspinbutton.h" int gui_playing_mode = 0; int notebook_current_page = NOTEBOOK_PAGE_FILE; @@ -66,8 +67,6 @@ GtkWidget *mainwindow; ScopeGroup *scopegroup; -static GSList *text_entries; - static gint pipetag = -1; static GtkWidget *mainwindow_upper_hbox, *mainwindow_second_hbox; static GtkWidget *notebook; @@ -96,7 +95,6 @@ static gboolean gui_clipping_led_status; static int editing_pat = 0; -static int capture_keys = 1; static int gui_ewc_startstop = 0; @@ -122,9 +120,6 @@ static void play_current_pattern_row(void); /* gui initialization / helpers */ -static void text_entry_selected(void); -static void text_entry_unselected(void); - static void gui_enable(int enable); static void offset_current_pattern(int offset); static void offset_current_instrument(int offset); @@ -291,20 +286,12 @@ } static void -gui_remove_focus (void) -{ - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); -} - -static void current_instrument_changed (GtkSpinButton *spin) { int m = xm_get_modified(); STInstrument *i = &xm->instruments[gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(curins_spin))-1]; STSample *s = &i->samples[gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(cursmpl_spin))]; - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); - instrument_editor_set_instrument(i); sample_editor_set_sample(s); modinfo_set_current_instrument(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(curins_spin)) - 1); @@ -329,8 +316,6 @@ STInstrument *i = &xm->instruments[gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(curins_spin))-1]; STSample *s = &i->samples[gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(cursmpl_spin))]; - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); - gtk_entry_set_text(GTK_ENTRY(gui_cursmpl_name), s->name); sample_editor_set_sample(s); modinfo_set_current_sample(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(cursmpl_spin))); @@ -489,8 +474,9 @@ }; gboolean pressed = (gboolean)data; gboolean handled = FALSE; + gboolean entry_focus = GTK_IS_ENTRY(GTK_WINDOW(mainwindow)->focus_widget); - if(capture_keys && GTK_WIDGET_VISIBLE(notebook)) { + if(!entry_focus && GTK_WIDGET_VISIBLE(notebook)) { int shift = event->state & GDK_SHIFT_MASK; int ctrl = event->state & GDK_CONTROL_MASK; int alt = event->state & GDK_MOD1_MASK; @@ -499,11 +485,28 @@ handled = gui_handle_standard_keys(shift, ctrl, alt, event->keyval); handled = handled || handle_page_keys[notebook_current_page](shift, ctrl, alt, event->keyval, pressed); + if(!handled) switch(event->keyval) { + /* from gtk+-1.2.8's gtkwindow.c. These keypresses need to + be stopped in any case. */ + case GDK_Up: + case GDK_Down: + case GDK_Left: + case GDK_Right: + case GDK_KP_Up: + case GDK_KP_Down: + case GDK_KP_Left: + case GDK_KP_Right: + case GDK_Tab: + case GDK_ISO_Left_Tab: + handled = TRUE; + } + if(handled) { - if(pressed) + if(pressed) { gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event"); - else + } else { gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_release_event"); + } } } else { if(pressed) { @@ -512,7 +515,6 @@ case GDK_Return: gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event"); gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); - capture_keys = 1; break; } } @@ -573,8 +575,6 @@ { int n = gtk_spin_button_get_value_as_int(spin); - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); - if(n != editing_pat) gui_set_current_pattern(n); } @@ -585,8 +585,6 @@ int n = gtk_spin_button_get_value_as_int(spin); XMPattern *pat = &xm->patterns[editing_pat]; - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); - if(n != pat->length) { st_set_pattern_length(pat, n); tracker_set_pattern(tracker, NULL); @@ -600,8 +598,6 @@ { int n = gtk_spin_button_get_value_as_int(spin); - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); - g_assert((n & 1) == 0); if(xm->num_channels != n) { @@ -1156,41 +1152,6 @@ gui_set_current_sample(nv); } -static void -text_entry_selected (void) -{ - GSList *i; - GtkWidget *f; - - if(capture_keys == 1) { - for(i = text_entries, f = GTK_WINDOW(mainwindow)->focus_widget; i; i = g_slist_next(i)) { - if(f == i->data) { - capture_keys = 0; - break; - } - } - } -} - -static void -text_entry_unselected (void) -{ - if(capture_keys == 0) { - capture_keys = 1; - } -} - -void -gui_add_text_entry_capture (GtkWidget *widget) -{ - gtk_signal_connect_after(GTK_OBJECT(widget), "focus_in_event", - GTK_SIGNAL_FUNC(text_entry_selected), NULL); - gtk_signal_connect_after(GTK_OBJECT(widget), "focus_out_event", - GTK_SIGNAL_FUNC(text_entry_unselected), NULL); - - text_entries = g_slist_prepend(text_entries, widget); -} - void gui_get_text_entry (int length, void(*changedfunc)(), @@ -1203,8 +1164,6 @@ gtk_signal_connect_after(GTK_OBJECT(thing), "changed", GTK_SIGNAL_FUNC(changedfunc), NULL); - gui_add_text_entry_capture(thing); - *widget = thing; } @@ -1279,8 +1238,6 @@ pipetag = gdk_input_add(audio_backpipe, GDK_INPUT_READ, read_mixer_pipe, NULL); - text_entries = g_slist_alloc(); - #ifdef USE_GNOME mainwindow = gnome_app_new("SoundTracker", "SoundTracker " VERSION); #else @@ -1386,7 +1343,8 @@ add_empty_hbox(hbox); - spin_numchans = gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(8, 2, 32, 2.0, 8.0, 0.0)), 0, 0); + spin_numchans = extspinbutton_new(GTK_ADJUSTMENT(gtk_adjustment_new(8, 2, 32, 2.0, 8.0, 0.0)), 0, 0); + extspinbutton_disable_size_hack(EXTSPINBUTTON(spin_numchans)); gtk_box_pack_start(GTK_BOX(hbox), spin_numchans, FALSE, TRUE, 0); gtk_signal_connect(GTK_OBJECT(spin_numchans), "changed", GTK_SIGNAL_FUNC(gui_numchans_changed), NULL); @@ -1402,7 +1360,8 @@ add_empty_hbox(hbox); - spin_editpat = gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 255, 1.0, 10.0, 0.0)), 0, 0); + spin_editpat = extspinbutton_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 255, 1.0, 10.0, 0.0)), 0, 0); + extspinbutton_disable_size_hack(EXTSPINBUTTON(spin_editpat)); gtk_box_pack_start(GTK_BOX(hbox), spin_editpat, FALSE, TRUE, 0); gtk_widget_show(spin_editpat); gtk_signal_connect(GTK_OBJECT(spin_editpat), "changed", @@ -1418,7 +1377,8 @@ add_empty_hbox(hbox); - spin_patlen = gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(64, 1, 256, 1.0, 16.0, 0.0)), 0, 0); + spin_patlen = extspinbutton_new(GTK_ADJUSTMENT(gtk_adjustment_new(64, 1, 256, 1.0, 16.0, 0.0)), 0, 0); + extspinbutton_disable_size_hack(EXTSPINBUTTON(spin_patlen)); gtk_box_pack_start(GTK_BOX(hbox), spin_patlen, FALSE, TRUE, 0); gtk_signal_connect(GTK_OBJECT(spin_patlen), "changed", GTK_SIGNAL_FUNC(gui_patlen_changed), NULL); @@ -1508,27 +1468,26 @@ gtk_box_pack_start(GTK_BOX(hbox), thing, FALSE, TRUE, 0); gtk_widget_show(thing); - spin_octave = gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(5.0, 0.0, 6.0, 1.0, 1.0, 0.0)), 0, 0); + spin_octave = extspinbutton_new(GTK_ADJUSTMENT(gtk_adjustment_new(5.0, 0.0, 6.0, 1.0, 1.0, 0.0)), 0, 0); + extspinbutton_disable_size_hack(EXTSPINBUTTON(spin_octave)); gtk_box_pack_start(GTK_BOX(hbox), spin_octave, FALSE, TRUE, 0); gtk_widget_show(spin_octave); - gtk_signal_connect (GTK_OBJECT(spin_octave), "changed", - GTK_SIGNAL_FUNC(gui_remove_focus), NULL); thing = gtk_label_new(_("Jump")); gtk_box_pack_start(GTK_BOX(hbox), thing, FALSE, TRUE, 0); gtk_widget_show(thing); - spin_jump = gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 16.0, 1.0, 1.0, 0.0)), 0, 0); + spin_jump = extspinbutton_new(GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 16.0, 1.0, 1.0, 0.0)), 0, 0); + extspinbutton_disable_size_hack(EXTSPINBUTTON(spin_jump)); gtk_box_pack_start(GTK_BOX(hbox), spin_jump, FALSE, TRUE, 0); gtk_widget_show(spin_jump); - gtk_signal_connect (GTK_OBJECT(spin_jump), "changed", - GTK_SIGNAL_FUNC(gui_remove_focus), NULL); thing = gtk_label_new(_("Instr")); gtk_box_pack_start(GTK_BOX(hbox), thing, FALSE, TRUE, 0); gtk_widget_show(thing); - curins_spin = gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 1.0, 128.0, 1.0, 16.0, 0.0)), 0, 0); + curins_spin = extspinbutton_new(GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 1.0, 128.0, 1.0, 16.0, 0.0)), 0, 0); + extspinbutton_disable_size_hack(EXTSPINBUTTON(curins_spin)); gtk_box_pack_start(GTK_BOX(hbox), curins_spin, FALSE, TRUE, 0); gtk_widget_show(curins_spin); gtk_signal_connect (GTK_OBJECT(curins_spin), "changed", @@ -1543,7 +1502,8 @@ gtk_box_pack_start(GTK_BOX(hbox), thing, FALSE, TRUE, 0); gtk_widget_show(thing); - cursmpl_spin = gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 15.0, 1.0, 4.0, 0.0)), 0, 0); + cursmpl_spin = extspinbutton_new(GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 15.0, 1.0, 4.0, 0.0)), 0, 0); + extspinbutton_disable_size_hack(EXTSPINBUTTON(cursmpl_spin)); gtk_box_pack_start(GTK_BOX(hbox), cursmpl_spin, FALSE, TRUE, 0); gtk_widget_show(cursmpl_spin); gtk_signal_connect (GTK_OBJECT(cursmpl_spin), "changed", diff -urN soundtracker-0.6.1/app/gui.h soundtracker-0.6.2/app/gui.h --- soundtracker-0.6.1/app/gui.h Mon Sep 25 12:16:31 2000 +++ soundtracker-0.6.2/app/gui.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - main user interface handling (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 @@ -81,7 +81,6 @@ void gui_get_text_entry (int length, void(*changedfunc)(), GtkWidget **widget); -void gui_add_text_entry_capture (GtkWidget *widget); void gui_go_to_fileops_page (void); diff -urN soundtracker-0.6.1/app/instrument-editor.c soundtracker-0.6.2/app/instrument-editor.c --- soundtracker-0.6.1/app/instrument-editor.c Sun Mar 26 13:30:48 2000 +++ soundtracker-0.6.2/app/instrument-editor.c Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - instrument editor * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/instrument-editor.h soundtracker-0.6.2/app/instrument-editor.h --- soundtracker-0.6.1/app/instrument-editor.h Sat Feb 19 11:58:33 2000 +++ soundtracker-0.6.2/app/instrument-editor.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - instrument editor (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/keys.c soundtracker-0.6.2/app/keys.c --- soundtracker-0.6.1/app/keys.c Tue Sep 19 17:54:26 2000 +++ soundtracker-0.6.2/app/keys.c Wed Jan 3 14:24:09 2001 @@ -6,7 +6,7 @@ * it's the solution I've come up with after nearly three years of * experimentation... * - * Copyright (C) 1997-2000 Michael Krause + * Copyright (C) 1997-2001 Michael Krause * Copyright (C) 2000 Fabian Giesen (Win32 stuff) * * This program is free software; you can redistribute it and/or modify diff -urN soundtracker-0.6.1/app/keys.h soundtracker-0.6.2/app/keys.h --- soundtracker-0.6.1/app/keys.h Sat Feb 19 11:58:33 2000 +++ soundtracker-0.6.2/app/keys.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - X keyboard handling (header) * - * Copyright (C) 1997-2000 Michael Krause + * Copyright (C) 1997-2001 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 diff -urN soundtracker-0.6.1/app/main.c soundtracker-0.6.2/app/main.c --- soundtracker-0.6.1/app/main.c Sun Sep 24 18:22:43 2000 +++ soundtracker-0.6.2/app/main.c Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - main program * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/main.h soundtracker-0.6.2/app/main.h --- soundtracker-0.6.1/app/main.h Sat Feb 19 11:58:33 2000 +++ soundtracker-0.6.2/app/main.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - main program (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/menubar.c soundtracker-0.6.2/app/menubar.c --- soundtracker-0.6.1/app/menubar.c Tue Sep 19 18:19:34 2000 +++ soundtracker-0.6.2/app/menubar.c Wed Jan 3 14:24:09 2001 @@ -1,7 +1,7 @@ /* * The Real SoundTracker - GUI (menu bar) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 @@ -75,7 +75,7 @@ const gchar *authors[] = {"Michael Krause ", NULL}; GtkWidget *about = gnome_about_new("SoundTracker", VERSION, - "Copyright (C) 1998-2000 Michael Krause", + "Copyright (C) 1998-2001 Michael Krause", authors, "Includes OpenCP player from Niklas Beisert and Tammo Hinrichs.", NULL); @@ -90,7 +90,7 @@ gtk_window_position (GTK_WINDOW(about), GTK_WIN_POS_CENTER); gtk_window_set_title(GTK_WINDOW(about), "About SoundTracker"); - label = gtk_label_new("SoundTracker " VERSION "\n\nCopyright (C) 1998-2000 Michael Krause\n" + label = gtk_label_new("SoundTracker " VERSION "\n\nCopyright (C) 1998-2001 Michael Krause\n" "\n\nIncludes OpenCP player from Niklas Beisert and Tammo Hinrichs."); gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(about)->vbox), 10); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(about)->vbox), label, TRUE, TRUE, 10); diff -urN soundtracker-0.6.1/app/menubar.h soundtracker-0.6.2/app/menubar.h --- soundtracker-0.6.1/app/menubar.h Tue Aug 8 21:16:35 2000 +++ soundtracker-0.6.2/app/menubar.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GUI (menu bar) (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/midi-settings.c soundtracker-0.6.2/app/midi-settings.c --- soundtracker-0.6.1/app/midi-settings.c Fri Oct 20 18:24:42 2000 +++ soundtracker-0.6.2/app/midi-settings.c Wed Jan 3 14:24:09 2001 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil -*- * Copyright (C) 2000 Luc Tanguay - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/midi-settings.h soundtracker-0.6.2/app/midi-settings.h --- soundtracker-0.6.1/app/midi-settings.h Fri Oct 20 18:24:42 2000 +++ soundtracker-0.6.2/app/midi-settings.h Wed Jan 3 14:24:09 2001 @@ -1,6 +1,6 @@ /* * Copyright (C) 2000 Luc Tanguay - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/midi-utils.c soundtracker-0.6.2/app/midi-utils.c --- soundtracker-0.6.1/app/midi-utils.c Fri Oct 20 18:24:43 2000 +++ soundtracker-0.6.2/app/midi-utils.c Wed Jan 3 14:24:09 2001 @@ -1,6 +1,6 @@ /* * Copyright (C) 2000 Luc Tanguay - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/midi-utils.h soundtracker-0.6.2/app/midi-utils.h --- soundtracker-0.6.1/app/midi-utils.h Mon Mar 27 12:20:50 2000 +++ soundtracker-0.6.2/app/midi-utils.h Wed Jan 3 14:24:09 2001 @@ -1,6 +1,6 @@ /* * Copyright (C) 2000 Luc Tanguay - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/midi.c soundtracker-0.6.2/app/midi.c --- soundtracker-0.6.1/app/midi.c Fri Oct 20 18:24:43 2000 +++ soundtracker-0.6.2/app/midi.c Wed Jan 3 14:24:09 2001 @@ -1,6 +1,6 @@ /* * Copyright (C) 2000 Luc Tanguay - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/midi.h soundtracker-0.6.2/app/midi.h --- soundtracker-0.6.1/app/midi.h Tue May 16 15:29:53 2000 +++ soundtracker-0.6.2/app/midi.h Wed Jan 3 14:24:09 2001 @@ -1,6 +1,6 @@ /* * Copyright (C) 2000 Luc Tanguay - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/mixer.h soundtracker-0.6.2/app/mixer.h --- soundtracker-0.6.1/app/mixer.h Mon Sep 25 13:34:08 2000 +++ soundtracker-0.6.2/app/mixer.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Mixer module definitions * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/mixers/Makefile.in soundtracker-0.6.2/app/mixers/Makefile.in --- soundtracker-0.6.1/app/mixers/Makefile.in Fri Oct 20 18:31:26 2000 +++ soundtracker-0.6.2/app/mixers/Makefile.in Wed Jan 3 15:04:31 2001 @@ -231,6 +231,10 @@ 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 +kbfloat-mix.o: kbfloat-mix.c ../../config.h kb-x86-asm.h + info-am: info: info-am dvi-am: diff -urN soundtracker-0.6.1/app/mixers/integer32-asm.h soundtracker-0.6.2/app/mixers/integer32-asm.h --- soundtracker-0.6.1/app/mixers/integer32-asm.h Sun Sep 24 19:26:09 2000 +++ soundtracker-0.6.2/app/mixers/integer32-asm.h Wed Jan 3 14:24:11 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Assembly routines for the mixer (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/mixers/integer32.c soundtracker-0.6.2/app/mixers/integer32.c --- soundtracker-0.6.1/app/mixers/integer32.c Mon Sep 25 12:56:45 2000 +++ soundtracker-0.6.2/app/mixers/integer32.c Wed Jan 3 14:24:11 2001 @@ -3,7 +3,7 @@ * The Real SoundTracker - Basic 32bit integers mixer. Probably the * worst which you can come up with. * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/mixers/kb-x86-asm.h soundtracker-0.6.2/app/mixers/kb-x86-asm.h --- soundtracker-0.6.1/app/mixers/kb-x86-asm.h Sun Sep 24 14:34:49 2000 +++ soundtracker-0.6.2/app/mixers/kb-x86-asm.h Wed Jan 3 14:24:11 2001 @@ -3,7 +3,7 @@ * The Real SoundTracker - Cubically interpolating mixing routines * with IT style filter support * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 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 diff -urN soundtracker-0.6.1/app/mixers/kb-x86.c soundtracker-0.6.2/app/mixers/kb-x86.c --- soundtracker-0.6.1/app/mixers/kb-x86.c Fri Oct 20 18:19:22 2000 +++ soundtracker-0.6.2/app/mixers/kb-x86.c Wed Jan 3 14:24:11 2001 @@ -3,7 +3,7 @@ * The Real SoundTracker - Cubically interpolating mixing routines * with IT style filter support * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 Michael Krause * Copyright (C) 1999-2000 Tammo Hinrichs * Despite its name, this mixer can run on every platform. diff -urN soundtracker-0.6.1/app/mixers/kbfloat-mix.c soundtracker-0.6.2/app/mixers/kbfloat-mix.c --- soundtracker-0.6.1/app/mixers/kbfloat-mix.c Mon Sep 25 15:07:31 2000 +++ soundtracker-0.6.2/app/mixers/kbfloat-mix.c Wed Jan 3 14:24:11 2001 @@ -5,7 +5,7 @@ * * Very unoptimized portable C version. * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 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 diff -urN soundtracker-0.6.1/app/module-info.c soundtracker-0.6.2/app/module-info.c --- soundtracker-0.6.1/app/module-info.c Tue Sep 19 16:36:33 2000 +++ soundtracker-0.6.2/app/module-info.c Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - module info page * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/module-info.h soundtracker-0.6.2/app/module-info.h --- soundtracker-0.6.1/app/module-info.h Sat Feb 19 11:58:33 2000 +++ soundtracker-0.6.2/app/module-info.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - module info page (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/playlist.c soundtracker-0.6.2/app/playlist.c --- soundtracker-0.6.1/app/playlist.c Mon Sep 18 18:15:19 2000 +++ soundtracker-0.6.2/app/playlist.c Wed Jan 3 14:30:44 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - gtk+ Playlist widget (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 @@ -28,12 +28,6 @@ #include "playlist.h" #include "gui-subs.h" -#define REMOVE_FOCUS_HACK - -#ifdef REMOVE_FOCUS_HACK -#include "gui.h" -#endif - enum { SIG_CURRENT_POSITION_CHANGED, SIG_RESTART_POSITION_CHANGED, @@ -155,10 +149,6 @@ newpos = gtk_spin_button_get_value_as_int(spin); -#ifdef REMOVE_FOCUS_HACK - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); -#endif - if(newpos == p->current_position) return; @@ -182,10 +172,6 @@ newlen = gtk_spin_button_get_value_as_int(spin); -#ifdef REMOVE_FOCUS_HACK - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); -#endif - gui_update_spin_adjustment(GTK_SPIN_BUTTON(p->spin_songpos), 0, newlen - 1); gui_update_spin_adjustment(GTK_SPIN_BUTTON(p->spin_restartpos), 0, newlen - 1); @@ -217,10 +203,6 @@ { int n = gtk_spin_button_get_value_as_int(spin); -#ifdef REMOVE_FOCUS_HACK - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); -#endif - g_assert(IS_PLAYLIST(p)); if(p->patterns[p->current_position] == n) @@ -239,10 +221,6 @@ Playlist *p) { int n = gtk_spin_button_get_value_as_int(spin); - -#ifdef REMOVE_FOCUS_HACK - gtk_window_set_focus(GTK_WINDOW(mainwindow), NULL); -#endif g_assert(IS_PLAYLIST(p)); diff -urN soundtracker-0.6.1/app/playlist.h soundtracker-0.6.2/app/playlist.h --- soundtracker-0.6.1/app/playlist.h Sat Feb 19 11:58:35 2000 +++ soundtracker-0.6.2/app/playlist.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - gtk+ Playlist widget (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/preferences.c soundtracker-0.6.2/app/preferences.c --- soundtracker-0.6.1/app/preferences.c Tue Sep 19 18:19:34 2000 +++ soundtracker-0.6.2/app/preferences.c Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Preferences handling * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 Michael Krause * Copyright (C) 2000 Fabian Giesen * * This program is free software; you can redistribute it and/or modify diff -urN soundtracker-0.6.1/app/preferences.h soundtracker-0.6.2/app/preferences.h --- soundtracker-0.6.1/app/preferences.h Tue Sep 19 18:18:33 2000 +++ soundtracker-0.6.2/app/preferences.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Preferences handling (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/recode.c soundtracker-0.6.2/app/recode.c --- soundtracker-0.6.1/app/recode.c Sat Feb 19 11:58:33 2000 +++ soundtracker-0.6.2/app/recode.c Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - DOS Charset recoder * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 Michael Krause * * The tables have been taken from recode-3.4.1/ibmpc.c: * Copyright (C) 1990, 1993, 1994 Free Software Foundation, Inc. diff -urN soundtracker-0.6.1/app/recode.h soundtracker-0.6.2/app/recode.h --- soundtracker-0.6.1/app/recode.h Sat Feb 19 11:58:33 2000 +++ soundtracker-0.6.2/app/recode.h Wed Jan 3 14:24:09 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - DOS Charset recoder (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 Michael Krause * * The tables have been taken from recode-3.4.1/ibmpc.c: * Copyright (C) 1990, 1993, 1994 Free Software Foundation, Inc. diff -urN soundtracker-0.6.1/app/sample-display.c soundtracker-0.6.2/app/sample-display.c --- soundtracker-0.6.1/app/sample-display.c Mon Sep 25 14:24:06 2000 +++ soundtracker-0.6.2/app/sample-display.c Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ sample display widget * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/sample-display.h soundtracker-0.6.2/app/sample-display.h --- soundtracker-0.6.1/app/sample-display.h Mon Sep 25 14:24:06 2000 +++ soundtracker-0.6.2/app/sample-display.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ sample display widget (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/sample-editor.c soundtracker-0.6.2/app/sample-editor.c --- soundtracker-0.6.1/app/sample-editor.c Wed Sep 27 10:30:38 2000 +++ soundtracker-0.6.2/app/sample-editor.c Wed Jan 3 14:24:10 2001 @@ -1,7 +1,7 @@ /* * The Real SoundTracker - sample editor * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 @@ -27,6 +27,7 @@ #include #include #include +#include #ifndef NO_AUDIOFILE #include @@ -105,6 +106,8 @@ static GtkWidget *wavload_raw_channels_w[2]; static GtkWidget *wavload_raw_signed_w[2]; static GtkWidget *wavload_raw_endian_w[2]; + +static gboolean libaf2 = TRUE; #endif // = Sampler variables @@ -454,6 +457,18 @@ GTK_SIGNAL_FUNC(sample_editor_clear_clicked), NULL); gtk_box_pack_start(GTK_BOX(vbox), thing, TRUE, TRUE, 0); gtk_widget_show(thing); + +#if !defined(NO_AUDIOFILE) && HAVE_DLFCN_H + { // hack, hack + void *handle, *function; + handle = dlopen(NULL, RTLD_NOW); + function = dlsym(handle, "afSetVirtualPCMMapping"); + if(function == NULL) { + libaf2 = FALSE; + } + } +#endif + } static void @@ -1629,7 +1644,18 @@ outfilesetup = afNewFileSetup(); afInitFileFormat(outfilesetup, AF_FILE_WAVE); afInitChannels(outfilesetup, AF_DEFAULT_TRACK, 1); - afInitSampleFormat(outfilesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, current_sample->treat_as_8bit ? 8 : 16); + if(current_sample->treat_as_8bit) { + if(!libaf2) { + // for audiofile-0.1.x + afInitSampleFormat(outfilesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 8); + } else { + // for audiofile-0.2.x + afInitSampleFormat(outfilesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_UNSIGNED, 8); + } + } else { + afInitSampleFormat(outfilesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16); + } + afInitRate(outfilesetup, AF_DEFAULT_TRACK, rate); outfile = afOpenFile(fn, "w", outfilesetup); afFreeFileSetup(outfilesetup); diff -urN soundtracker-0.6.1/app/sample-editor.h soundtracker-0.6.2/app/sample-editor.h --- soundtracker-0.6.1/app/sample-editor.h Sat Apr 15 18:37:36 2000 +++ soundtracker-0.6.2/app/sample-editor.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - sample editor (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/scope-group.c soundtracker-0.6.2/app/scope-group.c --- soundtracker-0.6.1/app/scope-group.c Sat Apr 15 19:15:33 2000 +++ soundtracker-0.6.2/app/scope-group.c Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - main window oscilloscope group * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/scope-group.h soundtracker-0.6.2/app/scope-group.h --- soundtracker-0.6.1/app/scope-group.h Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/scope-group.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - main window oscilloscope group (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/st-subs.c soundtracker-0.6.2/app/st-subs.c --- soundtracker-0.6.1/app/st-subs.c Tue Aug 15 12:21:49 2000 +++ soundtracker-0.6.2/app/st-subs.c Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - General support routines * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/st-subs.h soundtracker-0.6.2/app/st-subs.h --- soundtracker-0.6.1/app/st-subs.h Tue Aug 15 12:21:49 2000 +++ soundtracker-0.6.2/app/st-subs.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - General support routines (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/time-buffer.c soundtracker-0.6.2/app/time-buffer.c --- soundtracker-0.6.1/app/time-buffer.c Sat Feb 19 11:58:34 2000 +++ soundtracker-0.6.2/app/time-buffer.c Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - time buffer * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/time-buffer.h soundtracker-0.6.2/app/time-buffer.h --- soundtracker-0.6.1/app/time-buffer.h Sun Sep 17 17:34:13 2000 +++ soundtracker-0.6.2/app/time-buffer.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - time buffer (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/track-editor.c soundtracker-0.6.2/app/track-editor.c --- soundtracker-0.6.1/app/track-editor.c Mon Sep 25 12:01:22 2000 +++ soundtracker-0.6.2/app/track-editor.c Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - track editor * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/track-editor.h soundtracker-0.6.2/app/track-editor.h --- soundtracker-0.6.1/app/track-editor.h Fri Aug 25 16:12:02 2000 +++ soundtracker-0.6.2/app/track-editor.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - track editor (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/tracker-settings.c soundtracker-0.6.2/app/tracker-settings.c --- soundtracker-0.6.1/app/tracker-settings.c Tue Sep 19 17:35:10 2000 +++ soundtracker-0.6.2/app/tracker-settings.c Wed Jan 3 14:48:46 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ Tracker widget settings * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 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 @@ -331,7 +331,7 @@ } if(g_list_length(trackersettings_fontlist) == 0) { - trackersettings_fontlist = g_list_append(trackersettings_fontlist, "7x13"); + trackersettings_fontlist = g_list_append(trackersettings_fontlist, "fixed"); } } diff -urN soundtracker-0.6.1/app/tracker-settings.h soundtracker-0.6.2/app/tracker-settings.h --- soundtracker-0.6.1/app/tracker-settings.h Sat Mar 25 09:47:35 2000 +++ soundtracker-0.6.2/app/tracker-settings.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ Tracker widget settings (header) * - * Copyright (C) 2000 Michael Krause + * Copyright (C) 2001 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 diff -urN soundtracker-0.6.1/app/tracker.c soundtracker-0.6.2/app/tracker.c --- soundtracker-0.6.1/app/tracker.c Mon Sep 25 14:53:33 2000 +++ soundtracker-0.6.2/app/tracker.c Wed Jan 3 14:48:46 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ Tracker widget * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 @@ -1227,7 +1227,7 @@ tracker_init (Tracker *t) { t->baselineskip = 0; - t->font = gdk_font_load("7x13"); + t->font = gdk_font_load("fixed"); t->fonth = t->font->ascent + t->font->descent + t->baselineskip; 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.6.1/app/tracker.h soundtracker-0.6.2/app/tracker.h --- soundtracker-0.6.1/app/tracker.h Mon Sep 25 14:24:06 2000 +++ soundtracker-0.6.2/app/tracker.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - GTK+ Tracker widget (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/transposition.c soundtracker-0.6.2/app/transposition.c --- soundtracker-0.6.1/app/transposition.c Wed May 10 16:14:31 2000 +++ soundtracker-0.6.2/app/transposition.c Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Transposition dialog * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/transposition.h soundtracker-0.6.2/app/transposition.h --- soundtracker-0.6.1/app/transposition.h Tue Aug 15 16:33:38 2000 +++ soundtracker-0.6.2/app/transposition.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - Transposition dialog (header) * - * Copyright (C) 1999-2000 Michael Krause + * Copyright (C) 1999-2001 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 diff -urN soundtracker-0.6.1/app/xm-player.c soundtracker-0.6.2/app/xm-player.c --- soundtracker-0.6.1/app/xm-player.c Mon Sep 25 12:26:58 2000 +++ soundtracker-0.6.2/app/xm-player.c Wed Jan 3 14:24:10 2001 @@ -4,7 +4,7 @@ * * Copyright (C) 1994-1998 Niklas Beisert * Copyright (C) 1998 Tammo Hinrichs - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 Michael Krause * * Based on the source code of "OpenCP", the DOS module player, * written by Niklas Beisert and now maintained by Tammo Hinrichs diff -urN soundtracker-0.6.1/app/xm-player.h soundtracker-0.6.2/app/xm-player.h --- soundtracker-0.6.1/app/xm-player.h Mon Sep 25 12:26:58 2000 +++ soundtracker-0.6.2/app/xm-player.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - XM player (header) * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 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 diff -urN soundtracker-0.6.1/app/xm.c soundtracker-0.6.2/app/xm.c --- soundtracker-0.6.1/app/xm.c Wed Sep 27 10:30:38 2000 +++ soundtracker-0.6.2/app/xm.c Wed Jan 3 14:45:03 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - XM support routines * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 Michael Krause * * The XM loader is based on the "maube" 0.10.4 source code, Copyright * (C) 1997 by Conrad Parker (not much is left over, though :D) @@ -22,6 +22,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -31,6 +32,7 @@ #include #include #include +#include #include @@ -1100,6 +1102,10 @@ * coded by Jason Nunn * 7/3/2000 * +* Fixed to cope with weird filenames +* Rob Adamson +* 9-Dec-2000 +* * these routines handle modules that are compressed in the known formats- * zip, gz, lha, bz2. * @@ -1115,24 +1121,74 @@ **************************************************************************/ char *err_msg = "Bzzzz, error extracting song, aborting operation."; +static char *escape_filename(const char *filename) +{ + GString *escaped = g_string_new(""); + const char *s = filename; + char *r; + + g_assert(filename != NULL); + + for (; *s; s ++) { + if (strchr("\\\"'*?!# ()&|<>", *s)) { + g_string_append_c(escaped, '\\'); + } + g_string_append_c(escaped, *s); + } + r = escaped->str; + g_string_free(escaped, FALSE); + + return r; +} + +/* Apparently one shouldn't use system() because it doesn't handle + the child process getting interrupted. */ +static int ExecuteAndWait(const char *command, const char **argv) +{ + int pid, status; + + g_assert(command != NULL); + + pid = fork(); + switch (pid) { + case -1: return -1; + case 0: { + execv(command, (char **)argv); + exit(127); + } + default: + do { + if (waitpid(pid, &status, 0)==-1) { + if (errno!=EINTR) + return -1; + } else + return status; + } while (1); + } + return -1; +} + + /* * this is for zip style archives, where compression format stores * multiple files */ -XM * -File_Extract_Zip (char *extract_cmd,char *tmp_dir_path,int *status) +static XM * +File_Extract_Archive (const char *extract_cmd,char *tmp_dir_path,int *status) { XM *ret = NULL; register int r; DIR *dp; char str[256]; + const char *args[4] = {"sh", "-c", NULL, NULL}; /* * extract archive, and store it in tmp directory */ - r = system (extract_cmd); + args[2] = extract_cmd; + r = ExecuteAndWait ("/bin/sh", args); if ((r == -1) || (r == 127)) { - sprintf (str,"%s (Err 0)",err_msg); + g_snprintf (str, sizeof str, "%s (Err 0)",err_msg); error_error (str); return ret; } @@ -1142,7 +1198,7 @@ */ dp = opendir (tmp_dir_path); if (dp == NULL) { - sprintf (str,"%s (Err 1)",err_msg); + g_snprintf (str, sizeof str, "%s (Err 1)",err_msg); error_error (str); return ret; } @@ -1163,7 +1219,7 @@ * if not a normal file, then ignore. if get a stat() error, * then don't make a fuss. it's no big deal. */ - sprintf (str,"%s/%s",tmp_dir_path,ds->d_name); + g_snprintf (str, sizeof str, "%s/%s",tmp_dir_path,ds->d_name); if (stat (str,&sp) == 0) if (S_ISREG (sp.st_mode)) { ret = XM_Load (str,status); @@ -1178,10 +1234,10 @@ /* * delete tmp directory */ - sprintf (str,"%s -r %s",gui_settings.rm_path,tmp_dir_path); + g_snprintf (str, sizeof str, "%s -rf %s",gui_settings.rm_path,tmp_dir_path); r = system (str); if ((r == -1) || (r == 127)) { - sprintf (str,"%s (Err 2)",err_msg); + g_snprintf (str, sizeof str, "%s (Err 2)",err_msg); error_error (str); } @@ -1192,19 +1248,21 @@ * this is for zcat and bunzip2 style archives, where compression format * stores only one file */ -XM * -File_Extract_GZip (char *extract_cmd,char *tmp_path,int *status) +static XM * +File_Extract_SingleFile (const char *extract_cmd,char *tmp_path,int *status) { XM *ret = NULL; register int r; char str[256]; + const char *args[4] = {"sh", "-c", NULL, NULL}; /* * extract archive- run cmd */ - r = system (extract_cmd); + args[2] = extract_cmd; + r = ExecuteAndWait ("/bin/sh", args); if ((r == -1) || (r == 127)) { - sprintf (str,"%s (Err 3)",err_msg); + g_snprintf (str, sizeof str, "%s (Err 3)",err_msg); error_error (str); return ret; } @@ -1218,7 +1276,7 @@ /* * this tests a file extension. if it matches, return 1, if not return 0 */ -int +static int f_extension_cmp (const char *filename,char *exten) { register int a,b,fs,ks; @@ -1241,50 +1299,42 @@ XM * File_Load (const char *filename) { - char str[256],tmp_path[256]; + char tmp_path[256]; + char *str = NULL, *filename_esc = NULL; int status = 0; XM *ret = NULL; + g_assert(filename != NULL); + + filename_esc = escape_filename(filename); tmpnam(tmp_path); - /* - * test and load zip files. for unzip version 5.31 - */ + /* test and load zip files. for unzip version 5.31 */ if (f_extension_cmp (filename,".zip")) { - sprintf (str,"%s %s -d %s >> /dev/null", - gui_settings.unzip_path,filename,tmp_path); - ret = File_Extract_Zip (str,tmp_path,&status); + str = g_strdup_printf("%s %s -d %s >>/dev/null", gui_settings.unzip_path, filename_esc, tmp_path); + ret = File_Extract_Archive (str, tmp_path, &status); } - /* - * test and load lha files. for UNIX V1.00 - */ + /* test and load lha files. for UNIX V1.00 */ else if (f_extension_cmp (filename,".lzh") || f_extension_cmp (filename,".lha")) { - sprintf (str,"%s ew=%s %s >> /dev/null", - gui_settings.lha_path,tmp_path,filename); - ret = File_Extract_Zip (str,tmp_path,&status); + str = g_strdup_printf("%s ew=%s %s >>/dev/null", gui_settings.lha_path, tmp_path, filename_esc); + ret = File_Extract_Archive (str, tmp_path, &status); } - /* - * for zcat 1.2.4 - */ + /* for zcat 1.2.4 */ else if (f_extension_cmp (filename,".gz")) { - sprintf (str,"%s %s >> %s",gui_settings.gz_path,filename,tmp_path); - ret = File_Extract_GZip (str,tmp_path,&status); + str = g_strdup_printf("%s %s >> %s", gui_settings.gz_path, filename_esc, tmp_path); + ret = File_Extract_SingleFile (str, tmp_path, &status); } - /* - * for bunzip2 Version 0.9.0b - */ + /* for bunzip2 Version 0.9.0b */ else if (f_extension_cmp (filename,".bz2")) { - sprintf (str,"%s -c %s >> %s",gui_settings.bz2_path,filename,tmp_path); - ret = File_Extract_GZip (str,tmp_path,&status); + str = g_strdup_printf("%s -c %s >> %s", gui_settings.bz2_path, filename_esc, tmp_path); + ret = File_Extract_SingleFile (str, tmp_path, &status); } - /* - * if not compressed, load as normal - */ + /* if not compressed, load as normal */ else ret = XM_Load (filename,&status); @@ -1296,7 +1346,10 @@ * mod file is eventually found in a compressed archive. -- jsno */ if (!(status & LFSTAT_IS_MODULE)) - error_error (_("No FastTracker XM and no supported MOD format!")); + error_error (_("Not FastTracker XM and not supported MOD format!")); + + g_free(str); + g_free(filename_esc); return ret; } diff -urN soundtracker-0.6.1/app/xm.h soundtracker-0.6.2/app/xm.h --- soundtracker-0.6.1/app/xm.h Mon Sep 25 11:14:49 2000 +++ soundtracker-0.6.2/app/xm.h Wed Jan 3 14:24:10 2001 @@ -2,7 +2,7 @@ /* * The Real SoundTracker - XM support routines * - * Copyright (C) 1998-2000 Michael Krause + * Copyright (C) 1998-2001 Michael Krause * * This file is based on the "maube" 0.10.4 source code, Copyright (C) * 1997 by Conrad Parker. diff -urN soundtracker-0.6.1/config.h.in soundtracker-0.6.2/config.h.in --- soundtracker-0.6.1/config.h.in Sun Sep 24 11:55:50 2000 +++ soundtracker-0.6.2/config.h.in Wed Dec 27 10:05:04 2000 @@ -117,6 +117,9 @@ /* Define if you have the header file. */ #undef HAVE_ARGZ_H +/* Define if you have the header file. */ +#undef HAVE_DLFCN_H + /* Define if you have the header file. */ #undef HAVE_LIMITS_H diff -urN soundtracker-0.6.1/configure soundtracker-0.6.2/configure --- soundtracker-0.6.1/configure Fri Oct 20 18:31:09 2000 +++ soundtracker-0.6.2/configure Wed Jan 3 15:04:04 2001 @@ -727,7 +727,7 @@ PACKAGE=soundtracker -VERSION=0.6.1 +VERSION=0.6.2 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; } @@ -4090,6 +4090,47 @@ fi +for ac_hdr in dlfcn.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:4098: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:4108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + # Check whether --enable-oss or --disable-oss was given. if test "${enable_oss+set}" = set; then @@ -4103,17 +4144,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4107: checking for $ac_hdr" >&5 +echo "configure:4148: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4158,7 +4199,7 @@ if test x$alsa_support != xno; then echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4162: checking for snd_cards in -lasound" >&5 +echo "configure:4203: checking for snd_cards in -lasound" >&5 ac_lib_var=`echo asound'_'snd_cards | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4166,7 +4207,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4202,7 +4243,7 @@ LIBS="$LIBS -lasound" fi echo $ac_n "checking for snd_pcm_capture_params in -lasound""... $ac_c" 1>&6 -echo "configure:4206: checking for snd_pcm_capture_params in -lasound" >&5 +echo "configure:4247: checking for snd_pcm_capture_params in -lasound" >&5 ac_lib_var=`echo asound'_'snd_pcm_capture_params | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4210,7 +4251,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4254,7 +4295,7 @@ fi echo $ac_n "checking for snd_pcm_channel_params in -lasound""... $ac_c" 1>&6 -echo "configure:4258: checking for snd_pcm_channel_params in -lasound" >&5 +echo "configure:4299: checking for snd_pcm_channel_params in -lasound" >&5 ac_lib_var=`echo asound'_'snd_pcm_channel_params | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4262,7 +4303,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4357,7 +4398,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4361: checking for $ac_word" >&5 +echo "configure:4402: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4392,7 +4433,7 @@ min_esd_version=0.2.8 echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:4396: checking for ESD - version >= $min_esd_version" >&5 +echo "configure:4437: checking for ESD - version >= $min_esd_version" >&5 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -4416,7 +4457,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -4474,7 +4515,7 @@ EOF -if { (eval echo configure:4478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4508,7 +4549,7 @@ CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" cat > conftest.$ac_ext < @@ -4518,7 +4559,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" @@ -4554,12 +4595,12 @@ for ac_func in esd_play_stream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4558: checking for $ac_func" >&5 +echo "configure:4599: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4638,17 +4679,17 @@ if test x$sgi_support != xno; then ac_safe=`echo "dmedia/audio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dmedia/audio.h""... $ac_c" 1>&6 -echo "configure:4642: checking for dmedia/audio.h" >&5 +echo "configure:4683: checking for dmedia/audio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4672,7 +4713,7 @@ if test $ac_cv_header_dmedia_audio_h = yes then echo $ac_n "checking for ALseterrorhandler in -laudio""... $ac_c" 1>&6 -echo "configure:4676: checking for ALseterrorhandler in -laudio" >&5 +echo "configure:4717: checking for ALseterrorhandler in -laudio" >&5 ac_lib_var=`echo audio'_'ALseterrorhandler | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4680,7 +4721,7 @@ ac_save_LIBS="$LIBS" LIBS="-laudio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4726,14 +4767,14 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4730: checking whether byte ordering is bigendian" >&5 +echo "configure:4771: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4744,11 +4785,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4759,7 +4800,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4779,7 +4820,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else diff -urN soundtracker-0.6.1/configure.in soundtracker-0.6.2/configure.in --- soundtracker-0.6.1/configure.in Fri Oct 20 18:30:58 2000 +++ soundtracker-0.6.2/configure.in Wed Jan 3 14:59:03 2001 @@ -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.6.1) +AM_INIT_AUTOMAKE(soundtracker, 0.6.2) AM_CONFIG_HEADER(config.h) dnl ----------------------------------------------------------------------- @@ -119,6 +119,8 @@ AC_HEADER_STDC dnl AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h,, AC_MSG_ERROR(Need those header files.)) + +AC_CHECK_HEADERS(dlfcn.h) dnl ----------------------------------------------------------------------- dnl Test for OSS headers diff -urN soundtracker-0.6.1/doc/hacking.html soundtracker-0.6.2/doc/hacking.html --- soundtracker-0.6.1/doc/hacking.html Sun Sep 24 18:57:57 2000 +++ soundtracker-0.6.2/doc/hacking.html Wed Jan 3 15:04:20 2001 @@ -1,7 +1,7 @@ + from hacking.texi on 3 January 2001 --> SoundTracker internals @@ -308,7 +308,7 @@

-This document was generated on 24 September 2000 using the +This document was generated on 3 January 2001 using the texi2html translator version 1.51.

diff -urN soundtracker-0.6.1/po/cat-id-tbl.c soundtracker-0.6.2/po/cat-id-tbl.c --- soundtracker-0.6.1/po/cat-id-tbl.c Mon Sep 18 11:18:45 2000 +++ soundtracker-0.6.2/po/cat-id-tbl.c Wed Jan 3 14:48:47 2001 @@ -499,7 +499,7 @@ {"\ Module contains sample(s) that are too long for the current mixer.\n\ Maximum sample length is %d.", 428}, - {"No FastTracker XM and no supported MOD format!", 429}, + {"Not FastTracker XM and not supported MOD format!", 429}, }; int _msg_tbl_length = 429; Binary files soundtracker-0.6.1/po/de.gmo and soundtracker-0.6.2/po/de.gmo differ diff -urN soundtracker-0.6.1/po/de.po soundtracker-0.6.2/po/de.po --- soundtracker-0.6.1/po/de.po Sun Oct 22 20:47:44 2000 +++ soundtracker-0.6.2/po/de.po Wed Jan 3 15:04:16 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.3.3\n" -"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"POT-Creation-Date: 2001-01-03 14:48+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:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "Schließen" @@ -74,12 +74,12 @@ msgstr "Diese Änderungen werden erst beim nächsten Neustart wirksam." #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "Auflösung:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "Kanäle:" @@ -154,7 +154,7 @@ msgid "no settings (yet), sorry!" msgstr "Keine Einstellungen (zur Zeit), sorry!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "Kann Datei nicht zum Schreiben öffnen." @@ -197,11 +197,11 @@ msgid "Value" msgstr "Wert" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "Einfügen" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" msgstr "Löschen" @@ -231,11 +231,11 @@ msgid "Loop" msgstr "Loop" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "Anfang" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "Ende" @@ -258,7 +258,7 @@ msgid "Save Song" msgstr "Spiele Song" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" msgstr "Lade Sample" @@ -437,28 +437,28 @@ msgid "Song saved." msgstr "_Modul" -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "Frage" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "Abbrechen" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "Warnung" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "Fehler!" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "Tempo" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -466,68 +466,68 @@ "Sind Sie sicher, daß Sie das aktuelle Projekt schließen wollen?\n" "Alle Änderungen gehen verloren!" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "Sind sie sicher, daß Sie die Datei überschreiben wollen?" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." msgstr "Lade XM..." -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." msgstr "Speichere XM..." -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." msgstr "" -#: app/gui.c:1301 +#: app/gui.c:1258 #, fuzzy msgid "Save song as XM..." msgstr "Speichere WAV..." -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "Spiele Song" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "Spiele Pattern" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "Stop" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "Anzahl der Kanäle:" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "Pattern" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "PatLänge" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "Oktave" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "Springe" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "Instr" -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "Sample" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" msgstr "" @@ -1265,7 +1265,7 @@ msgid "Linear" msgstr "Linear" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "Amiga" @@ -1285,15 +1285,15 @@ msgid "ProTracker Mode" msgstr "ProTracker-Modus" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" msgstr "Song-Länge" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "Aktuelle Pos" -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "Restart-Pos" @@ -1305,157 +1305,157 @@ "Ein Verzeichnis namens '.soundtracker' wurde in Ihrem Home-Verzeichnis \n" "angelegt, um Konfigurationsdateien darin zu speichern.\n" -#: app/sample-editor.c:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "Keine Loop" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "PingPong" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "8 Bits" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "16 Bits" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "Sample-Editor" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "Lautstärke" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "Balance" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "Feineinstellung" -#: app/sample-editor.c:274 +#: app/sample-editor.c:277 #, fuzzy msgid "Selection:" msgstr "_Auswahl" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 #, fuzzy msgid "None" msgstr "Note:" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 msgid "All" msgstr "" -#: app/sample-editor.c:305 +#: app/sample-editor.c:308 #, fuzzy msgid "Length:" msgstr "Länge" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" msgstr "" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "RelNote" -#: app/sample-editor.c:340 +#: app/sample-editor.c:343 #, fuzzy msgid "Load Sample..." msgstr "Lade Sample..." -#: app/sample-editor.c:342 +#: app/sample-editor.c:345 #, fuzzy msgid "Save WAV..." msgstr "Speichere WAV..." -#: app/sample-editor.c:344 +#: app/sample-editor.c:347 #, fuzzy msgid "Save region as WAV..." msgstr "Speichere WAV..." -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" msgstr "Speichere WAV" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" msgstr "" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "Monitor" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "Lautstärke" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" msgstr "Zoom in Auswahl" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "Zeige alles" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "Zoom in (+50%)" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "Zoom out (-50%)" -#: app/sample-editor.c:418 +#: app/sample-editor.c:421 #, fuzzy msgid "Reverse" msgstr "Entfernen" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "Ausschneiden" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "Entfernen" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "Kopieren" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "Einfügen" -#: app/sample-editor.c:452 +#: app/sample-editor.c:455 #, fuzzy msgid "Clear Sample" msgstr "Lade Sample" -#: app/sample-editor.c:490 +#: app/sample-editor.c:505 #, fuzzy msgid "(no selection)" msgstr "Zoom in Auswahl" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "Lesefehler." -#: app/sample-editor.c:1355 +#: app/sample-editor.c:1370 #, fuzzy msgid "Load stereo sample" msgstr "Lade Sample" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1463,26 +1463,26 @@ "Please choose which channel to load:" msgstr "" -#: app/sample-editor.c:1374 +#: app/sample-editor.c:1389 #, fuzzy msgid "Left" msgstr "Links [%]:" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" msgstr "" -#: app/sample-editor.c:1386 +#: app/sample-editor.c:1401 #, fuzzy msgid "Right" msgstr "Rechts [%]:" -#: app/sample-editor.c:1464 +#: app/sample-editor.c:1479 #, fuzzy msgid "Load raw sample" msgstr "Lade Sample" -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" @@ -1490,82 +1490,82 @@ "Please choose a format:" msgstr "" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" msgstr "" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "OK" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "Kann Sample nicht lesen" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 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:1599 +#: app/sample-editor.c:1614 #, 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:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." msgstr "" -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "Starte Sampling" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" msgstr "" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "Sampling-Fenster" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 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:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "Normalisieren" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "Ausführen" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "Lautstärke-Anpassung" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "Lineare Lautstärkenverringerung auf Markierung" -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "Links [%]:" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" msgstr "" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" msgstr "" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "Rechts [%]:" @@ -1991,43 +1991,43 @@ msgid "Instrument 2:" msgstr "Instrument 2:" -#: app/xm.c:188 +#: app/xm.c:190 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "Patternlänge außerhalb des Bereiches: %d.\n" -#: app/xm.c:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "Datei ist kein XI-Instrument." -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "Unbekannte XI-Version 0x%x\n" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "Ungültiger vibtype %d, verwende Sinus.\n" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "Fehler beim Laden der Pattern." -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "Kann Datei nicht öffnen" -#: app/xm.c:920 +#: app/xm.c:922 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:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "Fehler beim Laden der Instrumente." -#: app/xm.c:975 +#: app/xm.c:977 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -2036,8 +2036,9 @@ "Modul enthält Sample(s), die zu lang für den aktuellen Mixer sind..\n" "Maximale Sample-Länge ist %d." -#: app/xm.c:1299 -msgid "No FastTracker XM and no supported MOD format!" +#: app/xm.c:1349 +#, fuzzy +msgid "Not FastTracker XM and not supported MOD format!" msgstr "Kein FastTracker XM und kein unterstütztes MOD-Format!" #, fuzzy diff -urN soundtracker-0.6.1/po/es.po soundtracker-0.6.2/po/es.po --- soundtracker-0.6.1/po/es.po Sun Oct 22 20:47:44 2000 +++ soundtracker-0.6.2/po/es.po Wed Jan 3 15:04:16 2001 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"POT-Creation-Date: 2001-01-03 14:48+0100\n" "PO-Revision-Date: 1999-10-02 23:58+0200\n" "Last-Translator: German Gomez >\n" "Language-Team: Spanish \n" @@ -54,7 +54,7 @@ msgid "Mixers" msgstr "Modificadores" -#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "" @@ -75,12 +75,12 @@ msgstr "Estos cambios no tendrán efecto hasta la próxima reproducción" #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "Resolución:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "Canales:" @@ -157,7 +157,7 @@ msgid "no settings (yet), sorry!" msgstr "no hay preferencias (todavía), ¡lo siento!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "" @@ -200,11 +200,11 @@ msgid "Value" msgstr "Valor" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "Insertar" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" msgstr "Eliminar" @@ -234,11 +234,11 @@ msgid "Loop" msgstr "Ciclo" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "Comienzo" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "Final" @@ -260,7 +260,7 @@ msgid "Save Song" msgstr "Reproducir Cancion" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" msgstr "" @@ -429,28 +429,28 @@ msgid "Song saved." msgstr "" -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "Pregunta" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "Cancelar" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "Aviso" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "¡Error!" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -458,68 +458,68 @@ "¿Seguro que quiere descartar el projecto actual?\n" "¡Se perderan todos los cambios!" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "¿Seguro que quiere sobrescribir el fichero?" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." msgstr "Abrir XM..." -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." msgstr "Guardar XM..." -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." msgstr "" -#: app/gui.c:1301 +#: app/gui.c:1258 #, fuzzy msgid "Save song as XM..." msgstr "Guardar XM..." -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "Reproducir Cancion" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "Reproducir Patrón" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "Parar" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "Número de Canales:" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "Patrón" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "Longitud del Patrón" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "Octava" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "Saltar" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "Instrumento" -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "Muestra" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" msgstr "" @@ -1214,7 +1214,7 @@ msgid "Linear" msgstr "" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "" @@ -1234,15 +1234,15 @@ msgid "ProTracker Mode" msgstr "" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" msgstr "Longitud de la cancion" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "Posicion actual" -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "Poscion para recomenzar" @@ -1252,153 +1252,153 @@ "home directory to store configuration files.\n" msgstr "" -#: app/sample-editor.c:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "" -#: app/sample-editor.c:274 +#: app/sample-editor.c:277 #, fuzzy msgid "Selection:" msgstr "Resolución:" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 #, fuzzy msgid "None" msgstr "Nota:" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 msgid "All" msgstr "" -#: app/sample-editor.c:305 +#: app/sample-editor.c:308 #, fuzzy msgid "Length:" msgstr "Longitud" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" msgstr "" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "" -#: app/sample-editor.c:340 +#: app/sample-editor.c:343 #, fuzzy msgid "Load Sample..." msgstr "Abrir XM..." -#: app/sample-editor.c:342 +#: app/sample-editor.c:345 #, fuzzy msgid "Save WAV..." msgstr "Guardar XM..." -#: app/sample-editor.c:344 +#: app/sample-editor.c:347 msgid "Save region as WAV..." msgstr "" -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" msgstr "" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" msgstr "" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" msgstr "" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "" -#: app/sample-editor.c:418 +#: app/sample-editor.c:421 msgid "Reverse" msgstr "" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "" -#: app/sample-editor.c:452 +#: app/sample-editor.c:455 #, fuzzy msgid "Clear Sample" msgstr "Muestra" -#: app/sample-editor.c:490 +#: app/sample-editor.c:505 msgid "(no selection)" msgstr "" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "" -#: app/sample-editor.c:1355 +#: app/sample-editor.c:1370 msgid "Load stereo sample" msgstr "" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1406,25 +1406,25 @@ "Please choose which channel to load:" msgstr "" -#: app/sample-editor.c:1374 +#: app/sample-editor.c:1389 #, fuzzy msgid "Left" msgstr "Longitud" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" msgstr "" -#: app/sample-editor.c:1386 +#: app/sample-editor.c:1401 msgid "Right" msgstr "" -#: app/sample-editor.c:1464 +#: app/sample-editor.c:1479 #, fuzzy msgid "Load raw sample" msgstr "Abrir XM..." -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" @@ -1432,79 +1432,79 @@ "Please choose a format:" msgstr "" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" msgstr "" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "" -#: app/sample-editor.c:1599 +#: app/sample-editor.c:1614 msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "" -#: app/sample-editor.c:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." msgstr "" -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" msgstr "" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" -#: app/sample-editor.c:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "" -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" msgstr "" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" msgstr "" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "" @@ -1903,50 +1903,50 @@ msgid "Instrument 2:" msgstr "" -#: app/xm.c:188 +#: app/xm.c:190 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "" -#: app/xm.c:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "" -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "" -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "" -#: app/xm.c:920 +#: app/xm.c:922 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" -#: app/xm.c:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "" -#: app/xm.c:975 +#: app/xm.c:977 #, 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:1299 -msgid "No FastTracker XM and no supported MOD format!" +#: app/xm.c:1349 +msgid "Not FastTracker XM and not supported MOD format!" msgstr "" #, fuzzy Binary files soundtracker-0.6.1/po/fr.gmo and soundtracker-0.6.2/po/fr.gmo differ diff -urN soundtracker-0.6.1/po/fr.po soundtracker-0.6.2/po/fr.po --- soundtracker-0.6.1/po/fr.po Sun Oct 22 20:47:44 2000 +++ soundtracker-0.6.2/po/fr.po Wed Jan 3 15:04:16 2001 @@ -2,17 +2,17 @@ # 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-09-27 10:35+0200\n" -"PO-Revision-Date: 2000-03-21 19:19+01:00\n" -"Last-Translator: Saïd Bougribate \n" -"Language-Team: French \n" +"Project-Id-Version: soundtracker-0.6.1\n" +"POT-Creation-Date: 2001-01-03 14:48+0100\n" +"PO-Revision-Date: 2000-11-16 04:37GMT\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=ISO 8859-15\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 0.5.5\n" #: app/audioconfig.c:59 msgid "Playback Output" @@ -36,9 +36,8 @@ msgstr "Module de pilote" #: app/audioconfig.c:225 -#, fuzzy msgid "Description" -msgstr "Question" +msgstr "Description" #: app/audioconfig.c:233 app/audioconfig.c:236 msgid "Audio Configuration" @@ -50,11 +49,10 @@ msgstr "Module de pilote" #: app/audioconfig.c:288 -#, fuzzy msgid "Mixers" -msgstr "Modificateur:" +msgstr "Mélangeur" -#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "Fermer" @@ -62,37 +60,37 @@ #: app/drivers/alsa-input.c:125 app/drivers/alsa-output.c:134 #, c-format msgid "(%d bytes)" -msgstr "(%d byte)" +msgstr "(%d bytes)" #: app/drivers/alsa-input.c:128 #, c-format msgid "Estimated audio delay: %f microseconds" -msgstr "Delaie estimé: %f microsecondi" +msgstr "Délaie estimé: %f microsecondes" #: 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 "Les changments ne prendront effet qu'au redémarrage de l'application." +msgstr "Les changements ne prendront effet qu'au redémarrage de l'application." #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "Résolution:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "Canaux:" #: app/drivers/alsa-input.c:225 app/drivers/alsa-output.c:231 #: app/drivers/oss-output.c:220 msgid "Frequency [Hz]:" -msgstr "Frequence [Hz]:" +msgstr "Fréquence [Hz]:" #: app/drivers/alsa-input.c:235 app/drivers/alsa-output.c:241 #: app/drivers/oss-output.c:230 msgid "Buffer Size:" -msgstr "Taille du buffer:" +msgstr "Taille du tampon:" #: app/drivers/alsa-input.c:268 app/drivers/alsa-output.c:274 msgid "ALSA card number:" @@ -108,7 +106,7 @@ "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" +"Impossible d'initialiser ALSA pour la capture sonore (carte:%d, device:%d):\n" "%s" #: app/drivers/alsa-input.c:426 app/drivers/alsa-output.c:426 @@ -118,12 +116,12 @@ #: app/drivers/alsa-input.c:439 app/drivers/alsa-output.c:441 msgid "Required sound output parameters not supported.\n" -msgstr "Les parametres sonores ne sont pas supportés.\n" +msgstr "Les paramètres sonores ne sont pas supportés.\n" #: app/drivers/alsa-output.c:137 app/drivers/oss-output.c:139 -#, fuzzy, c-format +#, c-format msgid "Estimated audio delay: %f milliseconds" -msgstr "Delaie estimé: %f microsecondi" +msgstr "Délaie estimé: %f microsecondes" #: app/drivers/alsa-output.c:377 #, c-format @@ -142,21 +140,25 @@ "by ESD. Use the OSS or ALSA output plug-ins\n" "for serious work." msgstr "" +"Notez que la sortie ESD est inutilisable en\n" +"mode interactif à cause du temps de latence trop important \n" +"de celui ci. Utilisez les plugins OSS ou ALSA pour un travail\n" +"plus sérieux." #: app/drivers/esd-output.c:161 -#, fuzzy, c-format +#, c-format msgid "" "Couldn't connect to ESD for sound output:\n" "%s" msgstr "" -"Impossible d'ouvrir /dev/dsp pour la sortie sonore:\n" +"Impossible de se connecter a ESD pour la sortie sonore:\n" "%s" #: app/drivers/file-output.c:86 app/drivers/oss-input.c:90 msgid "no settings (yet), sorry!" msgstr "Pas de configuration (pour l'instant), désolé!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "Impossible d'ouvrir le fichier pour l'écriture." @@ -166,7 +168,7 @@ "Couldn't open /dev/dsp for sampling:\n" "%s" msgstr "" -"Impossible d'ouvrir /dev/dsp pour l'échantilloneur:\n" +"Impossible d'ouvrir /dev/dsp pour l'échantillonneur:\n" "%s" #: app/drivers/oss-output.c:173 @@ -199,13 +201,13 @@ msgid "Value" msgstr "Valeur" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "Insérer" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" -msgstr "Annuler" +msgstr "Supprimer" #: app/envelope-box.c:982 msgid "" @@ -233,68 +235,61 @@ msgid "Loop" msgstr "Boucle" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "Démarrer" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "Fin" #: app/file-operations.c:153 -#, fuzzy msgid "Load Module" -msgstr "_Module" +msgstr "Charger Module" #: app/file-operations.c:154 -#, fuzzy msgid "Save Module" -msgstr "Module de pilote" +msgstr "Sauver Module" #: app/file-operations.c:155 msgid "Render WAV" -msgstr "" +msgstr "Rendu WAV" #: app/file-operations.c:156 -#, fuzzy msgid "Save Song" -msgstr "Joue la Musique" +msgstr "Sauver Musique" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" -msgstr "Charge Echantillon" +msgstr "Charger Echantillon" #: app/file-operations.c:158 -#, fuzzy msgid "Save Sample" -msgstr "Charge Echantillon" +msgstr "Sauver Echantillon" #: app/file-operations.c:159 -#, fuzzy msgid "Load Instrument" -msgstr "Charge Instrument" +msgstr "Charger Instrument" #: app/file-operations.c:160 -#, fuzzy msgid "Save Instrument" -msgstr "Sauve Instrument.." +msgstr "Sauver Instrument.." #: app/file-operations.c:166 -#, fuzzy msgid "File" -msgstr "_Fichier" +msgstr "Fichier" #: app/file-operations.c:217 msgid "Operation not supported." -msgstr "" +msgstr "Opération non supportée." #: app/gui-settings.c:92 msgid "Scopes Frequency" -msgstr "Frequence des oscilloscopes" +msgstr "Fréquence des oscilloscopes" #: app/gui-settings.c:95 msgid "Tracker Frequency" -msgstr "Frequence du tracker" +msgstr "Fréquence du trackeur" #: app/gui-settings.c:316 app/gui-settings.c:319 msgid "GUI Configuration" @@ -307,28 +302,27 @@ #: app/gui-settings.c:360 msgid "Use upper case letters for hex numbers" -msgstr "" +msgstr "Utiliser les nombres hexadécimaux en majusucle" #: app/gui-settings.c:367 -#, fuzzy msgid "Advance cursor horizontally in effect columns" -msgstr "Curseur avancé dans les colonnes des FX" +msgstr "Curseur avancé horizontale dans la colonne des effets" #: app/gui-settings.c:374 msgid "Asynchronous Editing" -msgstr "" +msgstr "Edition Asynchrone" #: app/gui-settings.c:381 msgid "Channel numbering" -msgstr "" +msgstr "Numérotation du canaux" #: app/gui-settings.c:388 msgid "Tempo and BPM update" -msgstr "" +msgstr "Mise à jour du Tempo et du BPM" #: app/gui-settings.c:395 msgid "Auto switch" -msgstr "" +msgstr "Changement automatique" #: app/gui-settings.c:402 msgid "Use anti-aliased envelope editor" @@ -337,11 +331,11 @@ #: app/gui-settings.c:408 msgid "You need to restart SoundTracker for this change to come into effect." msgstr "" -"Vous devez redmarrer SoundTracker pour que ces changments prennent effet." +"Vous devez redémarrer SoundTracker pour que ces changements prennenteffet." #: app/gui-settings.c:417 msgid "Scopes buffer size [MB]" -msgstr "Dimension du buffer des ossilloscopes [MO]" +msgstr "Dimension du tampon des ossilloscopes [MO]" #: app/gui-settings.c:436 msgid "Highlight rows:" @@ -349,7 +343,7 @@ #: app/gui-settings.c:460 msgid "Track line format:" -msgstr "" +msgstr "Format de la ligne de la piste" #: app/gui-settings.c:512 msgid "`Save XM' saves all non-empty patterns" @@ -357,66 +351,55 @@ #: app/gui-subs.c:32 msgid "Idle." -msgstr "" +msgstr "En attente" #: app/gui-subs.c:33 -#, fuzzy msgid "Playing song..." -msgstr "Joue la Musique" +msgstr "Joue la Musique..." #: app/gui-subs.c:34 -#, fuzzy msgid "Playing pattern..." -msgstr "Joue le Pattern" +msgstr "Joue le Pattern..." #: app/gui-subs.c:35 -#, fuzzy msgid "Loading module..." -msgstr "Charge Echantillon.." +msgstr "Charge Echantillon..." #: app/gui-subs.c:36 -#, fuzzy msgid "Module loaded." -msgstr "Module Information" +msgstr "Module chargé" #: app/gui-subs.c:37 msgid "Saving module..." -msgstr "" +msgstr "Sauve module..." #: app/gui-subs.c:38 -#, fuzzy msgid "Module saved." -msgstr "_Module" +msgstr "Module sauvé." #: app/gui-subs.c:39 -#, fuzzy msgid "Loading sample..." -msgstr "Charge Echantillon.." +msgstr "Charge échantillon.." #: app/gui-subs.c:40 -#, fuzzy msgid "Sample loaded." -msgstr "Nom de l'échantillon" +msgstr "Echantillon chargé." #: app/gui-subs.c:41 -#, fuzzy msgid "Saving sample..." -msgstr "Charge Echantillon.." +msgstr "Sauve échantillon..." #: app/gui-subs.c:42 -#, fuzzy msgid "Sample saved." -msgstr "Nom de l'échantillon" +msgstr "Echantillon sauvé." #: app/gui-subs.c:43 -#, fuzzy msgid "Loading instrument..." -msgstr "Charge Instrument" +msgstr "Charge Instrument..." #: app/gui-subs.c:44 -#, fuzzy msgid "Instrument loaded." -msgstr "Nom de l'instrument" +msgstr "Instrument chargé." #: app/gui-subs.c:45 #, fuzzy @@ -424,42 +407,39 @@ msgstr "Sauve Instrument.." #: app/gui-subs.c:46 -#, fuzzy msgid "Instrument saved." -msgstr "Nom de l'instrument" +msgstr "Instrument sauvé." #: app/gui-subs.c:47 -#, fuzzy msgid "Saving song..." -msgstr "Sauvegarder _sous..." +msgstr "Sauvegarder musique..." #: app/gui-subs.c:48 -#, fuzzy msgid "Song saved." -msgstr "Titre:" +msgstr "Musique sauvée." -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "Question" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "Annuler" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "Attention" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "Erreur!" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "Tempo" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -467,70 +447,69 @@ "Etes vous sur de vider le projet courant?\n" "Tous les modifications vont êtres perdues!" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "Etes vous sur de vouloir supprimer ce fichier?" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." -msgstr "Charge XM..." +msgstr "Charger XM..." -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." -msgstr "Sauve XM..." +msgstr "Sauver XM..." -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." -msgstr "" +msgstr "Rendu du module en WAV" -#: app/gui.c:1301 -#, fuzzy +#: app/gui.c:1258 msgid "Save song as XM..." -msgstr "Sauve XM..." +msgstr "Sauver musique en XM..." -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "Joue la Musique" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "Joue le Pattern" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "Stop" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "Nombre de canaux:" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "Pattern" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "Durée du pattern" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "Octave" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "Saut" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "Instrument" -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "Echantillon" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" -msgstr "" +msgstr "%M:%S" #: app/instrument-editor.c:75 msgid "VolFade" @@ -566,7 +545,7 @@ #: app/instrument-editor.c:216 msgid "Saw Up" -msgstr "Saw Haut" +msgstr "Saw Fort" #: app/instrument-editor.c:220 msgid "Instrument Editor" @@ -574,33 +553,31 @@ #: app/instrument-editor.c:229 msgid "Volume envelope" -msgstr "Volume de l'enveloppe" +msgstr "Volume de l'envelope" #: app/instrument-editor.c:237 msgid "Panning envelope" msgstr "volume du panoramique" #: app/instrument-editor.c:254 -#, fuzzy msgid "Load Instrument..." -msgstr "Charge Instrument" +msgstr "Charger Instrument" #: app/instrument-editor.c:256 -#, fuzzy msgid "Save Instrument..." -msgstr "Sauve Instrument.." +msgstr "Sauver Instrument.." #: app/instrument-editor.c:258 msgid "Load XI" -msgstr "Charge XI" +msgstr "Charger XI" #: app/instrument-editor.c:264 msgid "Save XI" -msgstr "Sauve XI" +msgstr "Sauver XI" #: app/instrument-editor.c:283 msgid "Vibrato Type:" -msgstr "Tipe de vibrato:" +msgstr "Type de vibrato:" #: app/instrument-editor.c:355 msgid "Note:" @@ -608,16 +585,15 @@ #: app/instrument-editor.c:373 msgid "Initialize" -msgstr "Initialise" +msgstr "Initialiser" #: app/keys.c:126 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:139 -#, fuzzy msgid "Upper Octave Keys..." -msgstr "Touche de l'octave supérieure.." +msgstr "Touche de l'octave supérieure..." #: app/keys.c:140 msgid "" @@ -625,9 +601,9 @@ "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 " -"etresrangées comme un piano, incluant le nombre de touches." +"Ce sont les touches du coin haut du clavier. La touche c est normalement la\n" +"touche du côté droit de la TABULATION. Le reste des touches doivent\n" +"etres rangées comme un piano, incluant le nombre de touches." #: app/keys.c:146 #, fuzzy @@ -671,7 +647,7 @@ #: app/keys.c:586 msgid "Key Explanation" -msgstr "Explotation des touches" +msgstr "Exploitation des touches" #: app/keys.c:617 msgid "Modifiers:" @@ -679,11 +655,11 @@ #: app/keys.c:643 msgid "Learn selected key" -msgstr "Memorise la touche selectionnée" +msgstr "Mémorise la touche selectionnée" #: app/keys.c:649 msgid "Learn all keys" -msgstr "Memorise toutes les touches" +msgstr "Mémorise toutes les touches" #: app/keys.c:655 msgid "" @@ -699,7 +675,7 @@ #: app/keys.c:695 msgid "Apply" -msgstr "" +msgstr "Appliquer" #: app/keys.c:765 msgid "" @@ -744,14 +720,12 @@ msgstr "Sauvegarder _sous..." #: app/menubar.c:288 -#, fuzzy msgid "Save Module as _WAV..." -msgstr "Sauve WAV.." +msgstr "Sauve Module en _WAV..." #: app/menubar.c:290 -#, fuzzy msgid "Save XM without samples..." -msgstr "Charge Echantillon.." +msgstr "Sauve XM sans échantillons..." #: app/menubar.c:295 msgid "_Quit" @@ -767,11 +741,11 @@ #: app/menubar.c:306 msgid "_Optimize Module" -msgstr "_Optimise les Modules" +msgstr "_Optimiser les Modules" #: app/menubar.c:313 app/menubar.c:324 app/menubar.c:349 app/menubar.c:383 msgid "C_ut" -msgstr "_Couper" +msgstr "Co_uper" #: app/menubar.c:315 app/menubar.c:326 app/menubar.c:351 app/menubar.c:385 msgid "_Copy" @@ -782,13 +756,12 @@ msgstr "_Coller" #: app/menubar.c:330 -#, fuzzy msgid "_Kill notes" -msgstr "/Edition/Track/A_nnuler" +msgstr "_Tuer les notes" #: app/menubar.c:332 msgid "_Insert" -msgstr "I_nsérer" +msgstr "_Insérer" #: app/menubar.c:334 msgid "_Delete" @@ -796,25 +769,23 @@ #: app/menubar.c:336 msgid "Increment cmd value" -msgstr "" +msgstr "Incrémente la valeur de cmd" #: app/menubar.c:338 msgid "Decrement cmd value" -msgstr "" +msgstr "Décrémente la valeur de cmd" #: app/menubar.c:345 -#, fuzzy msgid "_Mark mode" -msgstr "_Maquer" +msgstr "_Marquer le mode" #: app/menubar.c:347 app/menubar.c:381 -#, fuzzy msgid "C_lear block marks" -msgstr "Effacer" +msgstr "Ef_facer les bloques marqués" #: app/menubar.c:355 app/menubar.c:389 msgid "_Interpolate effects" -msgstr "" +msgstr "Interp_olation" #: app/menubar.c:363 msgid "_Jazz Edit Mode" @@ -857,14 +828,12 @@ msgstr "_Charger XI..." #: app/menubar.c:418 -#, fuzzy msgid "_Save XI..." -msgstr "Sauve XM..." +msgstr "Sauver XI..." #: app/menubar.c:423 -#, fuzzy msgid "_Clear Current" -msgstr "Courant" +msgstr "_Effacer Courrant" #: app/menubar.c:428 msgid "_Delete Unused Instruments" @@ -875,22 +844,20 @@ msgstr "Utiliser les _Backing Store" #: app/menubar.c:438 -#, fuzzy msgid "_Previous font" -msgstr "Astuce Précédente" +msgstr "_Font précédente" #: app/menubar.c:440 msgid "_Next font" -msgstr "" +msgstr "Fo_nt suivante" #: app/menubar.c:448 msgid "Display _Oscilloscopes" -msgstr "Montrer les _Oscilloscopes" +msgstr "Afficher les _Oscilloscopes" #: app/menubar.c:451 -#, fuzzy msgid "_Tracker" -msgstr "T_rack" +msgstr "T_rackeur" #: app/menubar.c:455 msgid "_Keyboard Configuration..." @@ -905,9 +872,8 @@ msgstr "Configuration de la _GUI..." #: app/menubar.c:465 -#, fuzzy msgid "_MIDI Configuration..." -msgstr "Configuration de la _GUI..." +msgstr "Configuration MIDI..." #: app/menubar.c:470 msgid "_Save Settings now" @@ -927,7 +893,7 @@ #: app/menubar.c:486 msgid "_XM Effects..." -msgstr "_XM effects..." +msgstr "_XM effets..." #: app/menubar.c:493 msgid "_File" @@ -970,14 +936,12 @@ msgstr "/Fichier/-" #: app/menubar.c:540 -#, fuzzy msgid "/File/Save Module as _WAV..." -msgstr "/Fichier/Sauver _sous..." +msgstr "/Fichier/Sauver Module en _WAV..." #: app/menubar.c:541 -#, fuzzy msgid "/File/Save XM without samples..." -msgstr "/Fichier/Sauver _sous..." +msgstr "/Fichier/Sauver XM sans échantillons" #: app/menubar.c:543 msgid "/File/_Quit" @@ -1029,7 +993,7 @@ #: app/menubar.c:556 msgid "/Edit/Pattern/_Paste" -msgstr "/Edition/Pattern/_coller" +msgstr "/Edition/Pattern/Co_ller" #: app/menubar.c:557 msgid "/Edit/_Track" @@ -1048,9 +1012,8 @@ msgstr "/Edition/Track/Co_ller" #: app/menubar.c:561 -#, fuzzy msgid "/Edit/Track/_Kill notes" -msgstr "/Edition/Track/A_nnuler" +msgstr "/Edition/Track/_Tuer les notes" #: app/menubar.c:562 msgid "/Edit/Track/_Insert" @@ -1058,7 +1021,7 @@ #: app/menubar.c:563 msgid "/Edit/Track/_Delete" -msgstr "/Edition/Track/A_nnuler" +msgstr "/Edition/Track/_Supprimer" #: app/menubar.c:564 msgid "/Edit/_Selection" @@ -1070,9 +1033,8 @@ msgstr "/Edition/Selection/_Marquer" #: app/menubar.c:566 -#, fuzzy msgid "/Edit/Selection/C_lear block marks" -msgstr "/Edition/Selection/_Marquer" +msgstr "/Edition/Selection/_Effacer le bloque marqué" #: app/menubar.c:567 msgid "/Edit/Selection/C_ut" @@ -1080,26 +1042,23 @@ #: app/menubar.c:568 msgid "/Edit/Selection/_Copy" -msgstr "/Edition/Selection/_Copia" +msgstr "/Edition/Selection/_Copier" #: app/menubar.c:569 msgid "/Edit/Selection/_Paste" msgstr "/Edit/Selection/Co_ller" #: app/menubar.c:570 -#, fuzzy msgid "/Edit/Selection/_Interpolate effects" -msgstr "/Edit/Selection/Co_ller" +msgstr "/Edit/Selection/_Interpolation" #: app/menubar.c:571 -#, fuzzy msgid "/Edit/Track/Increment cmd value" -msgstr "/Edition/Track/I_nsérer" +msgstr "/Edition/Track/Incrément valeur cmd" #: app/menubar.c:572 -#, fuzzy msgid "/Edit/Track/Decrement cmd value" -msgstr "/Edition/Track/A_nnuler" +msgstr "/Edition/Track/Décrément valeur cmd" #: app/menubar.c:573 msgid "/_Pattern" @@ -1130,22 +1089,20 @@ msgstr "/Instruments/_Charger XI..." #: app/menubar.c:580 -#, fuzzy msgid "/Instrument/_Save XI..." -msgstr "/Instruments/_Charger XI..." +msgstr "/Instruments/_Sauver XI..." #: app/menubar.c:581 app/menubar.c:583 msgid "/Instrument/-" msgstr "/Instruments/-" #: app/menubar.c:582 -#, fuzzy msgid "/Instrument/_Clear Current" -msgstr "/Instruments/_Enlever les Instruments non utilisés" +msgstr "/Instruments/_Vider Courant" #: app/menubar.c:584 msgid "/Instrument/_Delete Unused Instruments" -msgstr "/Instruments/_Enlever les Instruments non utilisés" +msgstr "/Instruments/_Supprimer les Instruments non utilisés" #: app/menubar.c:585 msgid "/_Settings" @@ -1153,27 +1110,23 @@ #: app/menubar.c:586 msgid "/Settings/Display _Oscilloscopes" -msgstr "/Configuration/Montrer les _Oscilloscopes" +msgstr "/Configuration/Afficher les _Oscilloscopes" #: app/menubar.c:587 -#, fuzzy msgid "/Settings/_Tracker" -msgstr "/Configuration/-" +msgstr "/Configuration/-Trackeur" #: app/menubar.c:588 -#, fuzzy msgid "/Settings/Tracker/Use _Backing Store" -msgstr "/Configuration/Utiliser les _Backing Store" +msgstr "/Configuration/Trackeur/_Utiliser les _Backing Store" #: app/menubar.c:589 -#, fuzzy msgid "/Settings/Tracker/_Previous font" -msgstr "/Configuration/Sauvez la Configuration en Quittant" +msgstr "/Configuration/Trackeur/_Police précédente" #: app/menubar.c:590 -#, fuzzy msgid "/Settings/Tracker/_Next font" -msgstr "/Configuration/Sauvez la Configuration en Quittant" +msgstr "/Configuration/_Police suivante" #: app/menubar.c:591 app/menubar.c:596 msgid "/Settings/-" @@ -1185,16 +1138,15 @@ #: app/menubar.c:593 msgid "/Settings/_Audio Configuration..." -msgstr "/Configuration/Configuration du Son Audio..." +msgstr "/Configuration/Configuration Audio..." #: app/menubar.c:594 msgid "/Settings/_GUI Configuration..." msgstr "Configuration/Configuration de la _GUI..." #: app/menubar.c:595 -#, fuzzy msgid "/Settings/_MIDI Configuration..." -msgstr "Configuration/Configuration de la _GUI..." +msgstr "Configuration/Configuration MIDI" #: app/menubar.c:597 msgid "/Settings/_Save Settings now" @@ -1222,7 +1174,7 @@ #: app/menubar.c:603 msgid "/Help/_XM Effects..." -msgstr "/Aide/Effects _XM..." +msgstr "/Aide/Effets _XM..." #: app/module-info.c:115 msgid "Instrument Name" @@ -1240,7 +1192,7 @@ msgid "Linear" msgstr "Linéaire" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "Amiga" @@ -1254,21 +1206,21 @@ #: app/module-info.c:179 msgid "Frequencies:" -msgstr "Fréquence:" +msgstr "Fréquences:" #: app/module-info.c:184 msgid "ProTracker Mode" msgstr "Mode ProTracker" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" -msgstr "Duréee de la musique" +msgstr "Durée de la musique" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "Position courante" -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "Redémarre la position" @@ -1280,267 +1232,262 @@ "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:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "Pas de boucle" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "Ping Pong" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "8 bits" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "16 bits" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "Editeur d'échantillon" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "Volume" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "Panoramique" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "Regulation affinée" -#: app/sample-editor.c:274 -#, fuzzy +#: app/sample-editor.c:277 msgid "Selection:" -msgstr "_Sélection" +msgstr "Sélection:" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 -#, fuzzy +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 msgid "None" -msgstr "Note:" +msgstr "Aucun" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 msgid "All" -msgstr "" +msgstr "Tout" -#: app/sample-editor.c:305 -#, fuzzy +#: app/sample-editor.c:308 msgid "Length:" -msgstr "Durée" +msgstr "Durée:" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" -msgstr "" +msgstr "Assigner en tant que boucle" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "NoteRelative" -#: app/sample-editor.c:340 -#, fuzzy +#: app/sample-editor.c:343 msgid "Load Sample..." -msgstr "Charge Echantillon.." +msgstr "Charger Echantillon.." -#: app/sample-editor.c:342 -#, fuzzy +#: app/sample-editor.c:345 msgid "Save WAV..." -msgstr "Sauve WAV.." +msgstr "Sauver WAV.." -#: app/sample-editor.c:344 -#, fuzzy +#: app/sample-editor.c:347 msgid "Save region as WAV..." -msgstr "Sauve WAV.." +msgstr "Sauver la région en WAV.." -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" -msgstr "Sauve WAV" +msgstr "Sauver WAV" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" -msgstr "" +msgstr "Sauver Region" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "Moniteur" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "Rampe du Volume" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" -msgstr "Zoom la sélection" +msgstr "Zoom dans la sélection" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "Montrer tout" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "Zoom avant (+50%)" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "Zoom arrière (-50%)" -#: app/sample-editor.c:418 -#, fuzzy +#: app/sample-editor.c:421 msgid "Reverse" -msgstr "Enlever" +msgstr "Inverser" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "Couper" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "Enlever" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "Copier" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "Coller" -#: app/sample-editor.c:452 -#, fuzzy +#: app/sample-editor.c:455 msgid "Clear Sample" -msgstr "Charge Echantillon" +msgstr "Effacer Echantillon" -#: app/sample-editor.c:490 -#, fuzzy +#: app/sample-editor.c:505 msgid "(no selection)" -msgstr "Zoom la sélection" +msgstr "(pas de sélection)" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "Erreur de lecture." -#: app/sample-editor.c:1355 -#, fuzzy +#: app/sample-editor.c:1370 msgid "Load stereo sample" -msgstr "Charge Echantillon" +msgstr "Charger Echantillon Stéréo" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" "\n" "Please choose which channel to load:" msgstr "" +"Vous avez sélectionnez un échantillon stéréo!\n" +"(SoundTracker ne supporte que les échantillon mono!)\n" +"\n" +"SVP choisissez le canal à charger:" -#: app/sample-editor.c:1374 -#, fuzzy +#: app/sample-editor.c:1389 msgid "Left" -msgstr "Gauche [%]:" +msgstr "Gauche" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" -msgstr "" +msgstr "Mixer" -#: app/sample-editor.c:1386 -#, fuzzy +#: app/sample-editor.c:1401 msgid "Right" -msgstr "Droit [%]:" +msgstr "Droit" -#: app/sample-editor.c:1464 -#, fuzzy +#: app/sample-editor.c:1479 msgid "Load raw sample" -msgstr "Charge Echantillon" +msgstr "Charger Echantillon brut" -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" "\n" "Please choose a format:" msgstr "" +"Vous avez selectionné un echantillon\n" +"d'un format inconnue. Vous pouvez charger la donnée brut maintenant.\n" +"\n" +"SVP choisissez un format:" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" -msgstr "" +msgstr "Wortformat:" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "OK" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "Impossible de lire l'échantillon" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "" -"L'échantillon est trop long pour le mixer. Continue chargement néanmoins." +"L'échantillon est trop long pour le mixer. Continue chargementnéanmoins." -#: app/sample-editor.c:1599 +#: app/sample-editor.c:1614 #, fuzzy msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "Ne peut supporter que les échantillons mono 8/16 bits" -#: app/sample-editor.c:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." -msgstr "" +msgstr "Rien à sauver." -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "Démarre l'échantillonage" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" -msgstr "" +msgstr "Pas de pilotes d'échantillon disponible" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "Fenêtre d'echantillonage" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 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." +"L'échantillon enregistré est trop long pour le mixer. Continuenéanmoins." -#: app/sample-editor.c:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "Normaliser" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "Exécuter" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "Rampe du Volume" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "Appliquer un volume linéaire à la sélection " -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "Gauche [%]:" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" -msgstr "" +msgstr "H" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" -msgstr "" +msgstr "D" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "Droit [%]:" @@ -1578,9 +1525,8 @@ "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" +"Vous pouvez rendre le mode d'édition de SoundTracker plus réactif au\n" +"clavier en diminuant la taille du buffer du mixer dans l'objet \"Edition\"\n" "qui est dans la Configuration Audio." #: app/tips-dialog.c:260 @@ -1608,50 +1554,46 @@ 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." +"page de l'éditeur d'instrument." #: app/track-editor.c:85 msgid "Arpeggio" -msgstr "" +msgstr "Arpeggio" #. 0 #: app/track-editor.c:86 msgid "Porta up" -msgstr "" +msgstr "Porta haut" #. 1 #: app/track-editor.c:87 -#, fuzzy msgid "Porta down" -msgstr "Une octave en dessous" +msgstr "Porta bas" #. 2 #: app/track-editor.c:88 app/track-editor.c:152 msgid "Tone porta" -msgstr "" +msgstr "Porta ton" #. 3 #: app/track-editor.c:89 app/track-editor.c:148 -#, fuzzy msgid "Vibrato" -msgstr "Tipe de vibrato:" +msgstr "Vibrato" #. 4 #: app/track-editor.c:90 msgid "Tone porta + Volume slide" -msgstr "" +msgstr "Porta ton + variation volume" #. 5 #: app/track-editor.c:91 msgid "Vibrato + Volume slide" -msgstr "" +msgstr "Vibrato + variation volume" #. 6 #: app/track-editor.c:92 -#, fuzzy msgid "Tremolo" -msgstr "Tempo" +msgstr "Trémolo" #. 7 #: app/track-editor.c:93 app/track-editor.c:149 @@ -1662,7 +1604,7 @@ #. 8 #: app/track-editor.c:94 app/track-editor.c:96 msgid "Position jump" -msgstr "" +msgstr "Position saut" #. 9 #: app/track-editor.c:95 app/track-editor.c:97 app/track-editor.c:173 @@ -1672,63 +1614,60 @@ #. C #: app/track-editor.c:98 -#, fuzzy msgid "Pattern break" -msgstr "Pattern" +msgstr "Rupture pattern" #. D #. E #: app/track-editor.c:100 msgid "Set tempo/bpm" -msgstr "" +msgstr "Tempo/bmp" #. F #: app/track-editor.c:101 msgid "Set global volume" -msgstr "" +msgstr "Volume général" #. G #: app/track-editor.c:102 msgid "Global volume slide" -msgstr "" +msgstr "Variation du volume général" #. H #. I #. J #: app/track-editor.c:105 msgid "Key off" -msgstr "" +msgstr "Note coupée" #. K #: app/track-editor.c:106 msgid "Set envelop position" -msgstr "" +msgstr "Position envelope" #. L #. M #. N #. O #: app/track-editor.c:110 -#, fuzzy msgid "Panning slide" -msgstr "Panoramique" +msgstr "Variation panoramique" #. P #: app/track-editor.c:111 msgid "LP filter resonance" -msgstr "" +msgstr "LP Filtre résonant" #. Q #: app/track-editor.c:112 msgid "Multi retrig note" -msgstr "" +msgstr "Note multi retour" #. R #. S #: app/track-editor.c:114 -#, fuzzy msgid "Tremor" -msgstr "Tempo" +msgstr "Tremor" #. T #. U @@ -1738,85 +1677,81 @@ #. Y #: app/track-editor.c:120 msgid "LP filter cutoff" -msgstr "" +msgstr "LP filtre coupe" #. 0 #: app/track-editor.c:125 msgid "Fine porta up" -msgstr "" +msgstr "Porta haut affiné" #. 1 #: app/track-editor.c:126 msgid "Fine porta down" -msgstr "" +msgstr "Porta bas affiné" #. 2 #: app/track-editor.c:127 msgid "Set gliss control" -msgstr "" +msgstr "Control de gliss" #. 3 #: app/track-editor.c:128 msgid "Set vibrato control" -msgstr "" +msgstr "Control vibrato" #. 4 #: app/track-editor.c:129 -#, fuzzy msgid "Set finetune" -msgstr "Regulation affinée" +msgstr "Régulation affinée" #. 5 #: app/track-editor.c:130 msgid "Set loop begin/loop" -msgstr "" +msgstr "Boucle démarre/boucle" #. 6 #: app/track-editor.c:131 msgid "Set tremolo control" -msgstr "" +msgstr "Control du trémolo" #. 7 #. 8 #: app/track-editor.c:133 msgid "Retrig note" -msgstr "" +msgstr "Note de retour" #. 9 #: app/track-editor.c:134 app/track-editor.c:146 msgid "Fine volume slide up" -msgstr "" +msgstr "Volume variation haut affiné" #. A #: app/track-editor.c:135 app/track-editor.c:145 msgid "Fine volume slide down" -msgstr "" +msgstr "Volume variation bas affiné" #. B #: app/track-editor.c:136 -#, fuzzy msgid "Note cut" -msgstr "Note:" +msgstr "Coupe note" #. C #: app/track-editor.c:137 msgid "Note delay" -msgstr "" +msgstr "Note délaie" #. D #: app/track-editor.c:138 -#, fuzzy msgid "Pattern delay" -msgstr "Pattern" +msgstr "Pattern délaie" #: app/track-editor.c:143 msgid "Volume slide down" -msgstr "" +msgstr "Volume variation bas" #: app/track-editor.c:144 -#, fuzzy msgid "Volume slide up" -msgstr "Rampe du Volume" +msgstr "Volume variation haut" #: app/track-editor.c:147 #, fuzzy @@ -1824,18 +1759,16 @@ msgstr "Tipe de vibrato:" #: app/track-editor.c:150 -#, fuzzy msgid "Panning slide left" -msgstr "volume du panoramique" +msgstr "Panoramique variation gauche" #: app/track-editor.c:151 msgid "Panning slide right" -msgstr "" +msgstr "Panoramique variation droit" #: app/track-editor.c:156 -#, fuzzy msgid "sine" -msgstr "Sinus" +msgstr "sinus" #. 0 #: app/track-editor.c:157 @@ -1845,49 +1778,44 @@ #. 1 #: app/track-editor.c:158 -#, fuzzy msgid "square" -msgstr "Square" +msgstr "square" #: app/track-editor.c:332 msgid "Jazz Edit:" msgstr "Jazz Edition:" #: app/track-editor.c:377 -#, fuzzy msgid "Tracker" -msgstr "T_rack" +msgstr "Trackeur" #: app/tracker-settings.c:233 msgid "Font list" -msgstr "" +msgstr "Liste des polices" #: app/tracker-settings.c:257 msgid "Add font" -msgstr "" +msgstr "Ajout de police" #: app/tracker-settings.c:263 -#, fuzzy msgid "Delete font" -msgstr "Annuler" +msgstr "Supprimer police" #: app/tracker-settings.c:269 msgid "Apply font" -msgstr "" +msgstr "Appliquer police" #: app/tracker-settings.c:284 msgid "Up" -msgstr "" +msgstr "Haut" #: app/tracker-settings.c:287 -#, fuzzy msgid "Down" -msgstr "Saw Faible" +msgstr "Bas" #: app/tracker-settings.c:290 -#, fuzzy msgid "Select font..." -msgstr "_Sélection" +msgstr "Sélectioner Police..." #: app/transposition.c:166 msgid "Whole Song" @@ -1965,44 +1893,44 @@ msgid "Instrument 2:" msgstr "Instrument 2:" -#: app/xm.c:188 +#: app/xm.c:190 #, 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:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "Le fichier n'est pas un instrument XI." -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "Version XI 0x%x inconnue\n" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "Tipe de vibrato %d invalide, utilise le Sinus.\n" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "Erreur lors de la lecture des patterns." -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "Ne peut ouvrir le fichier" -#: app/xm.c:920 +#: app/xm.c:922 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:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "Erreur lors de la lecture des instruments." -#: app/xm.c:975 +#: app/xm.c:977 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -2011,56 +1939,7 @@ "Le module contient de(s) sample(s) qui sont trop long pour le mixer.\n" "La taille maximum est de %d." -#: app/xm.c:1299 -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:1349 #, fuzzy -#~ msgid "Save Song as XM..." -#~ msgstr "Sauve XM..." - -#, fuzzy -#~ msgid "/File/Save Song as XM..." -#~ msgstr "/Fichier/Sauver _sous..." - -#~ msgid "Master Reverb" -#~ msgstr "Reverb Principale" - -#~ msgid "Playback Effects Configuration" -#~ msgstr "Configuration des effets audio" - -#~ msgid "Saving Instruments not yet supported." -#~ msgstr "La sauvegarde des instruments n'est pas encore supportée." - -#~ msgid "_Playback Effects..." -#~ msgstr "Effects _Audio..." - -#~ msgid "/Settings/_Playback Effects..." -#~ msgstr "/Configuration/Effects _Audio..." - -#~ msgid "/Settings/Display Oscilloscopes" -#~ msgstr "/Configuration/Montrer les Oscilloscopes" - -#~ msgid "/Settings/Use Backing Store" -#~ msgstr "/Configuration/Utiliser les Backing Store" - -#~ msgid "SelStart" -#~ msgstr "InitSelection" - -#~ msgid "SelEnd" -#~ msgstr "FinSelection" - -#~ msgid "Reset Sel" -#~ msgstr "RedémarreSelection" - -#~ msgid "Length: 0" -#~ msgstr "Durée: 0" - -#~ msgid "Resample" -#~ msgstr "Rééchantillone" - -#~ msgid "Filter" -#~ msgstr "Filtre" - -#~ msgid "Length: %d" -#~ msgstr "Durée: %d" +msgid "Not FastTracker XM and not supported MOD format!" +msgstr "Il n'y a pas de XM FastTracker et de format MOD supporté!" Binary files soundtracker-0.6.1/po/it.gmo and soundtracker-0.6.2/po/it.gmo differ diff -urN soundtracker-0.6.1/po/it.po soundtracker-0.6.2/po/it.po --- soundtracker-0.6.1/po/it.po Sun Oct 22 20:47:44 2000 +++ soundtracker-0.6.2/po/it.po Wed Jan 3 15:04:17 2001 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.5.7\n" -"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"POT-Creation-Date: 2001-01-03 14:48+0100\n" "PO-Revision-Date: 2000-09-02 19:19+01:00\n" "Last-Translator: Yuri Bongiorno \n" "Language-Team: Italian \n" @@ -50,7 +50,7 @@ msgid "Mixers" msgstr "Mixer" -#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "Chiudi" @@ -71,12 +71,12 @@ msgstr "Questi cambiamenti avranno effetto alla prossima riproduzione." #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "Risoluzione:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "Canali:" @@ -157,7 +157,7 @@ msgid "no settings (yet), sorry!" msgstr "non ci sono (ancora) impostazioni, mi dispiace!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "Impossibile aprire il file per la scrittura." @@ -200,11 +200,11 @@ msgid "Value" msgstr "Valore" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "Inserisce" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" msgstr "Cancella" @@ -234,11 +234,11 @@ msgid "Loop" msgstr "Ciclo" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "Inizio" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "Fine" @@ -258,7 +258,7 @@ msgid "Save Song" msgstr "Salva il brano" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" msgstr "Carica il campione" @@ -415,28 +415,28 @@ msgid "Song saved." msgstr "Brano salvato." -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "Domanda" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "Annulla" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "Attenzione" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "Errore!" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "Tempo" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -444,67 +444,67 @@ "Sei sicuro di volerti liberare dell'attuale progetto?\n" "Tutti i cambiamenti andranno persi!" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "Sei sicuro di voler sovrascrivere il file?" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." msgstr "Carica XM..." -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." msgstr "Salva XM..." -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." msgstr "Riversa il modulo su file WAV..." -#: app/gui.c:1301 +#: app/gui.c:1258 msgid "Save song as XM..." msgstr "Salva il brano come XM..." -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "Suona brano" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "Suona pattern" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "Stop" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "Numero di canali:" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "Pattern" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "Lunghezza pattern" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "Ottava" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "Passo" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "Strumento" -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "Campione" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" msgstr "%M:%S" @@ -1192,7 +1192,7 @@ msgid "Linear" msgstr "Lineare" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "Amiga" @@ -1212,15 +1212,15 @@ msgid "ProTracker Mode" msgstr "Modalità ProTracker" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" msgstr "Lunghezza brano" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "Attuale posizione" -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "Ricomincia da" @@ -1232,147 +1232,147 @@ "Una directory chiamata '.soundtracker' è stata creata nella tua\n" "home directory per immagazzinare i file di configurazione.\n" -#: app/sample-editor.c:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "Nessun ciclo" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "Ping Pong" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "8 bit" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "16 bit" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "Editor del campione" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "Volume" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "Pan" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "Regolazione fine" -#: app/sample-editor.c:274 +#: app/sample-editor.c:277 msgid "Selection:" msgstr "Selezione:" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 msgid "None" msgstr "Niente" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 msgid "All" msgstr "Tutto" -#: app/sample-editor.c:305 +#: app/sample-editor.c:308 msgid "Length:" msgstr "Lunghezza:" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" msgstr "Imposta come ciclo" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "Nota relativa" -#: app/sample-editor.c:340 +#: app/sample-editor.c:343 msgid "Load Sample..." msgstr "Carica il campione..." -#: app/sample-editor.c:342 +#: app/sample-editor.c:345 msgid "Save WAV..." msgstr "Salva WAV..." -#: app/sample-editor.c:344 +#: app/sample-editor.c:347 msgid "Save region as WAV..." msgstr "Salva la regione come WAV..." -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" msgstr "Salva WAV" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" msgstr "Salva la regione" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "Monitor" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "Rampa di volume" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" msgstr "Zoom sulla selezione" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "Mostra tutto" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "Zoom avanti (+50%)" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "Zoom indietro (-50%)" -#: app/sample-editor.c:418 +#: app/sample-editor.c:421 msgid "Reverse" msgstr "Capovolgi" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "Taglia" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "Rimuove" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "Copia" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "Incolla" -#: app/sample-editor.c:452 +#: app/sample-editor.c:455 msgid "Clear Sample" msgstr "Cancella campione" -#: app/sample-editor.c:490 +#: app/sample-editor.c:505 msgid "(no selection)" msgstr "(nessuna selezione)" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "Errore di lettura." -#: app/sample-editor.c:1355 +#: app/sample-editor.c:1370 msgid "Load stereo sample" msgstr "Carica il campione stereo" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1384,23 +1384,23 @@ "\n" "Per favore scegli quale canale caricare:" -#: app/sample-editor.c:1374 +#: app/sample-editor.c:1389 msgid "Left" msgstr "Sinistra" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" msgstr "Mix" -#: app/sample-editor.c:1386 +#: app/sample-editor.c:1401 msgid "Right" msgstr "Destra" -#: app/sample-editor.c:1464 +#: app/sample-editor.c:1479 msgid "Load raw sample" msgstr "Carica campione raw" -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" @@ -1412,80 +1412,80 @@ "\n" "Per favore scegli un formato:" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" msgstr "Formato word" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "OK" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "Impossibile leggere il campione" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 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:1599 +#: app/sample-editor.c:1614 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:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." msgstr "Niente da salvare." -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "Inizia il campionamento" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" msgstr "Nessun driver di campionamento libero" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "Finestra di campionamento" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 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:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "Normalizza" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "Esegui" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "Rampa di volume" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "Esegue una dissolvenza lineare del volume sulla selezione" -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "Sinistra [%]:" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" msgstr "H" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" msgstr "D" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "Destra [%]:" @@ -1886,44 +1886,44 @@ msgid "Instrument 2:" msgstr "Strumento 2:" -#: app/xm.c:188 +#: app/xm.c:190 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "La lunghezza del pattern è fuori dall'intervallo: %d.\n" -#: app/xm.c:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "Il file non è uno strumento XI." -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "Versione XI 0x%x sconosciuta\n" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "Tipo di vibrato %d non valido, uso il seno.\n" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "Errore durante il caricamento dei pattern." -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "Impossibile aprire il file" -#: app/xm.c:920 +#: app/xm.c:922 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:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "Errore durante il caricamento degli strumenti." -#: app/xm.c:975 +#: app/xm.c:977 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1932,6 +1932,7 @@ "Il modulo contiene campioni che sono troppo lunghi per l'attuale mixer.\n" "La lunghezza massima del campione è %d." -#: app/xm.c:1299 -msgid "No FastTracker XM and no supported MOD format!" +#: app/xm.c:1349 +#, fuzzy +msgid "Not FastTracker XM and not supported MOD format!" msgstr "Non è un XM di FastTracker nè un formato MOD supportato!" Binary files soundtracker-0.6.1/po/ja.gmo and soundtracker-0.6.2/po/ja.gmo differ diff -urN soundtracker-0.6.1/po/ja.po soundtracker-0.6.2/po/ja.po --- soundtracker-0.6.1/po/ja.po Sun Oct 22 20:47:45 2000 +++ soundtracker-0.6.2/po/ja.po Wed Jan 3 15:04:17 2001 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: SoundTracker 0.3.10\n" -"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"POT-Creation-Date: 2001-01-03 14:48+0100\n" "PO-Revision-Date: 2000-09-26 13:37+09:00\n" "Last-Translator: Atsushi Yamagata \n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ msgid "Mixers" msgstr "¥ß¥­¥µ" -#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "ÊĤ¸¤ë" @@ -71,12 +71,12 @@ msgstr "±éÁÕ¤òºÆ³«¤¹¤ë¤Þ¤Ç¤³¤ì¤é¤ÎÊѹ¹¤Ï¤Ê¤µ¤ì¤Þ¤»¤ó¡£" #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "²òÁüÅÙ:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "¥Á¥ã¥ó¥Í¥ë:" @@ -155,7 +155,7 @@ msgid "no settings (yet), sorry!" msgstr "¤¹¤ß¤Þ¤»¤ó¡¢(¤Þ¤À)ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "½ñ¤­¹þ¤ß¤Î¤¿¤á¤Ë¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£" @@ -198,11 +198,11 @@ msgid "Value" msgstr "ÃÍ" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "ÁÞÆþ" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" msgstr "ºï½ü" @@ -232,11 +232,11 @@ msgid "Loop" msgstr "¥ë¡¼¥×" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "³«»Ï" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "½ªÎ»" @@ -256,7 +256,7 @@ msgid "Save Song" msgstr "¶ÊÊݸ" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" msgstr "¥µ¥ó¥×¥ë¡¦¥í¡¼¥É" @@ -412,28 +412,28 @@ msgid "Song saved." msgstr "¶Ê¤¬Êݸ¤µ¤ì¤Þ¤·¤¿¡£" -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "¼ÁÌä" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "¼è¾Ã" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "·Ù¹ð" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "¥¨¥é¡¼!" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "¥Æ¥ó¥Ý" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -441,67 +441,67 @@ "¥«¥ì¥ó¥È¡¦¥×¥í¥¸¥§¥¯¥È¤ò²òÊü¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?\n" "Á´¤Æ¤ÎÊѹ¹¤¬¼º¤ï¤ì¤Þ¤¹!" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." msgstr "XM¥í¡¼¥É..." -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." msgstr "XMÊݸ..." -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." msgstr "WAV¤È¤·¤Æ¥â¥¸¥å¡¼¥ë¤ò¥ì¥ó¥À¥ê¥ó¥°¤¹¤ë..." -#: app/gui.c:1301 +#: app/gui.c:1258 msgid "Save song as XM..." msgstr "XM¤È¤·¤Æ¶ÊÊݸ..." -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "¶Ê±éÁÕ" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "¥Ñ¥¿¡¼¥ó±éÁÕ" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "Ää»ß" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "¥Á¥ã¥ó¥Í¥ë¿ô:" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "¥Ñ¥¿¡¼¥ó" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "¥Ñ¥¿¡¼¥óĹ" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "¥ª¥¯¥¿¡¼¥Ö" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "¥¸¥ã¥ó¥×" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "³Ú´ï" -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "¥µ¥ó¥×¥ë" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" msgstr "" @@ -1181,7 +1181,7 @@ msgid "Linear" msgstr "Àþ·¿" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "Amiga" @@ -1201,15 +1201,15 @@ msgid "ProTracker Mode" msgstr "ProTracker¥â¡¼¥É" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" msgstr "¶ÊĹ" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "¸½ºß°ÌÃÖ" -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "ºÆ³«»Ï°ÌÃÖ" @@ -1221,147 +1221,147 @@ "ÀßÄê¥Õ¥¡¥¤¥ë¤òµ­²±¤¹¤ë¤¿¤á¡¢¤¢¤Ê¤¿¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë\n" "¥Ç¥£¥ì¥¯¥È¥ê'.soundtracker'¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\n" -#: app/sample-editor.c:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "¥ë¡¼¥×̵¤·" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "¥Ô¥ó¥Ý¥ó" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "8¥Ó¥Ã¥È" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "16¥Ó¥Ã¥È" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "¥µ¥ó¥×¥ëÊÔ½¸" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "²»ÎÌ" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "ÈùÄ´À°" -#: app/sample-editor.c:274 +#: app/sample-editor.c:277 msgid "Selection:" msgstr "ÁªÂò:" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 msgid "None" msgstr "̵" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 msgid "All" msgstr "Á´¤Æ" -#: app/sample-editor.c:305 +#: app/sample-editor.c:308 msgid "Length:" msgstr "Ťµ:" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" msgstr "¥ë¡¼¥×¤È¤·¤ÆÀßÄê" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "" -#: app/sample-editor.c:340 +#: app/sample-editor.c:343 msgid "Load Sample..." msgstr "¥µ¥ó¥×¥ë¡¦¥í¡¼¥É..." -#: app/sample-editor.c:342 +#: app/sample-editor.c:345 msgid "Save WAV..." msgstr "WAVÊݸ..." -#: app/sample-editor.c:344 +#: app/sample-editor.c:347 msgid "Save region as WAV..." msgstr "WAV¤È¤·¤ÆÈÏ°ÏÊݸ..." -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" msgstr "WAVÊݸ" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" msgstr "ÈÏ°ÏÊݸ" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "¥â¥Ë¥¿" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" msgstr "ÁªÂòÉôʬ³ÈÂç" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "Á´¤Æɽ¼¨" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "³ÈÂç(+50%)" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "½Ì¾®(-50%)" -#: app/sample-editor.c:418 +#: app/sample-editor.c:421 msgid "Reverse" msgstr "¥ê¥Ð¡¼¥¹" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "ÀÚ¼è" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "°ÜÆ°" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "¥³¥Ô¡¼" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "ŽÉÕ" -#: app/sample-editor.c:452 +#: app/sample-editor.c:455 msgid "Clear Sample" msgstr "¥µ¥ó¥×¥ë¾Ãµî" -#: app/sample-editor.c:490 +#: app/sample-editor.c:505 msgid "(no selection)" msgstr "(̵ÁªÂò)" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "<º£Å½ÉÕ¤±¤µ¤ì¤Þ¤·¤¿>" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "Æɤ߹þ¤ß¥¨¥é¡¼¡£" -#: app/sample-editor.c:1355 +#: app/sample-editor.c:1370 msgid "Load stereo sample" msgstr "¥¹¥Æ¥ì¥ª¡¦¥µ¥ó¥×¥ë¡¦¥í¡¼¥É" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1373,23 +1373,23 @@ "\n" "¥í¡¼¥É¤¹¤ë¤¿¤á¤Î¥Á¥ã¥ó¥Í¥ë¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤:" -#: app/sample-editor.c:1374 +#: app/sample-editor.c:1389 msgid "Left" msgstr "º¸" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" msgstr "¥ß¥Ã¥¯¥¹" -#: app/sample-editor.c:1386 +#: app/sample-editor.c:1401 msgid "Right" msgstr "±¦" -#: app/sample-editor.c:1464 +#: app/sample-editor.c:1479 msgid "Load raw sample" msgstr "À¸¥µ¥ó¥×¥ë¡¦¥í¡¼¥É" -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" @@ -1401,83 +1401,83 @@ "\n" "½ñ¼°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" msgstr "" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "λ²ò" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "¥µ¥ó¥×¥ë¤¬Æɤ߹þ¤á¤Þ¤»¤ó" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "" "¥µ¥ó¥×¥ë¤¬¸½ºß¤Î¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë¤Ë¤ÏĹ²á¤®¤Þ¤¹¡£\n" "¤È¤Ë¤«¤¯¥í¡¼¥É¤·¤Þ¤¹¡£" -#: app/sample-editor.c:1599 +#: app/sample-editor.c:1614 msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "2¥Á¥ã¥ó¥Í¥ë¤Þ¤Ç¤Ç 8¡¢16¥Ó¥Ã¥È¡¦¥µ¥ó¥×¥ë¤Î¤ß½èÍý¤Ç¤­¤Þ¤¹" -#: app/sample-editor.c:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." msgstr "²¿¤âÊݸ¤·¤Ê¤¤¡£" -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "¥µ¥ó¥×¥ê¥ó¥°³«»Ï" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" msgstr "¥µ¥ó¥×¥ê¥ó¥°¡¦¥É¥é¥¤¥Ð¤¬»ÈÍѤǤ­¤Þ¤»¤ó" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "¥µ¥ó¥×¥ê¥ó¥°¡¦¥¦¥£¥ó¥É¥¦" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "<º£¥µ¥ó¥×¥ê¥ó¥°¤·¤Þ¤·¤¿>" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" "Ï¿²»¤·¤¿¥µ¥ó¥×¥ë¤¬¸½ºß¤Î¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë¤Ë¤ÏĹ²á¤®¤Þ¤¹¡£\n" "¤È¤Ë¤«¤¯¤½¤ì¤ò»È¤¤¤Þ¤¹¡£" -#: app/sample-editor.c:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "µ¬³Ê²½" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "¼Â¹Ô" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "ÁªÂò»þ¤Ë²»Î̤òÀþ·¿¤Ë¥Õ¥§¡¼¥É¤¹¤ë" -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "º¸ [%]:" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" msgstr "" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" msgstr "" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "±¦ [%]:" @@ -1877,44 +1877,44 @@ msgid "Instrument 2:" msgstr "³Ú´ï 2:" -#: app/xm.c:188 +#: app/xm.c:190 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "¥Ñ¥¿¡¼¥óŤ¬ÈϰϤò±Û¤¨¤Þ¤·¤¿: %d.\n" -#: app/xm.c:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "¥Õ¥¡¥¤¥ë¤¬XI³Ú´ï¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£" -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "̤ÃΤÎXI¥Ð¡¼¥¸¥ç¥ó0x%x¤Ç¤¹\n" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "ÉÔÀµ¤Ê¥Ð¥¤¥Ö¥ì¡¼¥·¥ç¥ó·¿%d¡¢Àµ¸¹ÇȤò»ÈÍѤ·¤Þ¤¹¡£\n" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "¥Ñ¥¿¡¼¥ó¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼¡£" -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó" -#: app/xm.c:920 +#: app/xm.c:922 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:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "³Ú´ï¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼¡£" -#: app/xm.c:975 +#: app/xm.c:977 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1923,7 +1923,8 @@ "¥â¥¸¥å¡¼¥ë¤¬¸½ºß¤Î¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë¤Ë¤ÏĹ²á¤®¤ë¥µ¥ó¥×¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£\n" "¥µ¥ó¥×¥ë¤ÎºÇÂçŤÏ%d¤Ç¤¹¡£" -#: app/xm.c:1299 -msgid "No FastTracker XM and no supported MOD format!" +#: app/xm.c:1349 +#, fuzzy +msgid "Not FastTracker XM and not supported MOD format!" msgstr "" "FastTracker XM¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤¿MOD¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤â¤¢¤ê¤Þ¤»¤ó!" Binary files soundtracker-0.6.1/po/pl.gmo and soundtracker-0.6.2/po/pl.gmo differ diff -urN soundtracker-0.6.1/po/pl.po soundtracker-0.6.2/po/pl.po --- soundtracker-0.6.1/po/pl.po Sun Oct 22 20:47:45 2000 +++ soundtracker-0.6.2/po/pl.po Wed Jan 3 15:04:17 2001 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker\n" -"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"POT-Creation-Date: 2001-01-03 14:48+0100\n" "PO-Revision-Date: 1999-09-05 15:58+0200\n" "Last-Translator: GNOME PL Team\n" "Language-Team: Polish \n" @@ -49,7 +49,7 @@ msgid "Mixers" msgstr "Modyfikatory:" -#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "Zamknij" @@ -70,12 +70,12 @@ msgstr "Zmiany odnios± efekt po ponownym rozpoczêciu odgrywania." #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "Rozdzielczo¶æ:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "Kana³y:" @@ -153,7 +153,7 @@ msgid "no settings (yet), sorry!" msgstr "na razie brak ustawieñ!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "Nie mo¿na otworzyæ pliku do zapisu." @@ -196,11 +196,11 @@ msgid "Value" msgstr "Warto¶æ" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "Wstaw" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" msgstr "Usuñ" @@ -230,11 +230,11 @@ msgid "Loop" msgstr "Pêtla" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "Pocz±tek" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "Koniec" @@ -257,7 +257,7 @@ msgid "Save Song" msgstr "Odtwórz utwór" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" msgstr "Wczytaj próbkê" @@ -433,28 +433,28 @@ msgid "Song saved." msgstr "Nazwa utworu:" -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "Pytanie" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "Anuluj" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "Ostrze¿enie" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "B³±d!" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "Tempo" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -462,68 +462,68 @@ "Czy na pewno chcesz porzuciæ bie¿±cy projekt?\n" "Wszystkie zmiany zostan± utracone!" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "Czy na pewno chcesz nadpisaæ plik?" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." msgstr "Wczytaj XM..." -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." msgstr "Zapisz XM..." -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." msgstr "" -#: app/gui.c:1301 +#: app/gui.c:1258 #, fuzzy msgid "Save song as XM..." msgstr "Zapisz XM..." -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "Odtwórz utwór" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "Odtwórz pattern" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "Zatrzymaj" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "Liczba kana³ów:" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "Pattern" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "D³ugPat" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "Oktawa" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "Skok" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "Instr" -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "Próbka" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" msgstr "" @@ -1257,7 +1257,7 @@ msgid "Linear" msgstr "Liniowe" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "Amiga" @@ -1277,15 +1277,15 @@ msgid "ProTracker Mode" msgstr "Tryb ProTrackera" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" msgstr "D³ugo¶æ utworu" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "Bie¿±ca pozycja" -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "Pozycja ponowienia" @@ -1297,157 +1297,157 @@ "W katalogu domowym zosta³ utworzony katalog .soundtracker, w\n" "którym zapisywane bêd± pliki konfiguracyjne.\n" -#: app/sample-editor.c:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "Bez pêtli" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "PingPong" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "8 bitów" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "16 bitów" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "Edytor próbek" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "G³o¶no¶æ" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "Przemieszczenie" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "Dopasowanie" -#: app/sample-editor.c:274 +#: app/sample-editor.c:277 #, fuzzy msgid "Selection:" msgstr "Rozdzielczo¶æ:" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 #, fuzzy msgid "None" msgstr "Nuta:" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 msgid "All" msgstr "" -#: app/sample-editor.c:305 +#: app/sample-editor.c:308 #, fuzzy msgid "Length:" msgstr "D³ugo¶æ" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" msgstr "" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "WzglNuta" -#: app/sample-editor.c:340 +#: app/sample-editor.c:343 #, fuzzy msgid "Load Sample..." msgstr "Wczytaj próbkê.." -#: app/sample-editor.c:342 +#: app/sample-editor.c:345 #, fuzzy msgid "Save WAV..." msgstr "Zapisz WAV.." -#: app/sample-editor.c:344 +#: app/sample-editor.c:347 #, fuzzy msgid "Save region as WAV..." msgstr "Zapisz WAV.." -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" msgstr "Zapisz WAV" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" msgstr "" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "Monitoruj" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "Nachyl g³o¶no¶æ" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" msgstr "Powiêksz do zaznaczenia" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "Wy¶wietl ca³o¶æ" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "Powiêksz (+50%)" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "Pomniejsz (-50%)" -#: app/sample-editor.c:418 +#: app/sample-editor.c:421 #, fuzzy msgid "Reverse" msgstr "Usuñ" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "Wytnij" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "Usuñ" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "Kopiuj" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "Wklej" -#: app/sample-editor.c:452 +#: app/sample-editor.c:455 #, fuzzy msgid "Clear Sample" msgstr "Wczytaj próbkê" -#: app/sample-editor.c:490 +#: app/sample-editor.c:505 #, fuzzy msgid "(no selection)" msgstr "Powiêksz do zaznaczenia" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "B³±d odczytu." -#: app/sample-editor.c:1355 +#: app/sample-editor.c:1370 #, fuzzy msgid "Load stereo sample" msgstr "Wczytaj próbkê" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1455,26 +1455,26 @@ "Please choose which channel to load:" msgstr "" -#: app/sample-editor.c:1374 +#: app/sample-editor.c:1389 #, fuzzy msgid "Left" msgstr "Lewy [%s]:" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" msgstr "" -#: app/sample-editor.c:1386 +#: app/sample-editor.c:1401 #, fuzzy msgid "Right" msgstr "Prawy [%]:" -#: app/sample-editor.c:1464 +#: app/sample-editor.c:1479 #, fuzzy msgid "Load raw sample" msgstr "Wczytaj próbkê" -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" @@ -1482,83 +1482,83 @@ "Please choose a format:" msgstr "" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" msgstr "" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "OK" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "Nie mo¿na wczytaæ próbki" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "" "Próbka jest zbyt d³uga dla aktualnego modu³u miksera. Pomimo tego wczytywana." -#: app/sample-editor.c:1599 +#: app/sample-editor.c:1614 #, fuzzy msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "Obs³ugiwane s± tylko próbki 8 i 16 bitowe" -#: app/sample-editor.c:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." msgstr "" -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "Rozpocznij próbkowanie" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" msgstr "" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "Okno próbkowania" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" "Nagrana próbka jest zbyt d³uga dla modu³u miksera. Pomimo tego zostanie " "wykorzystana." -#: app/sample-editor.c:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "Normalizuj" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "Wykonaj" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "Nachylenie g³o¶no¶ci" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "Liniowa zmiana g³o¶no¶ci zaznaczonego fragmentu" -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "Lewy [%s]:" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" msgstr "" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" msgstr "" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "Prawy [%]:" @@ -1979,43 +1979,43 @@ msgid "Instrument 2:" msgstr "Instrument 2:" -#: app/xm.c:188 +#: app/xm.c:190 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "D³ugo¶æ patternu poza zakresem: %d.\n" -#: app/xm.c:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "Plik nie zawiera instrumentów w formacie XI." -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "Nieznana wersja 0x%x XI\n" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "Niepoprawny typ wibrato %d, wykorzystanie sinusa.\n" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "B³±d podczas wczytywania instrumentów." -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "Nie mo¿na otworzyæ pliku" -#: app/xm.c:920 +#: app/xm.c:922 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "D³ugo¶æ nag³ówka XM != 276. Mo¿e to modu³ SoundTrackera przed 0.0.12? :-)\n" -#: app/xm.c:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "B³±d podczas wczytywania instrumentów." -#: app/xm.c:975 +#: app/xm.c:977 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -2024,8 +2024,9 @@ "Modu³ zawiera próbki, które s± zbyt d³ugie dla aktualnego miksera.\n" "Maksymalna d³ugo¶æ próbki wynosi %d." -#: app/xm.c:1299 -msgid "No FastTracker XM and no supported MOD format!" +#: app/xm.c:1349 +#, fuzzy +msgid "Not FastTracker XM and not supported MOD format!" msgstr "Plik nie jest w formacie XM FastTrackera ani w formacie MOD!" #, fuzzy Binary files soundtracker-0.6.1/po/ru.gmo and soundtracker-0.6.2/po/ru.gmo differ diff -urN soundtracker-0.6.1/po/ru.po soundtracker-0.6.2/po/ru.po --- soundtracker-0.6.1/po/ru.po Sun Oct 22 20:47:45 2000 +++ soundtracker-0.6.2/po/ru.po Wed Jan 3 15:04:17 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.3.10\n" -"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"POT-Creation-Date: 2001-01-03 14:48+0100\n" "PO-Revision-Date: 2000-02-21 11:12+0200\n" "Last-Translator: Michael Shigorin \n" "Language-Team: Russian \n" @@ -53,7 +53,7 @@ msgid "Mixers" msgstr "ïÂßÅÄÉÎÉÔØ" -#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "úÁËÒÙÔØ" @@ -74,12 +74,12 @@ msgstr "üÔÉ ÉÚÍÅÎÅÎÉÑ ×ÓÔÕÐÑÔ × ÓÉÌÕ ÐÒÉ ÓÌÅÄÕÀÝÅÍ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÉ." #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "òÁÚÒÅÛÅÎÉÅ:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "ëÁÎÁÌÙ:" @@ -160,7 +160,7 @@ msgid "no settings (yet), sorry!" msgstr "(ÐÏËÁ) ÎÅÔ ÎÁÓÔÒÏÅË, ÓÏÒÒÉ!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÚÁÐÉÓÉ." @@ -203,11 +203,11 @@ msgid "Value" msgstr "úÎÁÞÅÎÉÅ" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "÷ÓÔÁ×ËÁ" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" msgstr "õÄÁÌÅÎÉÅ" @@ -237,11 +237,11 @@ msgid "Loop" msgstr "ãÉËÌ" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "îÁÞÁÌÏ" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "ëÏÎÅÃ" @@ -262,7 +262,7 @@ msgid "Save Song" msgstr "óÏÈÒÁÎÉÔØ ÕÞÁÓÔÏË" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" msgstr "úÁÇÒÕÚÉÔØ ÓÜÍÐÌ" @@ -436,28 +436,28 @@ msgid "Song saved." msgstr "îÅÞÅÇÏ ÓÏÈÒÁÎÑÔØ." -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "÷ÏÐÒÏÓ" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "ïÔÍÅÎÁ" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "ïÛÉÂËÁ!" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "ôÅÍÐ" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -465,68 +465,68 @@ "÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÏÓ×ÏÂÏÄÉÔØ ÔÅËÕÝÉÊ ÐÒÏÅËÔ?\n" "÷ÓÅ ÉÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÐÏÔÅÒÑÎÙ!" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÐÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌ?" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." msgstr "úÁÇÒÕÚÉÔØ XM..." -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." msgstr "óÏÈÒÁÎÉÔØ XM..." -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." msgstr "úÁÐÉÓÁÔØ ÍÏÄÕÌØ ËÁË WAV..." -#: app/gui.c:1301 +#: app/gui.c:1258 #, fuzzy msgid "Save song as XM..." msgstr "óÏÈÒÁÎÉÔØ ÕÞÁÓÔÏË ËÁË WAV..." -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "éÇÒÁÔØ ÐÅÓÎÀ" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "éÇÒÁÔØ ÐÁÔÔÅÒÎ" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "óÔÏÐ" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "ëÏÌÉÞÅÓÔ×Ï ËÁÎÁÌÏ×:" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "ðÁÔÔÅÒÎ" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "äÌÉÎÁ ÐÁÔÔÅÒÎÁ:" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "ïËÔÁ×Á" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "ðÒÙÖÏË" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "éÎÓÔÒÕÍÅÎÔ" -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "óÜÍÐÌ" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" msgstr "" @@ -1226,7 +1226,7 @@ msgid "Linear" msgstr "ìÉÎÅÊÎÏ" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "Amiga" @@ -1246,15 +1246,15 @@ msgid "ProTracker Mode" msgstr "òÅÖÉÍ ProTracker" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" msgstr "äÌÉÎÁ ÐÅÓÎÉ" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "ðÏÚÉÃÉÑ" -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "òÅÓÔÁÒÔ Ó" @@ -1266,152 +1266,152 @@ "ëÁÔÁÌÏÇ ÐÏÄ ÎÁÚ×ÁÎÉÅÍ '.soundtracker' ÓÏÚÄÁÎ × ×ÁÛÅÍ ÄÏÍÁÛÎÅÍ\n" "ËÁÔÁÌÏÇÅ ÄÌÑ ÈÒÁÎÅÎÉÑ × ÎÅÍ ÆÁÊÌÏ× ËÏÎÆÉÇÕÒÁÃÉÉ.\n" -#: app/sample-editor.c:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "îÅÔ ÃÉËÌÁ" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "ðÉÎÇ-ÐÏÎÇ" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "8 ÂÉÔ" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "16 ÂÉÔ" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "òÅÄÁËÔÏÒ ÓÜÍÐÌÏ×" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "çÒÏÍËÏÓÔØ" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "ðÁÎÏÒÁÍÉÒÏ×ÁÎÉÅ" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "ðÏÄÓÔÒÏÊËÁ" -#: app/sample-editor.c:274 +#: app/sample-editor.c:277 #, fuzzy msgid "Selection:" msgstr "_÷ÙÄÅÌÅÎÉÅ" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 #, fuzzy msgid "None" msgstr "îÏÔÁ:" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 #, fuzzy msgid "All" msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ" -#: app/sample-editor.c:305 +#: app/sample-editor.c:308 #, fuzzy msgid "Length:" msgstr "äÌÉÎÁ" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" msgstr "" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "ïÔÎ. ÎÏÔÁ" -#: app/sample-editor.c:340 +#: app/sample-editor.c:343 msgid "Load Sample..." msgstr "úÁÇÒÕÚÉÔØ ÓÜÍÐÌ..." -#: app/sample-editor.c:342 +#: app/sample-editor.c:345 msgid "Save WAV..." msgstr "óÏÈÒÁÎÉÔØ WAV..." -#: app/sample-editor.c:344 +#: app/sample-editor.c:347 msgid "Save region as WAV..." msgstr "óÏÈÒÁÎÉÔØ ÕÞÁÓÔÏË ËÁË WAV..." -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" msgstr "óÏÈÒÁÎÉÔØ WAV" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" msgstr "óÏÈÒÁÎÉÔØ ÕÞÁÓÔÏË" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "óÌÅÄÉÔØ" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "óÐÁÄ ÇÒÏÍËÏÓÔÉ" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" msgstr "õ×ÅÌÉÞÉÔØ ×ÙÄÅÌÅÎÉÅ" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "ðÏËÁÚÁÔØ ×ÓÅ" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "õ×ÅÌÉÞÉÔØ (+50%)" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "õÍÅÎØÛÉÔØ (-50%)" -#: app/sample-editor.c:418 +#: app/sample-editor.c:421 msgid "Reverse" msgstr "ðÅÒÅ×ÅÒÎÕÔØ" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "÷ÙÒÅÚÁÔØ" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "õÄÁÌÉÔØ" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "ëÏÐÉÒÏ×ÁÔØ" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "÷ÓÔÁ×ÉÔØ" -#: app/sample-editor.c:452 +#: app/sample-editor.c:455 msgid "Clear Sample" msgstr "ïÞÉÓÔÉÔØ ÓÜÍÐÌ" -#: app/sample-editor.c:490 +#: app/sample-editor.c:505 #, fuzzy msgid "(no selection)" msgstr "õ×ÅÌÉÞÉÔØ ×ÙÄÅÌÅÎÉÅ" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "<ÔÏÌØËÏ ×ÓÔÁ×ÌÅÎÏ>" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ." -#: app/sample-editor.c:1355 +#: app/sample-editor.c:1370 msgid "Load stereo sample" msgstr "úÁÇÒÕÚÉÔØ ÓÔÅÒÅÏÓÜÍÐÌ" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1423,24 +1423,24 @@ "\n" "÷ÙÂÅÒÉÔÅ, ËÁËÏÊ ÉÚ ËÁÎÁÌÏ× ÚÁÇÒÕÚÉÔØ:" -#: app/sample-editor.c:1374 +#: app/sample-editor.c:1389 msgid "Left" msgstr "ìÅ×ÙÊ" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" msgstr "ïÂßÅÄÉÎÉÔØ" -#: app/sample-editor.c:1386 +#: app/sample-editor.c:1401 msgid "Right" msgstr "ðÒÁ×ÙÊ" -#: app/sample-editor.c:1464 +#: app/sample-editor.c:1479 #, fuzzy msgid "Load raw sample" msgstr "úÁÇÒÕÚÉÔØ ÓÔÅÒÅÏÓÜÍÐÌ" -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" @@ -1448,80 +1448,80 @@ "Please choose a format:" msgstr "" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" msgstr "" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "ïë" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÜÍÐÌ" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "óÜÍÐÌ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ ÄÌÑ ÔÅËÕÝÅÇÏ ÍÉËÓÅÒ-ÍÏÄÕÌÑ. îÏ ÇÒÕÚÉÍ." -#: app/sample-editor.c:1599 +#: app/sample-editor.c:1614 msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "ðÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÔÏÌØËÏ ÓÜÍÐÌÙ 8/16 ÂÉÔ, ÄÏ 2 ËÁÎÁÌÏ×" -#: app/sample-editor.c:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." msgstr "îÅÞÅÇÏ ÓÏÈÒÁÎÑÔØ." -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "îÁÞÁÔØ ÏÃÉÆÒÏ×ËÕ" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" msgstr "" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "ïËÎÏ ÏÃÉÆÒÏ×ËÉ" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "<ÔÏÌØËÏ ÏÃÉÆÒÏ×ÁÎÏ>" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" "úÁÐÉÓÁÎÎÙÊ ÓÜÍÐÌ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ ÄÌÑ ÔÅËÕÝÅÇÏ ÍÉËÓÅÒ-ÍÏÄÕÌÑ. îÏ ÇÒÕÚÉÍ." -#: app/sample-editor.c:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "îÏÒÍÁÌÉÚÏ×ÁÔØ" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "÷ÙÐÏÌÎÉÔØ" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "óÐÁÄ ÇÒÏÍËÏÓÔÉ" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "ðÒÏÉÚ×ÅÓÔÉ ÌÉÎÅÊÎÏÅ ÓÐÁÄÁÎÉÅ ÇÒÏÍËÏÓÔÉ ÎÁ ×ÙÂÒÁÎÎÏÍ ÕÞÁÓÔËÅ" -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "ìÅ×ÙÊ [%]:" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" msgstr "" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" msgstr "" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "ðÒÁ×ÙÊ [%]:" @@ -1942,42 +1942,42 @@ msgid "Instrument 2:" msgstr "éÎÓÔÒÕÍÅÎÔ 2:" -#: app/xm.c:188 +#: app/xm.c:190 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "äÌÉÎÁ ÐÁÔÔÅÒÎÁ ×ÎÅ ÄÉÁÐÁÚÏÎÁ: %d.\n" -#: app/xm.c:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "æÁÊÌ ÎÅ ÓÏÄÅÒÖÉÔ ÉÎÓÔÒÕÍÅÎÔ XI." -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "îÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ XI 0x%x\n" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ×ÉÂÒÁÔÏ %d, ÉÓÐÏÌØÚÕÀ ÓÉÎÕÓÏÉÄÕ.\n" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÐÁÔÔÅÒÎÏ×." -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ" -#: app/xm.c:920 +#: app/xm.c:922 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "äÌÉÎÁ ÚÁÇÏÌÏ×ËÁ XM != 276. íÏÖÅÔ, ÜÔÏ ÏÔ SoundTracker <0.0.12? :-)\n" -#: app/xm.c:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÉÎÓÔÒÕÍÅÎÔÏ×." -#: app/xm.c:975 +#: app/xm.c:977 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1986,8 +1986,9 @@ "íÏÄÕÌØ ÓÏÄÅÒÖÉÔ ÓÜÍÐÌ(Ù) ÓÏ ÓÌÉÛËÏÍ ÂÏÌØÛÏÊ ÄÌÑ ÔÅËÕÝÅÇÏ ÍÉËÓÅÒÁ ÄÌÉÎÏÊ.\n" "íÁËÓÉÍÁÌØÎÁÑ ÄÌÉÎÁ ÓÜÍÐÌÁ -- %d." -#: app/xm.c:1299 -msgid "No FastTracker XM and no supported MOD format!" +#: app/xm.c:1349 +#, fuzzy +msgid "Not FastTracker XM and not supported MOD format!" msgstr "îÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ ÆÏÒÍÁÔ MOD ÉÌÉ ÎÅ FastTracker XM!" #, fuzzy Binary files soundtracker-0.6.1/po/sl.gmo and soundtracker-0.6.2/po/sl.gmo differ diff -urN soundtracker-0.6.1/po/sl.po soundtracker-0.6.2/po/sl.po --- soundtracker-0.6.1/po/sl.po Sun Oct 22 20:47:45 2000 +++ soundtracker-0.6.2/po/sl.po Wed Jan 3 15:04:18 2001 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: SoundTracker 0.6.0\n" -"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"POT-Creation-Date: 2001-01-03 14:48+0100\n" "PO-Revision-Date: 2000-08-17 15:00+0200\n" "Last-Translator: Matej Erman \n" "Language-Team: slovenian \n" @@ -50,7 +50,7 @@ msgid "Mixers" msgstr "Me¹alniki" -#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "Zapri" @@ -71,12 +71,12 @@ msgstr "Te nastavitve bodo upo¹tevane ¹ele po ponovnem predvajanju." #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "Loèljivost:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "Kanali:" @@ -154,7 +154,7 @@ msgid "no settings (yet), sorry!" msgstr "®al (zaenkrat) ¹e brez nastavitev!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "Ne morem odpreti datoteke za pisanje." @@ -197,11 +197,11 @@ msgid "Value" msgstr "Vrednost" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "Vnesi" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" msgstr "Zbri¹i" @@ -231,11 +231,11 @@ msgid "Loop" msgstr "Zanka" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "Zaèetek" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "Konec" @@ -255,7 +255,7 @@ msgid "Save Song" msgstr "Shrani skladbo" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" msgstr "Nalo¾i vzorec" @@ -412,28 +412,28 @@ msgid "Song saved." msgstr "Skladba je shranjena." -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "Vpra¹anje" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "Preklièi" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "Opozorilo" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "Napaka!" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "Hitrost" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -441,67 +441,67 @@ "Ali ste preprièani, da hoèete sprostiti trenutni projekt?\n" "Vse spremembe bodo izgubljene!" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "Ali ste preprièani, da ¾elite pisati prek datoteke?" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." msgstr "Nalo¾i XM..." -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." msgstr "Shrani XM..." -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." msgstr "Ustvari modul kot WAV..." -#: app/gui.c:1301 +#: app/gui.c:1258 msgid "Save song as XM..." msgstr "Shrani skladbo kot XM..." -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "Predvajaj skladbo" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "Predvajaj shemo" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "Ustavi" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "©tevilo kanalov:" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "Shema" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "Dol. sheme" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "Oktava" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "Skok" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "Instr." -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "Vzorec" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" msgstr "%M:%S" @@ -1184,7 +1184,7 @@ msgid "Linear" msgstr "Linearno" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "Amiga" @@ -1204,15 +1204,15 @@ msgid "ProTracker Mode" msgstr "ProTrackerski naèin" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" msgstr "Dol¾ina skladbe" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "Trenutna poz." -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "Poz. ponov. igr." @@ -1224,147 +1224,147 @@ "V va¹em domaèem imeniku je bil usvarjen imenik\n" "'.soundtracker' za shranjevanje nastavitnevih datotek.\n" -#: app/sample-editor.c:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "Brez zanke" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "Ping pong" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "8 bitni" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "16 bitni" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "Urejevalnik vzorcev" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "Glasnost" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "Panorama" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "Natanèna uglasitev" -#: app/sample-editor.c:274 +#: app/sample-editor.c:277 msgid "Selection:" msgstr "Izbor:" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 msgid "None" msgstr "Brez" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 msgid "All" msgstr "Vse" -#: app/sample-editor.c:305 +#: app/sample-editor.c:308 msgid "Length:" msgstr "Dol¾ina:" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" msgstr "Nastavi kot zanko" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "Osnov. nota" -#: app/sample-editor.c:340 +#: app/sample-editor.c:343 msgid "Load Sample..." msgstr "Nalo¾i vzorec..." -#: app/sample-editor.c:342 +#: app/sample-editor.c:345 msgid "Save WAV..." msgstr "Shrani WAV..." -#: app/sample-editor.c:344 +#: app/sample-editor.c:347 msgid "Save region as WAV..." msgstr "Shrani odsek kot WAV..." -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" msgstr "Shrani WAV" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" msgstr "Shrani odsek" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "Spremljaj" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "Nagib glasnosti" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" msgstr "Poveèaj na izbrano" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "Poka¾i vse" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "Poveèaj (+50%)" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "Pomanj¹aj (-50%)" -#: app/sample-editor.c:418 +#: app/sample-editor.c:421 msgid "Reverse" msgstr "Obrni" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "Izre¾i" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "Odstrani" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "Prepi¹i" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "Prilepi" -#: app/sample-editor.c:452 +#: app/sample-editor.c:455 msgid "Clear Sample" msgstr "Poèisti vzorec" -#: app/sample-editor.c:490 +#: app/sample-editor.c:505 msgid "(no selection)" msgstr "(neizbrano)" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "Bralna napaka." -#: app/sample-editor.c:1355 +#: app/sample-editor.c:1370 msgid "Load stereo sample" msgstr "Nalo¾i stereo vzorec" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1376,23 +1376,23 @@ "\n" "Prosim izberite kateri vzorec hoèete nalo¾iti:" -#: app/sample-editor.c:1374 +#: app/sample-editor.c:1389 msgid "Left" msgstr "Levi" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" msgstr "Me¹aj" -#: app/sample-editor.c:1386 +#: app/sample-editor.c:1401 msgid "Right" msgstr "Desni" -#: app/sample-editor.c:1464 +#: app/sample-editor.c:1479 msgid "Load raw sample" msgstr "Nalo¾i raw vzorec" -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" @@ -1404,80 +1404,80 @@ "\n" "Prosim izberite format:" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" msgstr "Wortformat:" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "V redu" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "Ne morem prebrati vzorca" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "Vzorec je predolg za trenutni me¹alni modul. Vseeno ga nalagam." -#: app/sample-editor.c:1599 +#: app/sample-editor.c:1614 msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "Obdelujem lahko le 8 ali 16 bitne vzorce z najveè 2 kanaloma" -#: app/sample-editor.c:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." msgstr "Niè ni za shraniti." -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "Zaèni vzorèiti" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" msgstr "Gonilnika za vzorèenje ni na voljo" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "Vzorèevalno okno" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" "Posneti vzorec je predolg za trenutni me¹alni modul. Vseeno ga uporabljam." -#: app/sample-editor.c:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "Normaliziraj" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "Izvr¹i" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "Nagibanje glasnosti" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "Izvedi linearni prehod na izboru" -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "Levo [%]:" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" msgstr "P" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" msgstr "D" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "Desno [%]:" @@ -1877,43 +1877,43 @@ msgid "Instrument 2:" msgstr "Instrument 2:" -#: app/xm.c:188 +#: app/xm.c:190 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "Dol¾ina sheme ni v dosegu: %d.\n" -#: app/xm.c:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "Datoteka ni XI instrument." -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "Neznana razlièica XI 0x%x\n" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "Napaèna vrsta vibrata %d, uporabil bom sinusno.\n" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "Napaka pri nalaganju shem." -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "Ne morem odpreti datoteke" -#: app/xm.c:920 +#: app/xm.c:922 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "Dol¾ina glave XM != 276. Mogoèe je to modul SoundTrackerja pre-0.0.12 :-)\n" -#: app/xm.c:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "Napaka pri nalaganju instrumentov." -#: app/xm.c:975 +#: app/xm.c:977 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1922,6 +1922,7 @@ "Modul vsebuje vzorec/ce, ki so predolgi za trenutni me¹a¹alnik.\n" "Najveèja dol¾ina vzorca je %d." -#: app/xm.c:1299 -msgid "No FastTracker XM and no supported MOD format!" +#: app/xm.c:1349 +#, fuzzy +msgid "Not FastTracker XM and not supported MOD format!" msgstr "Ni FastTrackerjev XM in ne podprti MOD format." diff -urN soundtracker-0.6.1/po/soundtracker.pot soundtracker-0.6.2/po/soundtracker.pot --- soundtracker-0.6.1/po/soundtracker.pot Wed Sep 27 10:35:19 2000 +++ soundtracker-0.6.2/po/soundtracker.pot Wed Jan 3 14:48:46 2001 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"POT-Creation-Date: 2001-01-03 14:48+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:321 app/gui-settings.c:547 app/sample-editor.c:1962 +#: app/audioconfig.c:321 app/gui-settings.c:547 app/sample-editor.c:1988 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "" @@ -71,12 +71,12 @@ msgstr "" #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:211 -#: app/drivers/oss-output.c:200 app/sample-editor.c:1487 +#: app/drivers/oss-output.c:200 app/sample-editor.c:1502 msgid "Resolution:" msgstr "" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:221 -#: app/drivers/oss-output.c:210 app/sample-editor.c:1517 +#: app/drivers/oss-output.c:210 app/sample-editor.c:1532 msgid "Channels:" msgstr "" @@ -145,7 +145,7 @@ msgid "no settings (yet), sorry!" msgstr "" -#: app/drivers/file-output.c:161 app/sample-editor.c:1638 +#: app/drivers/file-output.c:161 app/sample-editor.c:1664 msgid "Can't open file for writing." msgstr "" @@ -184,11 +184,11 @@ msgid "Value" msgstr "" -#: app/envelope-box.c:887 app/playlist.c:323 +#: app/envelope-box.c:887 app/playlist.c:301 msgid "Insert" msgstr "" -#: app/envelope-box.c:893 app/playlist.c:329 +#: app/envelope-box.c:893 app/playlist.c:307 msgid "Delete" msgstr "" @@ -213,11 +213,11 @@ msgid "Loop" msgstr "" -#: app/envelope-box.c:1015 app/sample-editor.c:240 +#: app/envelope-box.c:1015 app/sample-editor.c:243 msgid "Start" msgstr "" -#: app/envelope-box.c:1016 app/sample-editor.c:241 +#: app/envelope-box.c:1016 app/sample-editor.c:244 msgid "End" msgstr "" @@ -237,7 +237,7 @@ msgid "Save Song" msgstr "" -#: app/file-operations.c:157 app/sample-editor.c:348 +#: app/file-operations.c:157 app/sample-editor.c:351 msgid "Load Sample" msgstr "" @@ -393,94 +393,94 @@ msgid "Song saved." msgstr "" -#: app/gui-subs.c:472 +#: app/gui-subs.c:470 msgid "Question" msgstr "" -#: app/gui-subs.c:489 app/keys.c:705 app/sample-editor.c:1399 -#: app/sample-editor.c:1536 app/sample-editor.c:1740 +#: app/gui-subs.c:487 app/keys.c:705 app/sample-editor.c:1414 +#: app/sample-editor.c:1551 app/sample-editor.c:1766 msgid "Cancel" msgstr "" -#: app/gui-subs.c:507 +#: app/gui-subs.c:505 msgid "Warning" msgstr "" -#: app/gui-subs.c:533 +#: app/gui-subs.c:531 msgid "Error!" msgstr "" -#: app/gui.c:88 +#: app/gui.c:87 msgid "Tempo" msgstr "" -#: app/gui.c:242 +#: app/gui.c:237 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" msgstr "" -#: app/gui.c:256 app/gui.c:270 app/gui.c:284 +#: app/gui.c:251 app/gui.c:265 app/gui.c:279 msgid "Are you sure you want to overwrite the file?" msgstr "" -#: app/gui.c:1293 +#: app/gui.c:1250 msgid "Load XM..." msgstr "" -#: app/gui.c:1295 +#: app/gui.c:1252 msgid "Save XM..." msgstr "" -#: app/gui.c:1298 +#: app/gui.c:1255 msgid "Render module as WAV..." msgstr "" -#: app/gui.c:1301 +#: app/gui.c:1258 msgid "Save song as XM..." msgstr "" -#: app/gui.c:1352 +#: app/gui.c:1309 msgid "Play Song" msgstr "" -#: app/gui.c:1358 +#: app/gui.c:1315 msgid "Play Pattern" msgstr "" -#: app/gui.c:1364 +#: app/gui.c:1321 msgid "Stop" msgstr "" -#: app/gui.c:1383 +#: app/gui.c:1340 msgid "Number of Channels:" msgstr "" -#: app/gui.c:1399 app/playlist.c:316 +#: app/gui.c:1357 app/playlist.c:294 msgid "Pattern" msgstr "" -#: app/gui.c:1415 +#: app/gui.c:1374 msgid "PatLength" msgstr "" -#: app/gui.c:1507 +#: app/gui.c:1467 msgid "Octave" msgstr "" -#: app/gui.c:1517 +#: app/gui.c:1476 msgid "Jump" msgstr "" -#: app/gui.c:1527 +#: app/gui.c:1485 msgid "Instr" msgstr "" -#: app/gui.c:1542 +#: app/gui.c:1501 msgid "Sample" msgstr "" -#: app/gui.c:1605 +#: app/gui.c:1565 msgid "%M:%S" msgstr "" @@ -1145,7 +1145,7 @@ msgid "Linear" msgstr "" -#: app/module-info.c:117 app/sample-editor.c:200 +#: app/module-info.c:117 app/sample-editor.c:203 msgid "Amiga" msgstr "" @@ -1165,15 +1165,15 @@ msgid "ProTracker Mode" msgstr "" -#: app/playlist.c:314 +#: app/playlist.c:292 msgid "Song length" msgstr "" -#: app/playlist.c:315 +#: app/playlist.c:293 msgid "Current pos" msgstr "" -#: app/playlist.c:317 +#: app/playlist.c:295 msgid "Restart pos" msgstr "" @@ -1183,147 +1183,147 @@ "home directory to store configuration files.\n" msgstr "" -#: app/sample-editor.c:199 +#: app/sample-editor.c:202 msgid "No loop" msgstr "" -#: app/sample-editor.c:201 +#: app/sample-editor.c:204 msgid "PingPong" msgstr "" -#: app/sample-editor.c:205 +#: app/sample-editor.c:208 msgid "8 bits" msgstr "" -#: app/sample-editor.c:206 +#: app/sample-editor.c:209 msgid "16 bits" msgstr "" -#: app/sample-editor.c:212 +#: app/sample-editor.c:215 msgid "Sample Editor" msgstr "" -#: app/sample-editor.c:252 +#: app/sample-editor.c:255 msgid "Volume" msgstr "" -#: app/sample-editor.c:253 +#: app/sample-editor.c:256 msgid "Panning" msgstr "" -#: app/sample-editor.c:254 +#: app/sample-editor.c:257 msgid "Finetune" msgstr "" -#: app/sample-editor.c:274 +#: app/sample-editor.c:277 msgid "Selection:" msgstr "" -#: app/sample-editor.c:278 app/track-editor.c:170 app/track-editor.c:180 +#: app/sample-editor.c:281 app/track-editor.c:170 app/track-editor.c:180 msgid "None" msgstr "" -#: app/sample-editor.c:284 +#: app/sample-editor.c:287 msgid "All" msgstr "" -#: app/sample-editor.c:305 +#: app/sample-editor.c:308 msgid "Length:" msgstr "" -#: app/sample-editor.c:321 +#: app/sample-editor.c:324 msgid "Set as loop" msgstr "" -#: app/sample-editor.c:329 +#: app/sample-editor.c:332 msgid "RelNote" msgstr "" -#: app/sample-editor.c:340 +#: app/sample-editor.c:343 msgid "Load Sample..." msgstr "" -#: app/sample-editor.c:342 +#: app/sample-editor.c:345 msgid "Save WAV..." msgstr "" -#: app/sample-editor.c:344 +#: app/sample-editor.c:347 msgid "Save region as WAV..." msgstr "" -#: app/sample-editor.c:357 +#: app/sample-editor.c:360 msgid "Save WAV" msgstr "" -#: app/sample-editor.c:367 +#: app/sample-editor.c:370 msgid "Save Region" msgstr "" -#: app/sample-editor.c:378 +#: app/sample-editor.c:381 msgid "Monitor" msgstr "" -#: app/sample-editor.c:384 +#: app/sample-editor.c:387 msgid "Volume Ramp" msgstr "" -#: app/sample-editor.c:394 +#: app/sample-editor.c:397 msgid "Zoom to selection" msgstr "" -#: app/sample-editor.c:400 +#: app/sample-editor.c:403 msgid "Show all" msgstr "" -#: app/sample-editor.c:406 +#: app/sample-editor.c:409 msgid "Zoom in (+50%)" msgstr "" -#: app/sample-editor.c:412 +#: app/sample-editor.c:415 msgid "Zoom out (-50%)" msgstr "" -#: app/sample-editor.c:418 +#: app/sample-editor.c:421 msgid "Reverse" msgstr "" -#: app/sample-editor.c:428 +#: app/sample-editor.c:431 msgid "Cut" msgstr "" -#: app/sample-editor.c:434 +#: app/sample-editor.c:437 msgid "Remove" msgstr "" -#: app/sample-editor.c:440 +#: app/sample-editor.c:443 msgid "Copy" msgstr "" -#: app/sample-editor.c:446 +#: app/sample-editor.c:449 msgid "Paste" msgstr "" -#: app/sample-editor.c:452 +#: app/sample-editor.c:455 msgid "Clear Sample" msgstr "" -#: app/sample-editor.c:490 +#: app/sample-editor.c:505 msgid "(no selection)" msgstr "" -#: app/sample-editor.c:1089 +#: app/sample-editor.c:1104 msgid "" msgstr "" -#: app/sample-editor.c:1206 app/sample-editor.c:1218 +#: app/sample-editor.c:1221 app/sample-editor.c:1233 msgid "Read error." msgstr "" -#: app/sample-editor.c:1355 +#: app/sample-editor.c:1370 msgid "Load stereo sample" msgstr "" -#: app/sample-editor.c:1363 +#: app/sample-editor.c:1378 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1331,23 +1331,23 @@ "Please choose which channel to load:" msgstr "" -#: app/sample-editor.c:1374 +#: app/sample-editor.c:1389 msgid "Left" msgstr "" -#: app/sample-editor.c:1380 +#: app/sample-editor.c:1395 msgid "Mix" msgstr "" -#: app/sample-editor.c:1386 +#: app/sample-editor.c:1401 msgid "Right" msgstr "" -#: app/sample-editor.c:1464 +#: app/sample-editor.c:1479 msgid "Load raw sample" msgstr "" -#: app/sample-editor.c:1472 +#: app/sample-editor.c:1487 msgid "" "You have selected a sample that is not\n" "in a known format. You can load the raw data now.\n" @@ -1355,79 +1355,79 @@ "Please choose a format:" msgstr "" -#: app/sample-editor.c:1498 +#: app/sample-editor.c:1513 msgid "Wortformat:" msgstr "" -#: app/sample-editor.c:1530 app/sample-editor.c:1725 +#: app/sample-editor.c:1545 app/sample-editor.c:1751 msgid "OK" msgstr "" -#: app/sample-editor.c:1576 +#: app/sample-editor.c:1591 msgid "Can't read sample" msgstr "" -#: app/sample-editor.c:1585 +#: app/sample-editor.c:1600 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "" -#: app/sample-editor.c:1599 +#: app/sample-editor.c:1614 msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "" -#: app/sample-editor.c:1698 +#: app/sample-editor.c:1724 msgid "Nothing to save." msgstr "" -#: app/sample-editor.c:1733 +#: app/sample-editor.c:1759 msgid "Start sampling" msgstr "" -#: app/sample-editor.c:1763 +#: app/sample-editor.c:1789 msgid "No sampling driver available" msgstr "" -#: app/sample-editor.c:1773 app/sample-editor.c:1776 +#: app/sample-editor.c:1799 app/sample-editor.c:1802 msgid "Sampling Window" msgstr "" -#: app/sample-editor.c:1876 +#: app/sample-editor.c:1902 msgid "" msgstr "" -#: app/sample-editor.c:1907 +#: app/sample-editor.c:1933 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" -#: app/sample-editor.c:1960 +#: app/sample-editor.c:1986 msgid "Normalize" msgstr "" -#: app/sample-editor.c:1961 +#: app/sample-editor.c:1987 msgid "Execute" msgstr "" -#: app/sample-editor.c:1971 app/sample-editor.c:1974 +#: app/sample-editor.c:1997 app/sample-editor.c:2000 msgid "Volume Ramping" msgstr "" -#: app/sample-editor.c:1990 +#: app/sample-editor.c:2016 msgid "Perform linear volume fade on Selection" msgstr "" -#: app/sample-editor.c:2002 +#: app/sample-editor.c:2028 msgid "Left [%]:" msgstr "" -#: app/sample-editor.c:2005 app/sample-editor.c:2022 +#: app/sample-editor.c:2031 app/sample-editor.c:2048 msgid "H" msgstr "" -#: app/sample-editor.c:2011 app/sample-editor.c:2028 +#: app/sample-editor.c:2037 app/sample-editor.c:2054 msgid "D" msgstr "" -#: app/sample-editor.c:2019 +#: app/sample-editor.c:2045 msgid "Right [%]:" msgstr "" @@ -1814,48 +1814,48 @@ msgid "Instrument 2:" msgstr "" -#: app/xm.c:188 +#: app/xm.c:190 #, c-format msgid "Pattern length out of range: %d.\n" msgstr "" -#: app/xm.c:526 +#: app/xm.c:528 msgid "File is no XI instrument." msgstr "" -#: app/xm.c:536 +#: app/xm.c:538 #, c-format msgid "Unknown XI version 0x%x\n" msgstr "" -#: app/xm.c:566 +#: app/xm.c:568 #, c-format msgid "Invalid vibtype %d, using Sine.\n" msgstr "" -#: app/xm.c:838 app/xm.c:958 +#: app/xm.c:840 app/xm.c:960 msgid "Error while loading patterns." msgstr "" -#: app/xm.c:906 +#: app/xm.c:908 msgid "Can't open file" msgstr "" -#: app/xm.c:920 +#: app/xm.c:922 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" -#: app/xm.c:964 +#: app/xm.c:966 msgid "Error while loading instruments." msgstr "" -#: app/xm.c:975 +#: app/xm.c:977 #, 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:1299 -msgid "No FastTracker XM and no supported MOD format!" +#: app/xm.c:1349 +msgid "Not FastTracker XM and not supported MOD format!" msgstr "" diff -urN soundtracker-0.6.1/soundtracker.spec soundtracker-0.6.2/soundtracker.spec --- soundtracker-0.6.1/soundtracker.spec Fri Oct 20 18:30:58 2000 +++ soundtracker-0.6.2/soundtracker.spec Wed Jan 3 14:59:02 2001 @@ -1,6 +1,6 @@ %define name soundtracker -%define version 0.6.1 -%define release 23 +%define version 0.6.2 +%define release 24 %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.5/soundtracker-%{version}.tar.gz +Source: ftp://ftp.soundtracker.org/pub/soundtracker/v0.6/soundtracker-%{version}.tar.gz Buildroot: /var/tmp/%{name}-%{version}-%{release}-root %description