Mercurial > audlegacy
changeset 3803:b063954445cf trunk
Automated merge with file:/home/ccr/audacious/core
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 24 Sep 2007 15:18:04 +0300 |
| parents | fe3a1ae77f80 (current diff) 13512c99b328 (diff) |
| children | 134456e63256 |
| files | Skins/Classic/.depend Skins/Classic/.depend-done Skins/Default/.depend Skins/Default/.depend-done Skins/Ivory/.depend Skins/Ivory/.depend-done Skins/Osmosis/.depend Skins/Osmosis/.depend-done Skins/TinyPlayer/.depend Skins/TinyPlayer/.depend-done icons/Makefile icons/audacious.png pixmaps/.depend pixmaps/.depend-done skins/Classic/Makefile skins/Classic/balance.png skins/Classic/cbuttons.png skins/Classic/eq_ex.png skins/Classic/eqmain.png skins/Classic/main.png skins/Classic/monoster.png skins/Classic/nums_ex.png skins/Classic/playpaus.png skins/Classic/pledit.png skins/Classic/pledit.txt skins/Classic/posbar.png skins/Classic/shufrep.png skins/Classic/skin-classic.hints skins/Classic/skin.hints skins/Classic/text.png skins/Classic/titlebar.png skins/Classic/viscolor.txt skins/Classic/volume.png skins/Default/Makefile skins/Default/balance.png skins/Default/cbuttons.png skins/Default/eq_ex.png skins/Default/eqmain.png skins/Default/main.png skins/Default/monoster.png skins/Default/nums_ex.png skins/Default/playpaus.png skins/Default/pledit.png skins/Default/pledit.txt skins/Default/posbar.png skins/Default/shufrep.png skins/Default/skin-classic.hints skins/Default/skin.hints skins/Default/text.png skins/Default/titlebar.png skins/Default/viscolor.txt skins/Default/volume.png skins/Ivory/Makefile skins/Ivory/balance.png skins/Ivory/cbuttons.png skins/Ivory/eq_ex.png skins/Ivory/eqmain.png skins/Ivory/main.png skins/Ivory/monoster.png skins/Ivory/nums_ex.png skins/Ivory/playpaus.png skins/Ivory/pledit.png skins/Ivory/pledit.txt skins/Ivory/posbar.png skins/Ivory/shufrep.png skins/Ivory/skin.hints skins/Ivory/text.png skins/Ivory/titlebar.png skins/Ivory/viscolor.txt skins/Ivory/volume.png skins/Makefile skins/Osmosis/Makefile skins/Osmosis/balance.png skins/Osmosis/cbuttons.png skins/Osmosis/eq_ex.png skins/Osmosis/eqmain.png skins/Osmosis/main.png skins/Osmosis/monoster.png skins/Osmosis/nums_ex.png skins/Osmosis/playpaus.png skins/Osmosis/pledit.png skins/Osmosis/pledit.txt skins/Osmosis/posbar.png skins/Osmosis/shufrep.png skins/Osmosis/skin.hints skins/Osmosis/text.png skins/Osmosis/titlebar.png skins/Osmosis/viscolor.txt skins/Osmosis/volume.png skins/TinyPlayer/Makefile skins/TinyPlayer/balance.png skins/TinyPlayer/cbuttons.png skins/TinyPlayer/eq_ex.png skins/TinyPlayer/eqmain.png skins/TinyPlayer/main.png skins/TinyPlayer/monoster.png skins/TinyPlayer/nums_ex.png skins/TinyPlayer/playpaus.png skins/TinyPlayer/pledit.png skins/TinyPlayer/pledit.txt skins/TinyPlayer/posbar.png skins/TinyPlayer/shufrep.png skins/TinyPlayer/skin.hints skins/TinyPlayer/text.png skins/TinyPlayer/titlebar.png skins/TinyPlayer/viscolor.txt skins/TinyPlayer/volume.png src/audacious/glade/Makefile src/audacious/images/Makefile src/audacious/ui/Makefile src/audacious/ui_lastfm.c src/audacious/ui_lastfm.h |
| diffstat | 231 files changed, 1748 insertions(+), 2410 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,31 @@ +syntax: glob +aclocal.m4 +autom4te.cache +audacious.pc +audclient.pc +buildsys.mk +config.h +config.h.in +config.log +config.status +configure +extra.mk +man/audacious.1 +man/audtool.1 +po/Makefile +po/Makefile.in +po/POTFILES +po/stamp-po +src/audacious/audacious +src/audacious/audacious.desktop +src/audacious/build_stamp.c +src/audacious/dbus-client-bindings.h +src/audacious/dbus-server-bindings.h +src/audtool/audtool +.deps +*.a +*.dylib +*.gmo +*.o +*.so +*~
--- a/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ b/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -1,16 +1,114 @@ +SUBDIRS = src man pixmaps po +DATA = Skins/Classic/balance.png \ + Skins/Classic/cbuttons.png \ + Skins/Classic/eq_ex.png \ + Skins/Classic/eqmain.png \ + Skins/Classic/main.png \ + Skins/Classic/monoster.png \ + Skins/Classic/nums_ex.png \ + Skins/Classic/playpaus.png \ + Skins/Classic/pledit.png \ + Skins/Classic/pledit.txt \ + Skins/Classic/posbar.png \ + Skins/Classic/shufrep.png \ + Skins/Classic/skin-classic.hints \ + Skins/Classic/skin.hints \ + Skins/Classic/text.png \ + Skins/Classic/titlebar.png \ + Skins/Classic/viscolor.txt \ + Skins/Classic/volume.png \ + Skins/Default/balance.png \ + Skins/Default/cbuttons.png \ + Skins/Default/eq_ex.png \ + Skins/Default/eqmain.png \ + Skins/Default/main.png \ + Skins/Default/monoster.png \ + Skins/Default/nums_ex.png \ + Skins/Default/playpaus.png \ + Skins/Default/pledit.png \ + Skins/Default/pledit.txt \ + Skins/Default/posbar.png \ + Skins/Default/shufrep.png \ + Skins/Default/skin-classic.hints \ + Skins/Default/skin.hints \ + Skins/Default/text.png \ + Skins/Default/titlebar.png \ + Skins/Default/viscolor.txt \ + Skins/Default/volume.png \ + Skins/Ivory/balance.png \ + Skins/Ivory/cbuttons.png \ + Skins/Ivory/eq_ex.png \ + Skins/Ivory/eqmain.png \ + Skins/Ivory/main.png \ + Skins/Ivory/monoster.png \ + Skins/Ivory/nums_ex.png \ + Skins/Ivory/playpaus.png \ + Skins/Ivory/pledit.png \ + Skins/Ivory/pledit.txt \ + Skins/Ivory/posbar.png \ + Skins/Ivory/shufrep.png \ + Skins/Ivory/skin.hints \ + Skins/Ivory/text.png \ + Skins/Ivory/titlebar.png \ + Skins/Ivory/viscolor.txt \ + Skins/Ivory/volume.png \ + Skins/Osmosis/balance.png \ + Skins/Osmosis/cbuttons.png \ + Skins/Osmosis/eq_ex.png \ + Skins/Osmosis/eqmain.png \ + Skins/Osmosis/main.png \ + Skins/Osmosis/monoster.png \ + Skins/Osmosis/nums_ex.png \ + Skins/Osmosis/playpaus.png \ + Skins/Osmosis/pledit.png \ + Skins/Osmosis/pledit.txt \ + Skins/Osmosis/posbar.png \ + Skins/Osmosis/shufrep.png \ + Skins/Osmosis/skin.hints \ + Skins/Osmosis/text.png \ + Skins/Osmosis/titlebar.png \ + Skins/Osmosis/viscolor.txt \ + Skins/Osmosis/volume.png \ + Skins/TinyPlayer/balance.png \ + Skins/TinyPlayer/cbuttons.png \ + Skins/TinyPlayer/eq_ex.png \ + Skins/TinyPlayer/eqmain.png \ + Skins/TinyPlayer/main.png \ + Skins/TinyPlayer/monoster.png \ + Skins/TinyPlayer/nums_ex.png \ + Skins/TinyPlayer/playpaus.png \ + Skins/TinyPlayer/pledit.png \ + Skins/TinyPlayer/pledit.txt \ + Skins/TinyPlayer/posbar.png \ + Skins/TinyPlayer/shufrep.png \ + Skins/TinyPlayer/skin.hints \ + Skins/TinyPlayer/text.png \ + Skins/TinyPlayer/titlebar.png \ + Skins/TinyPlayer/viscolor.txt \ + Skins/TinyPlayer/volume.png \ + Skins/Refugee/cbuttons.png \ + Skins/Refugee/eq_ex.png \ + Skins/Refugee/eqmain.png \ + Skins/Refugee/main.png \ + Skins/Refugee/monoster.png \ + Skins/Refugee/nums_ex.png \ + Skins/Refugee/playpaus.png \ + Skins/Refugee/pledit.png \ + Skins/Refugee/pledit.txt \ + Skins/Refugee/posbar.png \ + Skins/Refugee/shufrep.png \ + Skins/Refugee/skin.hints \ + Skins/Refugee/text.png \ + Skins/Refugee/titlebar.png \ + Skins/Refugee/viscolor.txt \ + Skins/Refugee/volume.png + DISTCLEAN = extra.mk include buildsys.mk -SUBDIRS = src man po icons skins - -OBJECTIVE_DATA = \ - audacious.pc:$(LIBDIR)/pkgconfig \ - audclient.pc:$(LIBDIR)/pkgconfig - install-extra: - y="audacious.pc audclient.pc"; \ - for i in $$y; do \ + for i in audacious.pc audclient.pc; do \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${DESTDIR}${libdir}/pkgconfig && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/pkgconfig/$$i; then \ ${INSTALL_OK}; \ @@ -20,8 +118,7 @@ done uninstall-extra: - y="audacious.pc audclient.pc"; \ - for i in $$y; do \ + for i in audacious.pc audclient.pc; do \ if [ -f ${DESTDIR}${libdir}/pkgconfig/$$i ]; then \ if rm -f ${DESTDIR}${libdir}/pkgconfig/$$i; then \ ${DELETE_OK}; \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Classic/pledit.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#a6c1df +Current=#eeeeee +NormalBG=#000000 +SelectedBG=#666666 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Classic/skin-classic.hints Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,3 @@ +[skin] +skinDescription=The default skin for Audacious. (Classic variant) +mainwinOthertext=1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Classic/skin.hints Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,7 @@ +[skin] +skinDescription=The default skin for Audacious. +mainwinOthertext=1 +mainwinOthertextVisible=1 +mainwinTextVisible=1 +mainwinVisVisible=1 +mainwinMenurowVisible=1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Classic/viscolor.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,24 @@ +0,0,0 // [background color 1] +0,0,0 // [background color 2] +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +126,126,126 // [osc 1] +126,126,126 // [osc 2] +126,126,126 // [osc 3] +126,126,126 // [osc 4] +126,126,126 // [osc 5] +130,130,131 // [peak color]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Default/pledit.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#a6c1df +Current=#eeeeee +NormalBG=#000000 +SelectedBG=#666666 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Default/skin-classic.hints Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,3 @@ +[skin] +skinDescription=The default skin for Audacious. (Classic variant) +mainwinOthertext=1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Default/skin.hints Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,28 @@ +[skin] +skinDescription=The default skin for Audacious. +mainwinOthertext=1 +mainwinVisX=19 +mainwinVisY=39 +mainwinTextX=19 +mainwinTextY=26 +mainwinTextWidth=246 +mainwinInfobarX=111 +mainwinInfobarY=42 +mainwinNumber0X=30 +mainwinNumber0Y=56 +mainwinNumber1X=42 +mainwinNumber1Y=56 +mainwinNumber2X=54 +mainwinNumber2Y=56 +mainwinNumber3X=72 +mainwinNumber3Y=56 +mainwinNumber4X=84 +mainwinNumber4Y=56 +mainwinPlayStatusX=19 +mainwinPlayStatusY=58 +mainwinMenurowVisible=1 +mainwinOthertextIsStatus=1 +mainwinOthertextVisible=1 +mainwinTextVisible=1 +mainwinVisVisible=1 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Default/viscolor.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,24 @@ +0,0,0 // [background color 1] +0,0,0 // [background color 2] +9,13,15 +19,26,31 +29,39,47 +39,52,63 +49,65,79 +59,78,95 +69,91,111 +79,105,127 +88,118,143 +98,131,159 +108,144,175 +118,157,191 +128,170,207 +138,183,223 +148,196,239 +158,210,255 +240,240,240 // [osc 1] +220,220,220 // [osc 2] +170,170,170 // [osc 3] +100,100,100 // [osc 4] +20,20,20 // [osc 5] +200,200,220 // [peak color]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Ivory/pledit.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#325e84 +Current=#111111 +NormalBG=#FFFFFF +SelectedBG=#999999 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Ivory/skin.hints Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,64 @@ +[skin] +skinDescription=Ivory +mainwinOthertext=1 +mainwinVisX=335 +mainwinVisY=53 +mainwinTextX=93 +mainwinTextY=42 +mainwinTextWidth=319 +mainwinInfobarX=173 +mainwinInfobarY=64 +mainwinNumber0X=105 +mainwinNumber0Y=57 +mainwinNumber1X=117 +mainwinNumber1Y=57 +mainwinNumber2X=129 +mainwinNumber2Y=57 +mainwinNumber3X=147 +mainwinNumber3Y=57 +mainwinNumber4X=159 +mainwinNumber4Y=57 +mainwinPlayStatusX=93 +mainwinPlayStatusY=60 +mainwinOthertextIsStatus=1 +mainwinVolumeX=126 +mainwinVolumeY=22 +mainwinBalanceX=200 +mainwinBalanceY=22 +mainwinPositionX=130 +mainwinPositionY=80 +mainwinTextVisible=1 +mainwinOthertextVisible=1 +mainwinVisVisible=1 +mainwinMenurowVisible=0 +mainwinWidth=425 +mainwinHeight=100 +mainwinPreviousX=5 +mainwinPreviousY=48 +mainwinPlayX=33 +mainwinPlayY=48 +mainwinPauseX=33 +mainwinPauseY=70 +mainwinStopX=33 +mainwinStopY=26 +mainwinNextX=61 +mainwinNextY=48 +mainwinEjectX=390 +mainwinEjectY=77 +mainwinEQButtonX=249 +mainwinEQButtonY=22 +mainwinPLButtonX=272 +mainwinPLButtonY=22 +mainwinShuffleX=355 +mainwinShuffleY=20 +mainwinRepeatX=400 +mainwinRepeatY=20 +mainwinAboutX=999 +mainwinAboutY=999 +mainwinMinimizeX=393 +mainwinMinimizeY=3 +mainwinShadeX=403 +mainwinShadeY=3 +mainwinCloseX=413 +mainwinCloseY=3 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Ivory/viscolor.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,25 @@ +255,255,255 // [background color 1] +255,255,255 // [background color 2] +255,255,255 +240,242,244 +226,230,234 +212,218,223 +198,205,213 +184,193,203 +170,181,192 +156,168,182 +142,156,172 +128,144,161 +114,131,151 +100,119,140 +86,107,130 +72,94,120 +58,82,109 +44,70,99 +30,58,89 +129,129,129 // [osc 1] +150,150,150 // [osc 2] +170,170,170 // [osc 3] +200,200,200 // [osc 4] +240,240,240 // [osc 5] +125,125,124 // [peak color]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Osmosis/pledit.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#a6c1df +Current=#eeeeee +NormalBG=#000000 +SelectedBG=#666666 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Osmosis/skin.hints Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,64 @@ +[skin] +skinDescription=Osmosis +mainwinOthertext=1 +mainwinVisX=335 +mainwinVisY=53 +mainwinTextX=93 +mainwinTextY=42 +mainwinTextWidth=319 +mainwinInfobarX=173 +mainwinInfobarY=64 +mainwinNumber0X=105 +mainwinNumber0Y=57 +mainwinNumber1X=117 +mainwinNumber1Y=57 +mainwinNumber2X=129 +mainwinNumber2Y=57 +mainwinNumber3X=147 +mainwinNumber3Y=57 +mainwinNumber4X=159 +mainwinNumber4Y=57 +mainwinPlayStatusX=93 +mainwinPlayStatusY=60 +mainwinOthertextIsStatus=1 +mainwinVolumeX=126 +mainwinVolumeY=22 +mainwinBalanceX=200 +mainwinBalanceY=22 +mainwinPositionX=130 +mainwinPositionY=80 +mainwinTextVisible=1 +mainwinOthertextVisible=1 +mainwinVisVisible=1 +mainwinMenurowVisible=0 +mainwinWidth=425 +mainwinHeight=100 +mainwinPreviousX=5 +mainwinPreviousY=48 +mainwinPlayX=33 +mainwinPlayY=48 +mainwinPauseX=33 +mainwinPauseY=70 +mainwinStopX=33 +mainwinStopY=26 +mainwinNextX=61 +mainwinNextY=48 +mainwinEjectX=390 +mainwinEjectY=77 +mainwinEQButtonX=249 +mainwinEQButtonY=22 +mainwinPLButtonX=272 +mainwinPLButtonY=22 +mainwinShuffleX=355 +mainwinShuffleY=20 +mainwinRepeatX=400 +mainwinRepeatY=20 +mainwinAboutX=999 +mainwinAboutY=999 +mainwinMinimizeX=393 +mainwinMinimizeY=3 +mainwinShadeX=403 +mainwinShadeY=3 +mainwinCloseX=413 +mainwinCloseY=3 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Osmosis/viscolor.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,24 @@ +0,0,0 // [background color 1] +0,0,0 // [background color 2] +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +126,126,126 // [osc 1] +126,126,126 // [osc 2] +126,126,126 // [osc 3] +126,126,126 // [osc 4] +126,126,126 // [osc 5] +130,130,131 // [peak color]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Refugee/pledit.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#2499FF +Current=#FFEEFF +NormalBG=#0A120A +SelectedBG=#0A124A +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Refugee/skin.hints Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,8 @@ +[skin] +skinDescription=XMMS skin ported :) +mainwinOthertext=1 +mainwinOthertextVisible=1 +mainwinTextVisible=1 +mainwinVisVisible=1 +mainwinMenurowVisible=1 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Refugee/viscolor.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,24 @@ +9,34,53 // 0 = black (background color #1) +10,18,26 // 1 = grey (background color #2) +0,54,108 // 2 +0,58,116 // 3 +0,62,124 // 4 +0,66,132 // 5 +0,70,140 // 6 +0,74,148 // 7 +0,78,156 // 8 +0,82,164 // 9 +0,86,172 // 10 = mid of spec +0,92,184 // 11 +0,98,196 // 12 +0,104,208 // 13 +0,110,220 // 14 +0,116,232 // 15 +0,122,244 // 16 +0,128,255 // 17 = bottom of spec +0,128,255 // 18 = osc 1 (brightest) +0,104,208 // 19 = osc 2 +0,80,160 // 20 = osc 3 +0,56,112 // 21 = osc 4 +0,32,64 // 22 = osc 5 (dimmest) +200,200,200
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/TinyPlayer/pledit.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#a6c1df +Current=#eeeeee +NormalBG=#000000 +SelectedBG=#666666 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/TinyPlayer/skin.hints Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,57 @@ +[skin] +skinDescription=TinyPlayer skin +mainwinOthertext=1 +mainwinVisX=189 +mainwinVisY=36 +mainwinTextX=1 +mainwinTextY=80 +mainwinTextWidth=273 +mainwinInfobarX=0 +mainwinInfobarY=0 +mainwinNumber0X=30 +mainwinNumber0Y=19 +mainwinNumber1X=42 +mainwinNumber1Y=19 +mainwinNumber2X=54 +mainwinNumber2Y=19 +mainwinNumber3X=72 +mainwinNumber3Y=19 +mainwinNumber4X=84 +mainwinNumber4Y=19 +mainwinPlayStatusX=11 +mainwinPlayStatusY=22 +mainwinOthertextIsStatus=0 +mainwinVolumeX=106 +mainwinVolumeY=22 +mainwinBalanceX=180 +mainwinBalanceY=22 +mainwinPositionX=16 +mainwinPositionY=36 +mainwinTextVisible=1 +mainwinOthertextVisible=0 +mainwinVisVisible=0 +mainwinMenurowVisible=0 +mainwinWidth=275 +mainwinHeight=87 +mainwinPreviousX=16 +mainwinPreviousY=53 +mainwinPlayX=39 +mainwinPlayY=53 +mainwinPauseX=62 +mainwinPauseY=53 +mainwinStopX=85 +mainwinStopY=53 +mainwinNextX=108 +mainwinNextY=53 +mainwinEjectX=136 +mainwinEjectY=53 +mainwinEQButtonX=219 +mainwinEQButtonY=22 +mainwinPLButtonX=242 +mainwinPLButtonY=22 +mainwinShuffleX=164 +mainwinShuffleY=56 +mainwinRepeatX=210 +mainwinRepeatY=56 +mainwinAboutX=247 +mainwinAboutY=53
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/TinyPlayer/viscolor.txt Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,24 @@ +0,0,0 // [background color 1] +0,0,0 // [background color 2] +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +126,126,126 // [osc 1] +126,126,126 // [osc 2] +126,126,126 // [osc 3] +126,126,126 // [osc 4] +126,126,126 // [osc 5] +130,130,131 // [peak color]
--- a/buildsys.mk.in Wed Sep 19 17:48:49 2007 +0300 +++ b/buildsys.mk.in Mon Sep 24 15:18:04 2007 +0300 @@ -46,6 +46,7 @@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ INSTALL_LIB = @INSTALL_LIB@ UNINSTALL_LIB = @UNINSTALL_LIB@ +CLEAN_LIB = @CLEAN_LIB@ LN_S = @LN_S@ MKDIR_P = mkdir -p INSTALL = @INSTALL@ @@ -61,7 +62,6 @@ includesubdir ?= ${PACKAGE} mandir = @mandir@ mansubdir ?= man1 -pkgdatadir = ${datadir}/${PACKAGE} OBJS1 = ${SRCS:.c=.o} OBJS2 = ${OBJS1:.cc=.o} @@ -70,10 +70,6 @@ OBJS5 = ${OBJS4:.erl=.beam} OBJS += ${OBJS5:.m=.o} -ifneq ($(strip $(prefix)),) - RPATH = -Wl,-rpath=${libdir} -endif - .SILENT: .SUFFIXES: .beam .c .cc .cxx .d .erl .m .PHONY: all subdirs depend install uninstall clean distclean @@ -83,13 +79,11 @@ subdirs: for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} || exit 1; \ + ${MAKE} ${MFLAGS} || exit 1; \ ${DIR_LEAVE}; \ done -depend-hook: - -depend: depend-hook +depend: pre-depend ${SRCS} regen=0; \ for i in ${SRCS}; do [ $$i -nt .deps ] && regen=1; done; \ if [ $$regen = 1 ]; then \ @@ -102,9 +96,11 @@ done; \ fi -${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} +pre-depend: + +${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${LIB_DEPS} ${LINK_STATUS} - if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${RPATH}; then \ + if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \ ${LINK_OK}; \ else \ ${LINK_FAILED}; \ @@ -128,7 +124,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${LINK_STATUS} - if ${AR} cq $@ ${OBJS}; then \ + if ${AR} cr $@ ${OBJS}; then \ ${LINK_OK}; \ else \ ${LINK_FAILED}; \ @@ -187,7 +183,7 @@ install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} install || exit 1; \ + ${MAKE} ${MFLAGS} install || exit 1; \ ${DIR_LEAVE}; \ done @@ -220,7 +216,7 @@ for i in ${DATA}; do \ ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${datadir} && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ + if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \ @@ -259,7 +255,7 @@ uninstall: uninstall-extra for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} uninstall || exit 1; \ + ${MAKE} ${MFLAGS} uninstall || exit 1; \ ${DIR_LEAVE}; \ done @@ -340,11 +336,11 @@ clean: for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} clean || exit 1; \ + ${MAKE} ${MFLAGS} clean || exit 1; \ ${DIR_LEAVE}; \ done - for i in ${OBJS} ${CLEAN} .deps *~; do \ + for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} .deps *~; do \ if [ -f $$i -o -d $$i ]; then \ if rm -fr $$i; then \ ${DELETE_OK}; \ @@ -357,7 +353,7 @@ distclean: clean for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} distclean || exit 1; \ + ${MAKE} ${MFLAGS} distclean || exit 1; \ ${DIR_LEAVE}; \ done
--- a/configure.ac Wed Sep 19 17:48:49 2007 +0300 +++ b/configure.ac Mon Sep 24 15:18:04 2007 +0300 @@ -181,6 +181,13 @@ AC_DEFINE_UNQUOTED(SHARED_SUFFIX, "${SHARED_SUFFIX}", [Define the shared module suffix extension on your platform.]) +# Use -rpath? +AC_ARG_ENABLE(rpath, + [ --enable-rpath enable use of -rpath on ELF systems (default=yes)], [enable_rpath=$enableval], [enable_rpath=no]) +if test "x$enable_rpath" = "xyes"; then + test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && LDFLAGS="$LDFLAGS -Wl,-rpath $libdir" +fi + AC_MSG_CHECKING([if you are running Apple-GCC]) case "$target" in *-apple-*)
--- a/extra.mk.in Wed Sep 19 17:48:49 2007 +0300 +++ b/extra.mk.in Mon Sep 24 15:18:04 2007 +0300 @@ -3,7 +3,6 @@ srcdir ?= @srcdir@ top_srcdir ?= @top_srcdir@ VPATH ?= @srcdir@ -pkgdatadir ?= $(datadir)/@PACKAGE@ pkglibdir ?= $(libdir)/@PACKAGE@ pkgincludedir ?= $(includedir)/@PACKAGE@ top_builddir ?= .
--- a/icons/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../buildsys.mk - -pixmapsdir = $(datadir)/pixmaps - -install-extra: - y="audacious.png"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${pixmapsdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${pixmapsdir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="audacious.png"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${pixmapsdir}/$$i ]; then \ - if rm -f ${DESTDIR}${pixmapsdir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done -
--- a/m4/sharedlib.m4 Wed Sep 19 17:48:49 2007 +0300 +++ b/m4/sharedlib.m4 Mon Sep 24 15:18:04 2007 +0300 @@ -34,6 +34,7 @@ PLUGIN_SUFFIX='.impl' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' + CLEAN_LIB='' ;; *-apple-*) AC_MSG_RESULT(Mac OS X) @@ -48,6 +49,7 @@ PLUGIN_SUFFIX='.impl' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' + CLEAN_LIB='' ;; *-sun-* | *-openbsd-* | *-mirbsd-*) AC_MSG_RESULT(Solaris) @@ -62,20 +64,22 @@ PLUGIN_SUFFIX='.so' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}' + CLEAN_LIB='' ;; *-*-mingw32) AC_MSG_RESULT(MinGW32) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='' - LIB_LDFLAGS='-shared' - LIB_PREFIX='' + LIB_LDFLAGS='-shared -Wl,--out-implib,${LIB}.a' + LIB_PREFIX='lib' LIB_SUFFIX='.dll' PLUGIN_CPPFLAGS='' PLUGIN_CFLAGS='' PLUGIN_LDFLAGS='' PLUGIN_SUFFIX='.dll' - INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i' - UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' + UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a' + CLEAN_LIB='${LIB}.a' ;; *) AC_MSG_RESULT(POSIX) @@ -90,6 +94,7 @@ PLUGIN_SUFFIX='.so' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' + CLEAN_LIB='' ;; esac @@ -104,4 +109,5 @@ AC_SUBST(PLUGIN_SUFFIX) AC_SUBST(INSTALL_LIB) AC_SUBST(UNINSTALL_LIB) + AC_SUBST(CLEAN_LIB) ])
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pixmaps/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -0,0 +1,5 @@ +DATA = audacious.png + +include ../buildsys.mk + +PACKAGE = pixmaps
--- a/po/POTFILES.in Wed Sep 19 17:48:49 2007 +0300 +++ b/po/POTFILES.in Mon Sep 24 15:18:04 2007 +0300 @@ -17,7 +17,6 @@ src/audacious/ui_fileinfopopup.c src/audacious/ui_fileopener.c src/audacious/ui_jumptotrack.c -src/audacious/ui_lastfm.c src/audacious/ui_main.c src/audacious/ui_manager.c src/audacious/ui_playlist.c
--- a/po/fr.po Wed Sep 19 17:48:49 2007 +0300 +++ b/po/fr.po Mon Sep 24 15:18:04 2007 +0300 @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n" -"POT-Creation-Date: 2007-09-05 19:18+0200\n" -"PO-Revision-Date: 2006-11-27 00:33+0100\n" -"Last-Translator: Adam Cécile (Le_Vert) <gandalf@le-vert.net>\n" +"POT-Creation-Date: 2007-09-13 17:37+0200\n" +"PO-Revision-Date: 2007-09-14 19:51+0100\n" +"Last-Translator: stanislas zeller <skogkatt@orange.fr>\n" "Language-Team: <fr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,8 +29,7 @@ msgstr "" "<b><big>Impossible de créer %s.</big></b>\n" "\n" -"Ne peut ouvrir le fichier glade (%s). Veuillez vérifier votre " -"configuration.\n" +"Ne peut ouvrir le fichier glade (%s). Veuillez vérifier votre configuration.\n" #: src/audacious/glade/fileinfo.glade:8 msgid "Track Information" @@ -69,9 +68,8 @@ msgstr "<span size=\"small\">Location</span>" #: src/audacious/glade/prefswin.glade:8 -#, fuzzy msgid "Audacious Preferences" -msgstr "Développeurs:" +msgstr "Préférences" #: src/audacious/glade/prefswin.glade:115 msgid "_Decoder list:" @@ -105,8 +103,9 @@ msgid "<b>Effects</b>" msgstr "<b>Effets</b>" -#: src/audacious/glade/prefswin.glade:693 src/audacious/ui_manager.c:403 -#: src/audacious/ui_preferences.c:116 +#: src/audacious/glade/prefswin.glade:693 +#: src/audacious/ui_manager.c:403 +#: src/audacious/ui_preferences.c:117 msgid "Plugins" msgstr "Greffons" @@ -115,9 +114,8 @@ msgstr "<b>_Thèmes</b>" #: src/audacious/glade/prefswin.glade:799 -#, fuzzy msgid "Refresh skin list" -msgstr "/Inverser la Liste" +msgstr "Rafraichir la liste de skins" #: src/audacious/glade/prefswin.glade:893 msgid "<b>_Fonts</b>" @@ -133,18 +131,15 @@ #: src/audacious/glade/prefswin.glade:1023 msgid "Select main player window font:" -msgstr "" +msgstr "Choix de la police du lecteur principal" #: src/audacious/glade/prefswin.glade:1045 -#, fuzzy msgid "Select playlist font:" -msgstr "Sauver la Liste d'écoute" +msgstr "Choisir la police:" #: src/audacious/glade/prefswin.glade:1091 -msgid "" -"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode " -"strings." -msgstr "" +msgid "Use bitmap fonts if they are available. Bitmap fonts do not support Unicode strings." +msgstr "Utiliser des polices Bitmap si disponibles. Les polices Bitmap ne suportent pas les caractères Unicode." #: src/audacious/glade/prefswin.glade:1093 msgid "Use Bitmap fonts if available" @@ -169,9 +164,7 @@ #: src/audacious/glade/prefswin.glade:1279 #: src/audacious/glade/prefswin.glade:1290 msgid "This enables the window manager to show decorations for windows." -msgstr "" -"Ceci active le gestionnaire de fenêtre montrant les décorations pour les " -"fenêtres." +msgstr "Ceci active le gestionnaire de fenêtre montrant les décorations pour les fenêtres." #: src/audacious/glade/prefswin.glade:1281 msgid "Show window manager decoration" @@ -182,17 +175,15 @@ msgstr "Montrer les décorations du gestionnaire de fenêtre" #: src/audacious/glade/prefswin.glade:1319 -msgid "" -"This enables the XMMS/GTK1-style file selection dialogs. This selector is " -"provided by Audacious itself and is faster than the default GTK2 selector " -"(but sadly not as user-friendly)." -msgstr "" +msgid "This enables the XMMS/GTK1-style file selection dialogs. This selector is provided by Audacious itself and is faster than the default GTK2 selector (but sadly not as user-friendly)." +msgstr "Ceci active le dialogue de fichier de sélection XMMS/GTK1. Ce sélecteur est fourni par Audacious et est plus rapide que le sélecteur en GTK2 par défaut." #: src/audacious/glade/prefswin.glade:1321 msgid "Use XMMS-style file selector instead of the default selector" msgstr "Utiliser le sélecteur de fichier XMMS comme le sélecteur par défaut" -#: src/audacious/glade/prefswin.glade:1363 src/audacious/ui_preferences.c:110 +#: src/audacious/glade/prefswin.glade:1363 +#: src/audacious/ui_preferences.c:111 msgid "Appearance" msgstr "Apparence" @@ -216,7 +207,8 @@ msgid "lines" msgstr "lignes" -#: src/audacious/glade/prefswin.glade:1642 src/audacious/ui_preferences.c:114 +#: src/audacious/glade/prefswin.glade:1642 +#: src/audacious/ui_preferences.c:115 msgid "Mouse" msgstr "Souris" @@ -234,7 +226,7 @@ #: src/audacious/glade/prefswin.glade:1799 msgid "Convert backslash '\\' to forward slash '/'" -msgstr "" +msgstr "Convertir '\\' en '/'" #: src/audacious/glade/prefswin.glade:1833 msgid "<b>Metadata</b>" @@ -242,7 +234,7 @@ #: src/audacious/glade/prefswin.glade:1872 msgid "Load metadata (tag information) from music files." -msgstr "" +msgstr "Charger les méta-données (tags) à partir des fichiers musicaux." #: src/audacious/glade/prefswin.glade:1874 msgid "Load metadata from playlists and files" @@ -250,7 +242,7 @@ #: src/audacious/glade/prefswin.glade:1912 msgid "Load metadata when adding the file to the playlist or opening it" -msgstr "" +msgstr "Charger les méta-données quand un fichier est ajouté à la playlist, ou ouvert." #: src/audacious/glade/prefswin.glade:1914 msgid "On load" @@ -258,7 +250,7 @@ #: src/audacious/glade/prefswin.glade:1934 msgid "Load metadata on demand when displaying the file in the playlist" -msgstr "" +msgstr "Charger les méta-données sur demande quand le fichier s'affiche dans la playlist." #: src/audacious/glade/prefswin.glade:1936 msgid "On display" @@ -269,12 +261,8 @@ msgstr "Codage supplémentaire:" #: src/audacious/glade/prefswin.glade:1994 -msgid "" -"List of character encodings used for fall back conversion of metadata. If " -"automatic character encoding detector failed or has been disabled, encodings " -"in this list would be treated as candidates of the encoding of metadata, and " -"fall back conversion from these encodings to UTF-8 would be attempted." -msgstr "" +msgid "List of character encodings used for fall back conversion of metadata. If automatic character encoding detector failed or has been disabled, encodings in this list would be treated as candidates of the encoding of metadata, and fall back conversion from these encodings to UTF-8 would be attempted." +msgstr "Liste des caratères de codage utilisés pour la conversion des métadonnées. Si la détection des caractères de codage automatique échoue ou a été désactivée, les codages dans la liste seront éligibles comme codage des métadonnées, et le recours à la conversion de ces codages vers l'UTF-8 seront tentés." #: src/audacious/glade/prefswin.glade:2035 msgid "Auto character encoding detector for:" @@ -285,10 +273,8 @@ msgstr "<b>Fenêtre du Fichier</b>" #: src/audacious/glade/prefswin.glade:2130 -msgid "" -"Always refresh the file dialog (this will slow opening the dialog on large " -"directories, and Gnome VFS should handle automatically)." -msgstr "" +msgid "Always refresh the file dialog (this will slow opening the dialog on large directories, and Gnome VFS should handle automatically)." +msgstr "Toujours rafraichir le dialogue de fichier (l'ouverture sera lente pour des gros répertoires, et GNOME VFZ devrait le supporter automatiquement)." #: src/audacious/glade/prefswin.glade:2132 msgid "Always refresh directory when opening file dialog" @@ -326,18 +312,15 @@ #: src/audacious/glade/prefswin.glade:2315 msgid "Show information about titlestring format" -msgstr "" +msgstr "Montrer les Informations au sujet des format de titlestring" #: src/audacious/glade/prefswin.glade:2365 msgid "<b>Popup Information</b>" msgstr "<b>Popup Information</b>" #: src/audacious/glade/prefswin.glade:2416 -msgid "" -"Toggles popup information window for the pointed entry in the playlist. The " -"window shows title of song, name of album, genre, year of publish, track " -"number, track length, and artwork." -msgstr "" +msgid "Toggles popup information window for the pointed entry in the playlist. The window shows title of song, name of album, genre, year of publish, track number, track length, and artwork." +msgstr "Afficher la fenêtre d'information pour les morceaux de la liste d'écoute. La fenêtre montre le titre du morceau, nom de l'album, genre, année de publication, numéro de piste, longueur de la piste et la photo de la pochette." #: src/audacious/glade/prefswin.glade:2418 msgid "Show popup information for playlist entries" @@ -345,10 +328,12 @@ #: src/audacious/glade/prefswin.glade:2445 msgid "Edit settings for popup information" -msgstr "" - -#: src/audacious/glade/prefswin.glade:2494 src/audacious/ui_manager.c:203 -#: src/audacious/ui_playlist_manager.c:290 src/audacious/ui_preferences.c:115 +msgstr "Editer la fenêtre d'information" + +#: src/audacious/glade/prefswin.glade:2494 +#: src/audacious/ui_manager.c:203 +#: src/audacious/ui_playlist_manager.c:290 +#: src/audacious/ui_preferences.c:116 msgid "Playlist" msgstr "Liste d'écoute" @@ -368,7 +353,8 @@ msgid "Available _Presets:" msgstr "_Pré-réglages disponibles:" -#: src/audacious/glade/prefswin.glade:2862 src/audacious/ui_preferences.c:113 +#: src/audacious/glade/prefswin.glade:2862 +#: src/audacious/ui_preferences.c:114 msgid "Equalizer" msgstr "Équaliseur" @@ -401,12 +387,8 @@ msgstr "Mot de passe :" #: src/audacious/glade/prefswin.glade:3295 -msgid "" -"<span size=\"small\">Changing these settings will require a restart of " -"Audacious.</span>" -msgstr "" -"<span size=\"small\">Modifier ces préférences requiert le redémarrage " -"d'Audacious.</span>" +msgid "<span size=\"small\">Changing these settings will require a restart of Audacious.</span>" +msgstr "<span size=\"small\">Modifier ces préférences requiert le redémarrage d'Audacious.</span>" #: src/audacious/glade/prefswin.glade:3419 msgid "<b>Audio System</b>" @@ -417,19 +399,14 @@ msgstr "Greffon de sortie" #: src/audacious/glade/prefswin.glade:3541 -#, fuzzy msgid "" -"<span size=\"small\">This is the amount of time to prebuffer audio streams " -"by, in milliseconds.\n" +"<span size=\"small\">This is the amount of time to prebuffer audio streams by, in milliseconds.\n" "Increase this value if you are experiencing audio skipping.\n" -"Please note however, that high values will result in Audacious performing " -"poorly.</span>" +"Please note however, that high values will result in Audacious performing poorly.</span>" msgstr "" -"<span size=\"small\">Ceci est la taille de temps du tampon audio en cours, " -"en milisecondes.\n" +"<span size=\"small\">Ceci est la taille de temps du tampon audio en cours, en milisecondes.\n" "Augmentez cette valeur si vous êtes un utilisateur averti.\n" -"Veuillez noter cependant que une valeur haute détériorera les performances " -"d'Audacious.</span>" +"Veuillez noter cependant, que une valeur haute détériorera les performances d'Audacious.</span>" #: src/audacious/glade/prefswin.glade:3571 msgid "Buffer size:" @@ -448,35 +425,28 @@ msgstr "<b>Détection du Format</b>" #: src/audacious/glade/prefswin.glade:3861 -msgid "" -"When checked, Audacious will detect file formats on demand. This can result " -"in a messier playlist, but delivers a major speed benefit." -msgstr "" +msgid "When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit." +msgstr "Si coché, Audacious détectera les formats de fichier sur demande. Ceci peut avoir pour résultat une playlist bordélique, mais avec une rapidité d'affichage accrue." #: src/audacious/glade/prefswin.glade:3863 msgid "Detect file formats on demand, instead of immediately." msgstr "Détecter et afficher le format de fichier (affichage rapide)." #: src/audacious/glade/prefswin.glade:3897 -msgid "" -"When checked, Audacious will detect file formats based by extension. This is " -"slightly slower than detection on demand, but still provides a minimal level " -"of format detection." -msgstr "" +msgid "When checked, Audacious will detect file formats based by extension. This is slightly slower than detection on demand, but still provides a minimal level of format detection." +msgstr "Si coché, Audacious détectera les formats de fichier basés sur les extension. Ceci sera légèrement plus lent que la détection sur demande." #: src/audacious/glade/prefswin.glade:3899 msgid "Detect file formats by extension." -msgstr "" +msgstr "Détecter les formats de fichier par extension." #: src/audacious/glade/prefswin.glade:3933 msgid "<b>Playback</b>" msgstr "<b>Enchaînement</b>" #: src/audacious/glade/prefswin.glade:3972 -msgid "" -"When Audacious starts, automatically begin playing from the point where we " -"stopped before." -msgstr "" +msgid "When Audacious starts, automatically begin playing from the point where we stopped before." +msgstr "Quand Audacious démarre, commencer la lecture automatiquement au dernier endroit lu." #: src/audacious/glade/prefswin.glade:3974 msgid "Continue playback on startup" @@ -484,7 +454,7 @@ #: src/audacious/glade/prefswin.glade:4008 msgid "When finished playing a song, don't automatically advance to the next." -msgstr "" +msgstr "Quand un morceau est terminé, ne pas lire automatiquement le morceau suivant." #: src/audacious/glade/prefswin.glade:4010 msgid "Don't advance in the playlist" @@ -504,15 +474,15 @@ #: src/audacious/glade/prefswin.glade:4175 msgid "<b>Sampling Rate Converter</b>" -msgstr "" +msgstr "<b>Convertion du taux d'échantillonage</b>" #: src/audacious/glade/prefswin.glade:4215 msgid "Enable Sampling Rate Converter" -msgstr "" +msgstr "Activer la convertion du taux d'échantillonage" #: src/audacious/glade/prefswin.glade:4264 msgid "Sampling Rate [Hz]:" -msgstr "" +msgstr "Taux d'Echantillonage [Hz]:" #: src/audacious/glade/prefswin.glade:4334 msgid "" @@ -520,35 +490,29 @@ "This should be the max supported sampling rate of\n" "the sound card or output plugin.</span>" msgstr "" +"<span size=\"small\">Tous les streams seront convertis avec ce taux d'échantillonage.\n" +"Ce taux est le taux d'échantillonage maximum de\n" +"la carte son ou du greffon audio.</span>" #: src/audacious/glade/prefswin.glade:4364 msgid "Interpolation Engine:" msgstr "" #: src/audacious/glade/prefswin.glade:4593 -#, fuzzy msgid "Reload Plugins" -msgstr "Greffons" +msgstr "Recharger Greffons" #: src/audacious/glade/prefswin.glade:4654 -#, fuzzy msgid "Popup Information Settings" -msgstr "<b>Popup Information</b>" +msgstr "Configuration des informations Popup" #: src/audacious/glade/prefswin.glade:4678 -#, fuzzy msgid "<b>Cover image retrieve</b>" -msgstr "<b>Détection du Format</b>" +msgstr "<b>Récupération de l'Image</b>" #: src/audacious/glade/prefswin.glade:4703 -msgid "" -"While searching for the album's cover, Audacious looks for certain words in " -"the filename. You can specify those words in the lists below, separated " -"using commas." -msgstr "" -"Pendant la recherche d'une pochette d'album, Audacious recherche certains " -"mots dans le nom du fichier. Vous pouvez spécifier ces mots dans les listes " -"en dessous, séparés par des virgules." +msgid "While searching for the album's cover, Audacious looks for certain words in the filename. You can specify those words in the lists below, separated using commas." +msgstr "Pendant la recherche d'une pochette d'album, Audacious recherche certains mots dans le nom du fichier. Vous pouvez spécifier ces mots dans les listes en dessous, séparés par des virgules." #: src/audacious/glade/prefswin.glade:4758 msgid "Include:" @@ -571,55 +535,51 @@ msgstr "Utiliser une pochette par fichier" #: src/audacious/glade/prefswin.glade:4979 -#, fuzzy msgid "<b>Miscellaneous</b>" -msgstr "<b>_Divers</b>" +msgstr "<b>Divers</b>" #: src/audacious/glade/prefswin.glade:5017 msgid "Show Progress bar for the current track" -msgstr "" +msgstr "Voir la barre de progression de la piste courante" #: src/audacious/glade/prefswin.glade:5055 msgid "Delay until filepopup comes up: " -msgstr "" +msgstr "Délai avant affichage:" #: src/audacious/glade/prefswin.glade:5149 msgid "Color Adjustment" -msgstr "" +msgstr "Ajustement de la Couleur" #: src/audacious/glade/prefswin.glade:5172 -msgid "" -"Audacious allows you to alter the color balance of the skinned UI. The " -"sliders below will allow you to do this." -msgstr "" +msgid "Audacious allows you to alter the color balance of the skinned UI. The sliders below will allow you to do this." +msgstr "Audacious vous permet d'altérer la balance des couleurs de l'Interface Utilisateur skinné. Le curseur ci-dessous vous permettra de le faire." #: src/audacious/glade/prefswin.glade:5268 msgid "Red" -msgstr "" +msgstr "Rouge" #: src/audacious/glade/prefswin.glade:5296 -#, fuzzy msgid "Green" -msgstr "Grec:" +msgstr "Vert" #: src/audacious/glade/prefswin.glade:5324 msgid "Blue" -msgstr "" - -#: src/audacious/input.c:657 +msgstr "Bleu" + +#: src/audacious/input.c:627 #, c-format msgid "audacious: %s" msgstr "audacious: %s" -#: src/audacious/input.c:673 +#: src/audacious/input.c:643 msgid "Filename:" -msgstr "Nom du ficher:" - -#: src/audacious/input.c:692 +msgstr "Nom du fichier:" + +#: src/audacious/input.c:662 msgid "No input plugin recognized this file" msgstr "Aucun greffon d'entrée ne supporte ce type de fichier" -#: src/audacious/input.c:694 +#: src/audacious/input.c:664 #, c-format msgid "Input plugin: %s" msgstr "Greffon d'entrée: %s" @@ -629,103 +589,98 @@ msgid "Unable to create log file (%s)!\n" msgstr "Impossible d'écrire le fichier de log (%s)!\n" -#: src/audacious/main.c:90 src/audacious/main.c:92 src/audacious/ui_main.c:502 -#: src/audacious/ui_main.c:2514 +#: src/audacious/main.c:90 +#: src/audacious/main.c:92 +#: src/audacious/ui_main.c:501 +#: src/audacious/ui_main.c:2513 msgid "Audacious" msgstr "Audacious" #: src/audacious/main.c:475 -#, fuzzy, c-format +#, c-format msgid "Could not create directory (%s): %s\n" -msgstr "Impossible de créer le répertoire (%s): %s" - -#: src/audacious/main.c:891 -#, fuzzy +msgstr "Impossible de créer le répertoire (%s): %s\n" + +#: src/audacious/main.c:1062 msgid "Select which Audacious session ID to use" -msgstr "Sélectionner la session Audacious/BMP/XMMS (Par défaut: 0)" - -#: src/audacious/main.c:892 +msgstr "Sélectionner la session Audacious (Par défaut: 0)" + +#: src/audacious/main.c:1063 msgid "Skip backwards in playlist" msgstr "Recule dans la liste d'écoute" -#: src/audacious/main.c:893 +#: src/audacious/main.c:1064 msgid "Start playing current playlist" msgstr "Commence à jouer la liste d'écoute courante" -#: src/audacious/main.c:894 +#: src/audacious/main.c:1065 msgid "Pause current song" msgstr "Met en pause la lecture du morceau" -#: src/audacious/main.c:895 +#: src/audacious/main.c:1066 msgid "Stop current song" msgstr "Stoppe la lecture du morceau" -#: src/audacious/main.c:896 +#: src/audacious/main.c:1067 msgid "Pause if playing, play otherwise" msgstr "Met en pause sinon joue le morceau" -#: src/audacious/main.c:897 +#: src/audacious/main.c:1068 msgid "Skip forward in playlist" msgstr "Avance dans la liste d'écoute" -#: src/audacious/main.c:898 -#, fuzzy +#: src/audacious/main.c:1069 msgid "Display Jump to File dialog" -msgstr "Afficher le saut vers la fenêtre des fichiers " - -#: src/audacious/main.c:899 +msgstr "Afficher le Saut vers le Dialogue de Fichier" + +#: src/audacious/main.c:1070 msgid "Don't clear the playlist" msgstr "Ne vide pas la liste d'écoute" -#: src/audacious/main.c:900 -#, fuzzy +#: src/audacious/main.c:1071 msgid "Add new files to a temporary playlist" -msgstr "Ne vide pas la liste d'écoute" - -#: src/audacious/main.c:901 -#, fuzzy +msgstr "Ajouter de nouveaux fichiers à la playlist" + +#: src/audacious/main.c:1072 msgid "Display the main window" -msgstr "Affiche la fenêtre principale" - -#: src/audacious/main.c:902 +msgstr "Afficher la fenêtre principale" + +#: src/audacious/main.c:1073 msgid "Display all open Audacious windows" -msgstr "" - -#: src/audacious/main.c:903 +msgstr "Afficher toutes les fenêtres ouvertes" + +#: src/audacious/main.c:1074 msgid "Enable headless operation" msgstr "" -#: src/audacious/main.c:904 +#: src/audacious/main.c:1075 msgid "Print all errors and warnings to stdout" -msgstr "" - -#: src/audacious/main.c:905 +msgstr "Imprimer toutes les erreurs et avertissements vers stdout" + +#: src/audacious/main.c:1076 msgid "Show version and builtin features" -msgstr "" - -#: src/audacious/main.c:906 +msgstr "Montrer les caractéristiques de version et construction" + +#: src/audacious/main.c:1077 msgid "FILE..." -msgstr "" - -#: src/audacious/main.c:1065 +msgstr "FICHIER..." + +#: src/audacious/main.c:1236 #, c-format msgid "" "<b><big>Unable to load skin.</big></b>\n" "\n" -"Check that skin at '%s' is usable and default skin is properly installed at " -"'%s'\n" +"Check that skin at '%s' is usable and default skin is properly installed at '%s'\n" msgstr "" "<b><big>Impossible de charger le thème.</big></b>\n" "\n" -"Vérifier que le thème '%s' soit correct et que le thème par défaut soit bien " -"installé dans '%s'\n" - -#: src/audacious/main.c:1123 +"Vérifier que le thème '%s' soit correct et que le thème par défaut soit bien installé dans '%s'\n" + +#: src/audacious/main.c:1323 msgid "" "Sorry, threads isn't supported on your platform.\n" "\n" -"If you're on a libc5 based linux system and installed Glib & GTK+ before " -"you\n" +"If you're on a libc5 based linux system and installed Glib & GTK+ before you\n" "installed LinuxThreads you need to recompile Glib & GTK+.\n" msgstr "" "Désolé, les threads ne sont pas supportés par votre système d'exploitation.\n" @@ -733,21 +688,23 @@ "Si vous êtes sur un système Linux basé sur libc5 et que vous avez installé \n" "GLIB et GTK+ avant les LinuxThreads, vous devez recompiler GLIB et GTK+.\n" -#: src/audacious/main.c:1154 +#: src/audacious/main.c:1354 msgid "- play multimedia files" -msgstr "" - -#: src/audacious/main.c:1161 +msgstr "- jouer les fichiers multimédia" + +#: src/audacious/main.c:1361 #, c-format msgid "" "%s: %s\n" "Try `%s --help' for more information.\n" msgstr "" - -#: src/audacious/main.c:1171 -#, fuzzy, c-format +"%s: %s\n" +"Essayer `%s --help' pour plus d'information.\n" + +#: src/audacious/main.c:1371 +#, c-format msgid "%s: Unable to open display, exiting.\n" -msgstr "Audacious : Impossible d'accéder à la session d'affichage.\n" +msgstr "%s : Impossible d'accéder à la session d'affichage.\n" #: src/audacious/playback.c:274 msgid "" @@ -763,25 +720,32 @@ "Audacious has caught signal 11 (SIGSEGV).\n" "\n" "We apologize for the inconvenience, but Audacious has crashed.\n" -"This is a bug in the program, and should never happen under normal " -"circumstances.\n" +"This is a bug in the program, and should never happen under normal circumstances.\n" "Your current configuration has been saved and should not be damaged.\n" "\n" -"You can help improve the quality of Audacious by filing a bug at http://bugs-" -"meta.atheme.org\n" -"Please include the entire text of this message and a description of what you " -"were doing when\n" -"this crash occured in order to quickly expedite the handling of your bug " -"report:\n" +"You can help improve the quality of Audacious by filing a bug at http://bugs-meta.atheme.org\n" +"Please include the entire text of this message and a description of what you were doing when\n" +"this crash occured in order to quickly expedite the handling of your bug report:\n" "\n" msgstr "" +"\n" +"Audacious a reçu un signal 11 (SIGSEGV).\n" +"\n" +"Nous nous excusons pour ce désagrément, mais Audacious a planté.\n" +"C'est un bug du programme qui ne devrait pas arriver dans des circonstances normales.\n" +"Votre configuration courante a été sauvée et ne sera pas endommagée.\n" +"\n" +"Vous pouvez aider à améliorer la qualité d'Audacious en remontant un bug sur http://bugs-meta.atheme.org\n" +"Veuillez joindre le texte entier du message et une description de ce que vous faisiez quand\n" +"le plantage s'est produit pour nous occuper rapidement de votre rapport de bug.\n" #: src/audacious/signals.c:80 msgid "" "\n" -"Bugs can be reported at http://bugs-meta.atheme.org against the Audacious " -"product.\n" +"Bugs can be reported at http://bugs-meta.atheme.org against the Audacious product.\n" msgstr "" +"\n" +"Les bugs peuvent être rapportés sur http://bugs-meta.atheme.org dans la catégorie Audacious.\n" #: src/audacious/signals.c:266 msgid "" @@ -794,7 +758,7 @@ msgstr " (format UTF-8 invalide)" #: src/audacious/ui_about.c:46 -#, fuzzy, c-format +#, c-format msgid "" "<big><b>Audacious %s</b></big>\n" "\n" @@ -803,19 +767,22 @@ "<big><b>Audacious %s</b></big>\n" "Le futur du multimédia sous UNIX\n" "\n" -"Copyright (C) 2005-2006 L'équipe de développement d'Audacious\n" - -#: src/audacious/ui_about.c:125 src/audacious/ui_credits.c:355 -#: src/audacious/ui_manager.c:391 src/audacious/ui_manager.c:392 +"Copyright (C) 2005-2006 L'équipe de développement d'Audacious" + +#: src/audacious/ui_about.c:125 +#: src/audacious/ui_credits.c:356 +#: src/audacious/ui_manager.c:391 +#: src/audacious/ui_manager.c:392 msgid "About Audacious" msgstr "À Propos d'Audacious" -#: src/audacious/ui_about.c:174 src/audacious/ui_credits.c:398 +#: src/audacious/ui_about.c:174 +#: src/audacious/ui_credits.c:399 msgid "Credits" msgstr "Crédits" #: src/audacious/ui_credits.c:47 -#, fuzzy, c-format +#, c-format msgid "" "<big><b>Audacious %s</b></big>\n" "The future of UNIX multimedia.\n" @@ -823,7 +790,7 @@ "Copyright (C) 2005-2007 Audacious Development Team\n" msgstr "" "<big><b>Audacious %s</b></big>\n" -"Le futur du multimédia sous UNIX\n" +"Le futur du multimédia sous UNIX.\n" "\n" "Copyright (C) 2005-2006 L'équipe de développement d'Audacious\n" @@ -843,151 +810,147 @@ msgid "Plugin development:" msgstr "Développement des greffons:" -#: src/audacious/ui_credits.c:96 +#: src/audacious/ui_credits.c:97 msgid "Patch authors:" msgstr "Auteurs de patchs:" -#: src/audacious/ui_credits.c:116 +#: src/audacious/ui_credits.c:117 msgid "0.1.x developers:" msgstr "Développeurs de la version 0.1.x:" -#: src/audacious/ui_credits.c:122 +#: src/audacious/ui_credits.c:123 msgid "BMP Developers:" msgstr "Développeurs de BMP:" -#: src/audacious/ui_credits.c:154 +#: src/audacious/ui_credits.c:155 msgid "Brazilian Portuguese:" msgstr "Brésilien:" -#: src/audacious/ui_credits.c:158 +#: src/audacious/ui_credits.c:159 msgid "Breton:" msgstr "Breton:" -#: src/audacious/ui_credits.c:161 -#, fuzzy +#: src/audacious/ui_credits.c:162 msgid "Bulgarian:" -msgstr "Hongrois:" - -#: src/audacious/ui_credits.c:164 -#, fuzzy +msgstr "Bulgare:" + +#: src/audacious/ui_credits.c:165 msgid "Catalan:" -msgstr "Italien:" - -#: src/audacious/ui_credits.c:167 -#, fuzzy +msgstr "Catalan:" + +#: src/audacious/ui_credits.c:168 msgid "Croatian:" -msgstr "Roumain:" - -#: src/audacious/ui_credits.c:170 +msgstr "Croate:" + +#: src/audacious/ui_credits.c:171 msgid "Czech:" msgstr "Tchèque:" -#: src/audacious/ui_credits.c:173 +#: src/audacious/ui_credits.c:174 msgid "Dutch:" msgstr "Néerlandais:" -#: src/audacious/ui_credits.c:177 +#: src/audacious/ui_credits.c:178 msgid "Finnish:" msgstr "Finlandais :" -#: src/audacious/ui_credits.c:180 +#: src/audacious/ui_credits.c:181 msgid "French:" msgstr "Français:" -#: src/audacious/ui_credits.c:183 +#: src/audacious/ui_credits.c:184 msgid "German:" msgstr "Allemand:" -#: src/audacious/ui_credits.c:188 -#, fuzzy +#: src/audacious/ui_credits.c:189 msgid "Georgian:" -msgstr "Géorgien :" - -#: src/audacious/ui_credits.c:191 +msgstr "Géorgien:" + +#: src/audacious/ui_credits.c:192 msgid "Greek:" msgstr "Grec:" -#: src/audacious/ui_credits.c:196 +#: src/audacious/ui_credits.c:197 msgid "Hindi:" msgstr "Hindi:" -#: src/audacious/ui_credits.c:199 +#: src/audacious/ui_credits.c:200 msgid "Hungarian:" msgstr "Hongrois:" -#: src/audacious/ui_credits.c:202 +#: src/audacious/ui_credits.c:203 msgid "Italian:" msgstr "Italien:" -#: src/audacious/ui_credits.c:206 +#: src/audacious/ui_credits.c:207 msgid "Japanese:" msgstr "Japonais:" -#: src/audacious/ui_credits.c:209 +#: src/audacious/ui_credits.c:210 msgid "Korean:" msgstr "Coréen:" -#: src/audacious/ui_credits.c:212 +#: src/audacious/ui_credits.c:213 msgid "Lithuanian:" msgstr "Lituanien:" -#: src/audacious/ui_credits.c:215 +#: src/audacious/ui_credits.c:216 msgid "Macedonian:" msgstr "Macédonien:" -#: src/audacious/ui_credits.c:218 +#: src/audacious/ui_credits.c:219 msgid "Polish:" msgstr "Polonais:" -#: src/audacious/ui_credits.c:221 +#: src/audacious/ui_credits.c:222 msgid "Romanian:" msgstr "Roumain:" -#: src/audacious/ui_credits.c:225 +#: src/audacious/ui_credits.c:226 msgid "Russian:" msgstr "Russe:" -#: src/audacious/ui_credits.c:228 +#: src/audacious/ui_credits.c:229 msgid "Serbian (Latin):" -msgstr "" - -#: src/audacious/ui_credits.c:231 +msgstr "Serbe (Latin):" + +#: src/audacious/ui_credits.c:232 msgid "Serbian (Cyrillic):" -msgstr "" - -#: src/audacious/ui_credits.c:234 +msgstr "Serbe (Cyrillic):" + +#: src/audacious/ui_credits.c:235 msgid "Simplified Chinese:" -msgstr "" - -#: src/audacious/ui_credits.c:237 +msgstr "Chinois Simplifié:" + +#: src/audacious/ui_credits.c:238 msgid "Slovak:" msgstr "Slovaque:" -#: src/audacious/ui_credits.c:240 +#: src/audacious/ui_credits.c:241 msgid "Spanish:" msgstr "Espagnol:" -#: src/audacious/ui_credits.c:243 +#: src/audacious/ui_credits.c:244 msgid "Swedish:" msgstr "Suédois:" -#: src/audacious/ui_credits.c:246 +#: src/audacious/ui_credits.c:247 msgid "Traditional Chinese:" -msgstr "" - -#: src/audacious/ui_credits.c:249 +msgstr "Chinois Traditionnel:" + +#: src/audacious/ui_credits.c:250 msgid "Turkish:" -msgstr "" - -#: src/audacious/ui_credits.c:253 +msgstr "Turque:" + +#: src/audacious/ui_credits.c:254 msgid "Ukrainian:" msgstr "Ukrainien :" -#: src/audacious/ui_credits.c:256 +#: src/audacious/ui_credits.c:257 msgid "Welsh:" msgstr "Gallois:" -#: src/audacious/ui_credits.c:402 +#: src/audacious/ui_credits.c:403 msgid "Translators" msgstr "Traducteurs" @@ -1003,42 +966,45 @@ msgid "Track Information Window" msgstr "Fenêtre d'information de la piste" -#: src/audacious/ui_fileinfopopup.c:252 src/audacious/ui_fileinfopopup.c:364 -#: src/audacious/ui_preferences.c:124 +#: src/audacious/ui_fileinfopopup.c:252 +#: src/audacious/ui_fileinfopopup.c:364 +#: src/audacious/ui_preferences.c:125 msgid "Title" msgstr "Titre" -#: src/audacious/ui_fileinfopopup.c:255 src/audacious/ui_preferences.c:122 +#: src/audacious/ui_fileinfopopup.c:255 +#: src/audacious/ui_preferences.c:123 msgid "Artist" msgstr "Artiste" -#: src/audacious/ui_fileinfopopup.c:258 src/audacious/ui_preferences.c:123 +#: src/audacious/ui_fileinfopopup.c:258 +#: src/audacious/ui_preferences.c:124 msgid "Album" msgstr "Album" -#: src/audacious/ui_fileinfopopup.c:261 src/audacious/ui_preferences.c:126 +#: src/audacious/ui_fileinfopopup.c:261 +#: src/audacious/ui_preferences.c:127 msgid "Genre" msgstr "Genre" -#: src/audacious/ui_fileinfopopup.c:264 src/audacious/ui_preferences.c:130 +#: src/audacious/ui_fileinfopopup.c:264 +#: src/audacious/ui_preferences.c:131 msgid "Year" msgstr "Année" #: src/audacious/ui_fileinfopopup.c:267 -#, fuzzy msgid "Track Number" -msgstr "Numéro de piste" +msgstr "Numéro de Piste" #: src/audacious/ui_fileinfopopup.c:271 -#, fuzzy msgid "Track Length" -msgstr "Durée du morceau:" - -#: src/audacious/ui_fileinfopopup.c:373 src/audacious/ui_preferences.c:127 -#: src/audacious/ui_preferences.c:426 src/audacious/ui_preferences.c:514 -#: src/audacious/ui_preferences.c:603 src/audacious/ui_preferences.c:699 +msgstr "Durée du Morceau" + +#: src/audacious/ui_fileinfopopup.c:373 +#: src/audacious/ui_preferences.c:128 +#: src/audacious/ui_preferences.c:420 msgid "Filename" -msgstr "Nom du ficher" +msgstr "Nom du fichier" #: src/audacious/ui_fileopener.c:128 msgid "Open Files" @@ -1064,50 +1030,49 @@ msgid "Load files" msgstr "Charger les fichiers" -#: src/audacious/ui_jumptotrack.c:140 +#: src/audacious/ui_jumptotrack.c:138 msgid "Un_queue" msgstr "_Retirer de la file" -#: src/audacious/ui_jumptotrack.c:142 src/audacious/ui_jumptotrack.c:605 +#: src/audacious/ui_jumptotrack.c:140 +#: src/audacious/ui_jumptotrack.c:603 msgid "_Queue" msgstr "_Mettre dans la file" -#: src/audacious/ui_jumptotrack.c:520 +#: src/audacious/ui_jumptotrack.c:518 msgid "Jump to Track" msgstr "Aller au morceau" -#: src/audacious/ui_jumptotrack.c:561 +#: src/audacious/ui_jumptotrack.c:559 msgid "Filter: " msgstr "Filtre:" -#: src/audacious/ui_jumptotrack.c:562 -#, fuzzy +#: src/audacious/ui_jumptotrack.c:560 msgid "_Filter:" -msgstr "Filtre:" - -#: src/audacious/ui_jumptotrack.c:596 -#, fuzzy +msgstr "_Filtre:" + +#: src/audacious/ui_jumptotrack.c:594 msgid "Close on Jump" -msgstr "Fermer la fenêtre après l'ouverture" +msgstr "Fermer" #: src/audacious/ui_lastfm.c:65 msgid "Not last.fm stream" -msgstr "" +msgstr "Ceci n'est pas un stream last.fm" #: src/audacious/ui_lastfm.c:90 -#, fuzzy, c-format +#, c-format msgid "<b>Artist:</b> %s" -msgstr "<i>Artiste</i>" +msgstr "<b>Artist:</b> %s" #: src/audacious/ui_lastfm.c:98 -#, fuzzy, c-format +#, c-format msgid "<b>Title:</b> %s" -msgstr "<i>Titre</i>" +msgstr "<b>Title:</b> %s" #: src/audacious/ui_lastfm.c:102 -#, fuzzy, c-format +#, c-format msgid "<b>Album:</b> %s" -msgstr "<i>Album</i>" +msgstr "<b>Album</b> %s" #: src/audacious/ui_lastfm.c:117 msgid "" @@ -1115,55 +1080,53 @@ "\n" "Check if your Scrobbler's plugin login settings are configured properly.\n" msgstr "" +"<b><big>Votre login lastfm est introuvable.</big></b>\n" +"\n" +"Vérifiez si le login du greffon de Scrobbler a été correctement configuré.\n" #: src/audacious/ui_lastfm.c:238 -#, fuzzy msgid "Audacious last.fm radio tuner" -msgstr "Éditeur de liste d'écoute" +msgstr "Radio Tuner Last.fm" #: src/audacious/ui_lastfm.c:239 -#, fuzzy msgid "Station:" -msgstr "Italien:" +msgstr "Station:" #: src/audacious/ui_lastfm.c:245 -#, fuzzy msgid "<b>Artist:</b>" -msgstr "<i>Artiste</i>" +msgstr "<b>Artiste</b>" #: src/audacious/ui_lastfm.c:249 -#, fuzzy msgid "<b>Title:</b>" -msgstr "<i>Titre</i>" +msgstr "<b>Titre</b>" #: src/audacious/ui_lastfm.c:253 -#, fuzzy msgid "<b>Album:</b>" -msgstr "<i>Album</i>" +msgstr "<b>Album</b>" #: src/audacious/ui_lastfm.c:257 msgid "Love" -msgstr "" +msgstr "Favoris" #: src/audacious/ui_lastfm.c:258 msgid "Ban" -msgstr "" +msgstr "Bannis" #: src/audacious/ui_lastfm.c:259 msgid "Skip" -msgstr "" +msgstr "Sauter" #: src/audacious/ui_lastfm.c:260 msgid "Tune in" -msgstr "" +msgstr "Ecouter" #: src/audacious/ui_lastfm.c:262 msgid "Neighbours' radio" -msgstr "" +msgstr "Radio voisine" #: src/audacious/ui_lastfm.c:263 msgid "Personal radio" -msgstr "" +msgstr "Radio personnelle" #: src/audacious/ui_lastfm.c:337 msgid "" @@ -1171,123 +1134,124 @@ "\n" "Check if the AudioScrobbler plugin was compiled in\n" msgstr "" - -#: src/audacious/ui_main.c:500 +"<b><big>Le greffon radio lastfm ne peut être trouvé</big></b>\n" +"\n" +"Vérifiez si le greffon AudioScrobbler a été compilé avec Audacious\n" + +#: src/audacious/ui_main.c:499 #, c-format msgid "%s - Audacious" msgstr "%s - Audacious" -#: src/audacious/ui_main.c:755 +#: src/audacious/ui_main.c:754 msgid "VBR" msgstr "VBR" -#: src/audacious/ui_main.c:772 src/audacious/ui_main.c:776 +#: src/audacious/ui_main.c:771 +#: src/audacious/ui_main.c:775 msgid "stereo" msgstr "stéréo" -#: src/audacious/ui_main.c:772 src/audacious/ui_main.c:776 +#: src/audacious/ui_main.c:771 +#: src/audacious/ui_main.c:775 msgid "mono" msgstr "mono" -#: src/audacious/ui_main.c:1032 src/audacious/ui_manager.c:423 +#: src/audacious/ui_main.c:1031 +#: src/audacious/ui_manager.c:423 #: src/audacious/ui_manager.c:424 msgid "Jump to Time" msgstr "Aller au Temps" -#: src/audacious/ui_main.c:1053 +#: src/audacious/ui_main.c:1052 msgid "minutes:seconds" msgstr "minutes:secondes" -#: src/audacious/ui_main.c:1063 +#: src/audacious/ui_main.c:1062 msgid "Track length:" msgstr "Durée du morceau:" -#: src/audacious/ui_main.c:1200 +#: src/audacious/ui_main.c:1199 msgid "Audacious - visibility warning" -msgstr "" +msgstr "Audacious - Alerte" + +#: src/audacious/ui_main.c:1201 +msgid "Show main player window" +msgstr "Voir la fenêtre du lecteur principal" #: src/audacious/ui_main.c:1202 -msgid "Show main player window" -msgstr "" - -#: src/audacious/ui_main.c:1203 msgid "Ignore" -msgstr "" - -#: src/audacious/ui_main.c:1207 +msgstr "Ignorer" + +#: src/audacious/ui_main.c:1206 msgid "" "Audacious has been started with all of its windows hidden.\n" -"You may want to show the player window again to control Audacious; " -"otherwise, you'll have to control it remotely via audtool or enabled plugins " -"(such as the statusicon plugin)." +"You may want to show the player window again to control Audacious; otherwise, you'll have to control it remotely via audtool or enabled plugins (such as the statusicon plugin)." msgstr "" - -#: src/audacious/ui_main.c:1213 +"Audacious a été démarré avec toutes les fenêtres cachées.\n" +"Vous voudriez encore voir la fenêtre du lecteur pour controler Audacious; Sinon, vous devrez le contrôler avec Audtool ou des greffons compilés (comme le greffon Statusicon)." + +#: src/audacious/ui_main.c:1212 msgid "Always ignore, show/hide is controlled remotely" -msgstr "" - -#: src/audacious/ui_main.c:1231 +msgstr "Toujours ignoré, voir/caché est controllé automatiquement" + +#: src/audacious/ui_main.c:1230 msgid "Enter location to play:" msgstr "Entrer l'emplacement à jouer :" -#: src/audacious/ui_main.c:1465 -#, fuzzy, c-format +#: src/audacious/ui_main.c:1464 +#, c-format msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)" -msgstr "POS.: %d:%-2.2d/%d:%-2.2d (%d%%)" - -#: src/audacious/ui_main.c:1497 +msgstr "Rechercher à : %d:%-2.2d/%d:%-2.2d (%d%%)" + +#: src/audacious/ui_main.c:1496 #, c-format msgid "Volume: %d%%" -msgstr "" - -#: src/audacious/ui_main.c:1528 +msgstr "Volume: %d%%" + +#: src/audacious/ui_main.c:1527 #, c-format msgid "Balance: %d%% left" -msgstr "" - -#: src/audacious/ui_main.c:1532 +msgstr "Balance: %d%% gauche" + +#: src/audacious/ui_main.c:1531 msgid "Balance: center" -msgstr "" - -#: src/audacious/ui_main.c:1536 +msgstr "Balance: centre" + +#: src/audacious/ui_main.c:1535 #, c-format msgid "Balance: %d%% right" -msgstr "" - -#: src/audacious/ui_main.c:1879 +msgstr "Balance: %d%% droite" + +#: src/audacious/ui_main.c:1878 msgid "Options Menu" -msgstr "" - -#: src/audacious/ui_main.c:1883 -#, fuzzy +msgstr "Menu des Options" + +#: src/audacious/ui_main.c:1882 msgid "Disable 'Always On Top'" -msgstr "/Toujours au-dessus" - -#: src/audacious/ui_main.c:1885 -#, fuzzy +msgstr "Désactiver Toujours au-dessus" + +#: src/audacious/ui_main.c:1884 msgid "Enable 'Always On Top'" -msgstr "/Toujours au-dessus" - -#: src/audacious/ui_main.c:1888 +msgstr "Activer Toujours au-dessus" + +#: src/audacious/ui_main.c:1887 msgid "File Info Box" -msgstr "" - -#: src/audacious/ui_main.c:1892 -#, fuzzy +msgstr "Info du Fichier" + +#: src/audacious/ui_main.c:1891 msgid "Disable 'Doublesize'" -msgstr "/Double Taille" - -#: src/audacious/ui_main.c:1894 -#, fuzzy +msgstr "Désactiver 'Doublesize'" + +#: src/audacious/ui_main.c:1893 msgid "Enable 'Doublesize'" -msgstr "/Double Taille" - -#: src/audacious/ui_main.c:1897 -#, fuzzy +msgstr "Activer 'Doublesize'" + +#: src/audacious/ui_main.c:1896 msgid "Visualization Menu" -msgstr "/Type de graphique" - -#: src/audacious/ui_main.c:1945 +msgstr "Menu Visualisation" + +#: src/audacious/ui_main.c:1944 msgid "" "<b><big>Couldn't open audio.</big></b>\n" "\n" @@ -1303,731 +1267,655 @@ "2. aucun programme n'utilise déjà la carte son.\n" "3. votre carte son est correctement configurée.\n" -#: src/audacious/ui_main.c:2025 +#: src/audacious/ui_main.c:2024 #, c-format msgid "VOLUME: %d%%" msgstr "VOLUME: %d%%" -#: src/audacious/ui_main.c:2028 +#: src/audacious/ui_main.c:2027 #, c-format msgid "BALANCE: %d%% LEFT" msgstr "BALANCE: %d%% GAUCHE" -#: src/audacious/ui_main.c:2031 +#: src/audacious/ui_main.c:2030 msgid "BALANCE: CENTER" msgstr "BALANCE: CENTRÉE" -#: src/audacious/ui_main.c:2033 +#: src/audacious/ui_main.c:2032 #, c-format msgid "BALANCE: %d%% RIGHT" msgstr "BALANCE: %d%% DROITE" -#: src/audacious/ui_main.c:2496 -#, fuzzy +#: src/audacious/ui_main.c:2495 msgid "Error in Audacious." -msgstr "%s - Audacious" - -#: src/audacious/ui_manager.c:48 src/audacious/ui_manager.c:49 -#, fuzzy +msgstr "Erruer dans Audacious" + +#: src/audacious/ui_manager.c:48 +#: src/audacious/ui_manager.c:49 msgid "Autoscroll Songname" -msgstr "/Défilement du titre" - -#: src/audacious/ui_manager.c:51 src/audacious/ui_manager.c:52 -#, fuzzy +msgstr "Défilement du titre" + +#: src/audacious/ui_manager.c:51 +#: src/audacious/ui_manager.c:52 msgid "Stop after Current Song" -msgstr "/Arrêter la lecture du morceau" - -#: src/audacious/ui_manager.c:54 src/audacious/ui_manager.c:55 -#, fuzzy +msgstr "Arrêter la lecture du morceau" + +#: src/audacious/ui_manager.c:54 +#: src/audacious/ui_manager.c:55 msgid "Peaks" -msgstr "/Pause" - -#: src/audacious/ui_manager.c:57 src/audacious/ui_manager.c:58 -#, fuzzy +msgstr "Pics" + +#: src/audacious/ui_manager.c:57 +#: src/audacious/ui_manager.c:58 msgid "Repeat" -msgstr "/Répéter" - -#: src/audacious/ui_manager.c:60 src/audacious/ui_manager.c:61 -#, fuzzy +msgstr "Répéter" + +#: src/audacious/ui_manager.c:60 +#: src/audacious/ui_manager.c:61 msgid "Shuffle" -msgstr "/Mélanger" - -#: src/audacious/ui_manager.c:63 src/audacious/ui_manager.c:64 -#, fuzzy +msgstr "Mélanger" + +#: src/audacious/ui_manager.c:63 +#: src/audacious/ui_manager.c:64 msgid "No Playlist Advance" -msgstr "/Ne pas avancer dans la liste" - -#: src/audacious/ui_manager.c:66 src/audacious/ui_manager.c:67 -#, fuzzy +msgstr "Ne pas avancer dans la liste" + +#: src/audacious/ui_manager.c:66 +#: src/audacious/ui_manager.c:67 msgid "Show Player" -msgstr "/Montrer le lecteur" - -#: src/audacious/ui_manager.c:69 src/audacious/ui_manager.c:70 -#, fuzzy +msgstr "Montrer le lecteur" + +#: src/audacious/ui_manager.c:69 +#: src/audacious/ui_manager.c:70 msgid "Show Playlist Editor" -msgstr "/Montrer la liste d'écoute" - -#: src/audacious/ui_manager.c:72 src/audacious/ui_manager.c:73 -#, fuzzy +msgstr "Montrer la liste d'écoute" + +#: src/audacious/ui_manager.c:72 +#: src/audacious/ui_manager.c:73 msgid "Show Equalizer" -msgstr "/Équaliseur" - -#: src/audacious/ui_manager.c:75 src/audacious/ui_manager.c:76 -#, fuzzy +msgstr "Équaliseur" + +#: src/audacious/ui_manager.c:75 +#: src/audacious/ui_manager.c:76 msgid "Always on Top" -msgstr "/Toujours au-dessus" - -#: src/audacious/ui_manager.c:78 src/audacious/ui_manager.c:79 -#, fuzzy +msgstr "Toujours au-dessus" + +#: src/audacious/ui_manager.c:78 +#: src/audacious/ui_manager.c:79 msgid "Put on All Workspaces" -msgstr "/Visible partout" - -#: src/audacious/ui_manager.c:81 src/audacious/ui_manager.c:82 -#, fuzzy +msgstr "Visible partout" + +#: src/audacious/ui_manager.c:81 +#: src/audacious/ui_manager.c:82 msgid "Roll up Player" -msgstr "/Enrouler le lecteur" - -#: src/audacious/ui_manager.c:84 src/audacious/ui_manager.c:85 -#, fuzzy +msgstr "Enrouler le lecteur" + +#: src/audacious/ui_manager.c:84 +#: src/audacious/ui_manager.c:85 msgid "Roll up Playlist Editor" -msgstr "/Enrouler l'éditeur de liste" - -#: src/audacious/ui_manager.c:87 src/audacious/ui_manager.c:88 -#, fuzzy +msgstr "Enrouler l'éditeur de liste" + +#: src/audacious/ui_manager.c:87 +#: src/audacious/ui_manager.c:88 msgid "Roll up Equalizer" -msgstr "/Enrouler l'équaliseur" - -#: src/audacious/ui_manager.c:90 src/audacious/ui_manager.c:91 -#, fuzzy +msgstr "Enrouler l'équaliseur" + +#: src/audacious/ui_manager.c:90 +#: src/audacious/ui_manager.c:91 msgid "DoubleSize" -msgstr "/Double Taille" - -#: src/audacious/ui_manager.c:93 src/audacious/ui_manager.c:94 -#, fuzzy +msgstr "Double Taille" + +#: src/audacious/ui_manager.c:93 +#: src/audacious/ui_manager.c:94 msgid "Easy Move" -msgstr "/Easy Move" +msgstr "Easy Move" #: src/audacious/ui_manager.c:102 -#, fuzzy msgid "Analyzer" -msgstr "/Type Analyseur" +msgstr "Type Analyseur" #: src/audacious/ui_manager.c:103 -#, fuzzy msgid "Scope" -msgstr "/Type Scope" +msgstr "Type Scope" #: src/audacious/ui_manager.c:104 -#, fuzzy msgid "Voiceprint" -msgstr "/Type Analyseur/Feu" +msgstr "Type Analyseur/Feu" #: src/audacious/ui_manager.c:105 msgid "Off" -msgstr "" - -#: src/audacious/ui_manager.c:109 src/audacious/ui_manager.c:126 +msgstr "Off" + +#: src/audacious/ui_manager.c:109 +#: src/audacious/ui_manager.c:126 #: src/audacious/ui_manager.c:132 msgid "Normal" -msgstr "" - -#: src/audacious/ui_manager.c:110 src/audacious/ui_manager.c:127 +msgstr "Normal" + +#: src/audacious/ui_manager.c:110 +#: src/audacious/ui_manager.c:127 msgid "Fire" -msgstr "" +msgstr "Fire" #: src/audacious/ui_manager.c:111 -#, fuzzy msgid "Vertical Lines" -msgstr "/Type Analyseur/Lignes verticales" +msgstr "Type Analyseur/Lignes verticales" #: src/audacious/ui_manager.c:115 -#, fuzzy msgid "Lines" -msgstr "lignes" +msgstr "Lignes" #: src/audacious/ui_manager.c:116 msgid "Bars" -msgstr "" +msgstr "Bars" #: src/audacious/ui_manager.c:120 -#, fuzzy msgid "Dot Scope" -msgstr "/Type Scope/Point" +msgstr "Type Scope/Point" #: src/audacious/ui_manager.c:121 -#, fuzzy msgid "Line Scope" -msgstr "/Type Scope/Ligne" +msgstr "Type Scope/Ligne" #: src/audacious/ui_manager.c:122 -#, fuzzy msgid "Solid Scope" -msgstr "/Type Scope/Solide" +msgstr "Type Scope/Solide" #: src/audacious/ui_manager.c:128 msgid "Ice" -msgstr "" +msgstr "Ice" #: src/audacious/ui_manager.c:133 -#, fuzzy msgid "Smooth" -msgstr "mono" +msgstr "Smooth" #: src/audacious/ui_manager.c:137 -#, fuzzy msgid "Full (~50 fps)" -msgstr "/Taux de Rafraîchissement/Max (~50 fps)" +msgstr "Taux de Rafraîchissement/Max (~50 fps)" #: src/audacious/ui_manager.c:138 -#, fuzzy msgid "Half (~25 fps)" -msgstr "/Taux de Rafraîchissement/Haut (~25 fps)" +msgstr "Taux de Rafraîchissement/Haut (~25 fps)" #: src/audacious/ui_manager.c:139 -#, fuzzy msgid "Quarter (~13 fps)" -msgstr "/Taux de Rafraîchissement/Moyen (~13 fps)" +msgstr "Taux de Rafraîchissement/Moyen (~13 fps)" #: src/audacious/ui_manager.c:140 -#, fuzzy msgid "Eighth (~6 fps)" -msgstr "/Taux de Rafraîchisement/Bas (~6 fps)" - -#: src/audacious/ui_manager.c:144 src/audacious/ui_manager.c:152 +msgstr "Taux de Rafraîchisement/Bas (~6 fps)" + +#: src/audacious/ui_manager.c:144 +#: src/audacious/ui_manager.c:152 msgid "Slowest" -msgstr "" - -#: src/audacious/ui_manager.c:145 src/audacious/ui_manager.c:153 +msgstr "Plus lent" + +#: src/audacious/ui_manager.c:145 +#: src/audacious/ui_manager.c:153 msgid "Slow" -msgstr "" - -#: src/audacious/ui_manager.c:146 src/audacious/ui_manager.c:154 +msgstr "Lent" + +#: src/audacious/ui_manager.c:146 +#: src/audacious/ui_manager.c:154 msgid "Medium" -msgstr "" - -#: src/audacious/ui_manager.c:147 src/audacious/ui_manager.c:155 +msgstr "Moyen" + +#: src/audacious/ui_manager.c:147 +#: src/audacious/ui_manager.c:155 msgid "Fast" -msgstr "" - -#: src/audacious/ui_manager.c:148 src/audacious/ui_manager.c:156 +msgstr "Rapide" + +#: src/audacious/ui_manager.c:148 +#: src/audacious/ui_manager.c:156 msgid "Fastest" -msgstr "" +msgstr "Plus rapide" #: src/audacious/ui_manager.c:160 -#, fuzzy msgid "Time Elapsed" -msgstr "/Temps écoulé" +msgstr "Temps écoulé" #: src/audacious/ui_manager.c:161 -#, fuzzy msgid "Time Remaining" -msgstr "/Temps restant" +msgstr "Temps restant" #: src/audacious/ui_manager.c:170 -#, fuzzy msgid "Playback" -msgstr "/_Lecture" - -#: src/audacious/ui_manager.c:172 src/audacious/ui_manager.c:173 -#, fuzzy +msgstr "_Lecture" + +#: src/audacious/ui_manager.c:172 +#: src/audacious/ui_manager.c:173 msgid "Play" -msgstr "/Lecture" - -#: src/audacious/ui_manager.c:175 src/audacious/ui_manager.c:176 -#, fuzzy +msgstr "Lecture" + +#: src/audacious/ui_manager.c:175 +#: src/audacious/ui_manager.c:176 msgid "Pause" -msgstr "/Pause" - -#: src/audacious/ui_manager.c:178 src/audacious/ui_manager.c:179 -#, fuzzy +msgstr "Pause" + +#: src/audacious/ui_manager.c:178 +#: src/audacious/ui_manager.c:179 msgid "Stop" -msgstr "/Stop" - -#: src/audacious/ui_manager.c:181 src/audacious/ui_manager.c:182 -#, fuzzy +msgstr "Stop" + +#: src/audacious/ui_manager.c:181 +#: src/audacious/ui_manager.c:182 msgid "Previous" -msgstr "/Précédent" - -#: src/audacious/ui_manager.c:184 src/audacious/ui_manager.c:185 -#, fuzzy +msgstr "Précédent" + +#: src/audacious/ui_manager.c:184 +#: src/audacious/ui_manager.c:185 msgid "Next" -msgstr "/Suivant" +msgstr "Suivant" #: src/audacious/ui_manager.c:190 -#, fuzzy msgid "Visualization" -msgstr "/Type de graph_ique" +msgstr "Type de graph_ique" #: src/audacious/ui_manager.c:191 -#, fuzzy msgid "Visualization Mode" -msgstr "/Type de graphique" +msgstr "Type de graphique" #: src/audacious/ui_manager.c:192 -#, fuzzy msgid "Analyzer Mode" -msgstr "/Type Analyseur/Feu" +msgstr "Type Analyseur/Feu" #: src/audacious/ui_manager.c:193 -#, fuzzy msgid "Scope Mode" -msgstr "/Type Scope" +msgstr "Type Scope" #: src/audacious/ui_manager.c:194 -#, fuzzy msgid "Voiceprint Mode" -msgstr "/Type Analyseur/Feu" +msgstr "Type Analyseur/Feu" #: src/audacious/ui_manager.c:195 -#, fuzzy msgid "WindowShade VU Mode" -msgstr "/Mode Fenêtre Réduite" +msgstr "Mode Fenêtre Réduite" #: src/audacious/ui_manager.c:196 -#, fuzzy msgid "Refresh Rate" -msgstr "/Taux de Rafraîchissement" +msgstr "Taux de Rafraîchissement" #: src/audacious/ui_manager.c:197 -#, fuzzy msgid "Analyzer Falloff" -msgstr "/Effet Retombée Analyseur" +msgstr "Effet Retombée Analyseur" #: src/audacious/ui_manager.c:198 -#, fuzzy msgid "Peaks Falloff" -msgstr "/Effet Retombée Crêtes" - -#: src/audacious/ui_manager.c:205 src/audacious/ui_manager.c:206 -#, fuzzy +msgstr "Effet Retombée Crêtes" + +#: src/audacious/ui_manager.c:205 +#: src/audacious/ui_manager.c:206 msgid "New Playlist" -msgstr "Sauver la Liste d'écoute" - -#: src/audacious/ui_manager.c:208 src/audacious/ui_manager.c:209 -#, fuzzy +msgstr "Nouvelle Playlist" + +#: src/audacious/ui_manager.c:208 +#: src/audacious/ui_manager.c:209 msgid "Select Next Playlist" -msgstr "Sauver la Liste d'écoute" - -#: src/audacious/ui_manager.c:211 src/audacious/ui_manager.c:212 -#, fuzzy +msgstr "Sélectionner la Prochaine Playlist" + +#: src/audacious/ui_manager.c:211 +#: src/audacious/ui_manager.c:212 msgid "Select Previous Playlist" -msgstr "/Trier la Sélection/Par Entrée de Liste d'écoute" - -#: src/audacious/ui_manager.c:214 src/audacious/ui_manager.c:215 -#, fuzzy +msgstr "Sélectionner la Playlist Précédente" + +#: src/audacious/ui_manager.c:214 +#: src/audacious/ui_manager.c:215 msgid "Delete Playlist" -msgstr "Sauver la Liste d'écoute" +msgstr "Effacer la Playlist" #: src/audacious/ui_manager.c:217 -#, fuzzy msgid "Load List" -msgstr "/Charger une Liste" +msgstr "Charger" #: src/audacious/ui_manager.c:218 -#, fuzzy msgid "Loads a playlist file into the selected playlist." -msgstr "Sauver la Liste d'écoute" +msgstr "Charger une playlist dans la playlist sélectionnée" #: src/audacious/ui_manager.c:220 -#, fuzzy msgid "Save List" -msgstr "/Sauver la Liste" +msgstr "Sauver" #: src/audacious/ui_manager.c:221 -#, fuzzy msgid "Saves the selected playlist." -msgstr "Sauver la Liste d'écoute" +msgstr "Sauver la Liste d'écoute." #: src/audacious/ui_manager.c:223 -#, fuzzy msgid "Save Default List" -msgstr "/Sauver la Liste par Défaut" +msgstr "Sauver la Liste par Défaut" #: src/audacious/ui_manager.c:224 -#, fuzzy msgid "Saves the selected playlist to the default location." -msgstr "Utiliser le sélecteur de fichier XMMS comme le sélecteur par défaut" +msgstr "Sauver la playlist sélectionnées vers l'emplacement par défaut." #: src/audacious/ui_manager.c:227 -#, fuzzy msgid "Refresh List" -msgstr "/Inverser la Liste" +msgstr "Rafraichir" #: src/audacious/ui_manager.c:228 msgid "Refreshes metadata associated with a playlist entry." -msgstr "" +msgstr "Rafraichir les méta-données associées avec la playlist" #: src/audacious/ui_manager.c:231 -#, fuzzy msgid "List Manager" -msgstr "/Ne pas avancer dans la liste" +msgstr "Gestionnaire de Listes" #: src/audacious/ui_manager.c:232 -#, fuzzy msgid "Opens the playlist manager." -msgstr "Ne vide pas la liste d'écoute" +msgstr "Ouvrir le gestionnaire de playlist." #: src/audacious/ui_manager.c:238 -#, fuzzy msgid "View" -msgstr "/_Affichage" +msgstr "Voir" #: src/audacious/ui_manager.c:242 -#, fuzzy msgid "Add Internet Address..." -msgstr "/Ajouter une adresse Internet..." +msgstr "Ajouter une adresse Internet..." #: src/audacious/ui_manager.c:243 -#, fuzzy msgid "Adds a remote track to the playlist." -msgstr "Ne vide pas la liste d'écoute" +msgstr "Ajouter une piste aléatoire à la playlist" #: src/audacious/ui_manager.c:246 -#, fuzzy msgid "Add Files..." -msgstr "/Ajouter des fichiers..." +msgstr "Ajouter des fichiers..." #: src/audacious/ui_manager.c:247 -#, fuzzy msgid "Adds files to the playlist." -msgstr "Ne vide pas la liste d'écoute" +msgstr "Ajouter des fichiers à la playlist." #: src/audacious/ui_manager.c:252 -#, fuzzy msgid "Search and Select" -msgstr "Chercher:" +msgstr "Chercher et Sélectionner" #: src/audacious/ui_manager.c:253 -msgid "" -"Searches the playlist and selects playlist entries based on specific " -"criteria." -msgstr "" +msgid "Searches the playlist and selects playlist entries based on specific criteria." +msgstr "Chercher et sélectionner les entrées de la playlist basées sur des critères spécifiques." #: src/audacious/ui_manager.c:256 -#, fuzzy msgid "Invert Selection" -msgstr "/Inverser la sélection" +msgstr "Inverser la sélection" #: src/audacious/ui_manager.c:257 -#, fuzzy msgid "Inverts the selected and unselected entries." -msgstr "Sauver la Liste d'écoute" +msgstr "Inverser la sélection et les entrées non-sélectionnées." #: src/audacious/ui_manager.c:260 msgid "Select All" msgstr "Tous" #: src/audacious/ui_manager.c:261 -#, fuzzy msgid "Selects all of the playlist entries." -msgstr "/Trier la Liste/Par Entrée de liste d'écoute" +msgstr "Sélectionner toutes les playlists." #: src/audacious/ui_manager.c:264 -#, fuzzy msgid "Select None" -msgstr "/Sélectionner rien" +msgstr "Ne Rien Sélectionner" #: src/audacious/ui_manager.c:265 -#, fuzzy msgid "Deselects all of the playlist entries." -msgstr "Ne vide pas la liste d'écoute" +msgstr "Désélectionner toutes les playlists" #: src/audacious/ui_manager.c:270 -#, fuzzy msgid "Clear Queue" -msgstr "/Vider la file" +msgstr "Vider la File" #: src/audacious/ui_manager.c:271 -#, fuzzy msgid "Clears the queue associated with this playlist." -msgstr "Sauver la Liste d'écoute" +msgstr "Effacer la queue associée avec cette playlist." #: src/audacious/ui_manager.c:274 -#, fuzzy msgid "Remove Unavailable Files" -msgstr "/Enlever les fichiers inexistants" +msgstr "Enlever les fichiers inexistants" #: src/audacious/ui_manager.c:275 -#, fuzzy msgid "Removes unavailable files from the playlist." -msgstr "/Enlever les fichiers inexistants" +msgstr "Enlever les fichiers inexistants" #: src/audacious/ui_manager.c:278 -#, fuzzy msgid "Remove Duplicates" -msgstr "/Enlever les fichiers dupliqués" - -#: src/audacious/ui_manager.c:280 src/audacious/ui_manager.c:316 +msgstr "Enlever les fichiers dupliqués" + +#: src/audacious/ui_manager.c:280 +#: src/audacious/ui_manager.c:316 #: src/audacious/ui_manager.c:346 -#, fuzzy msgid "By Title" -msgstr "Titre" +msgstr "Par Titre" #: src/audacious/ui_manager.c:281 -#, fuzzy msgid "Removes duplicate entries from the playlist by title." -msgstr "/Enlever les fichiers dupliqués/Par Emplacement + Nom de fichier" - -#: src/audacious/ui_manager.c:284 src/audacious/ui_manager.c:324 +msgstr "Enlever les entrées dupliquées de la playlist par titre." + +#: src/audacious/ui_manager.c:284 +#: src/audacious/ui_manager.c:324 #: src/audacious/ui_manager.c:354 -#, fuzzy msgid "By Filename" -msgstr "Nom du ficher" +msgstr "Par Nom du fichier" #: src/audacious/ui_manager.c:285 -#, fuzzy msgid "Removes duplicate entries from the playlist by filename." -msgstr "/Enlever les fichiers dupliqués/Par Emplacement + Nom de fichier" - -#: src/audacious/ui_manager.c:288 src/audacious/ui_manager.c:328 +msgstr "Enlever les fichiers dupliqués par nom de fichier." + +#: src/audacious/ui_manager.c:288 +#: src/audacious/ui_manager.c:328 #: src/audacious/ui_manager.c:358 -#, fuzzy msgid "By Path + Filename" -msgstr "/Trier la liste/Par Chemin et Nom de Fichier" +msgstr "Par Chemin + Nom de Fichier" #: src/audacious/ui_manager.c:289 -#, fuzzy msgid "Removes duplicate entries from the playlist by their full path." -msgstr "/Enlever les fichiers dupliqués/Par Emplacement + Nom de fichier" +msgstr "Enlever les entrées dupliquées de la playlist par emplacement." #: src/audacious/ui_manager.c:292 -#, fuzzy msgid "Remove All" -msgstr "/Vider la liste" +msgstr "Tout Supprimer" #: src/audacious/ui_manager.c:293 -#, fuzzy msgid "Removes all entries from the playlist." -msgstr "/Enlever les fichiers inexistants" +msgstr "Enlever toutes les entrées de la playlist." #: src/audacious/ui_manager.c:296 -#, fuzzy msgid "Remove Unselected" -msgstr "/Garder la sélection" +msgstr "Supprimer Non-sélectionnées" #: src/audacious/ui_manager.c:297 -#, fuzzy msgid "Remove unselected entries from the playlist." -msgstr "/Enlever les fichiers dupliqués/Par Emplacement + Nom de fichier" +msgstr "Enlever les entrées non-sélectionnées de la playlist." #: src/audacious/ui_manager.c:300 -#, fuzzy msgid "Remove Selected" -msgstr "/Enlever la sélection" +msgstr "Supprimer Sélectionnées" #: src/audacious/ui_manager.c:301 -#, fuzzy msgid "Remove selected entries from the playlist." -msgstr "/Enlever les fichiers dupliqués/Par Emplacement + Nom de fichier" +msgstr "Enlever les entrées sélectionnées de la playlist." #: src/audacious/ui_manager.c:306 -#, fuzzy msgid "Randomize List" -msgstr "/Mélanger la Liste" +msgstr "Mélanger la Liste" #: src/audacious/ui_manager.c:307 -#, fuzzy msgid "Randomizes the playlist." -msgstr "/Mélanger la Liste" +msgstr "Mélanger la playlist" #: src/audacious/ui_manager.c:310 -#, fuzzy msgid "Reverse List" -msgstr "/Inverser la Liste" +msgstr "Inverser la Liste" #: src/audacious/ui_manager.c:311 -#, fuzzy msgid "Reverses the playlist." -msgstr "Ne vide pas la liste d'écoute" +msgstr "Renverser la playlist." #: src/audacious/ui_manager.c:314 -#, fuzzy msgid "Sort List" -msgstr "/Trier la liste" - -#: src/audacious/ui_manager.c:317 src/audacious/ui_manager.c:347 -#, fuzzy +msgstr "Trier la liste" + +#: src/audacious/ui_manager.c:317 +#: src/audacious/ui_manager.c:347 msgid "Sorts the list by title." -msgstr "/Trier la liste/Par Titre" - -#: src/audacious/ui_manager.c:320 src/audacious/ui_manager.c:350 -#, fuzzy +msgstr "Trier la liste par titre" + +#: src/audacious/ui_manager.c:320 +#: src/audacious/ui_manager.c:350 msgid "By Artist" -msgstr "Artiste" - -#: src/audacious/ui_manager.c:321 src/audacious/ui_manager.c:351 -#, fuzzy +msgstr "Par Artiste" + +#: src/audacious/ui_manager.c:321 +#: src/audacious/ui_manager.c:351 msgid "Sorts the list by artist." -msgstr "/Trier la Liste/Par Artiste" - -#: src/audacious/ui_manager.c:325 src/audacious/ui_manager.c:355 -#, fuzzy +msgstr "Trier la liste par artiste" + +#: src/audacious/ui_manager.c:325 +#: src/audacious/ui_manager.c:355 msgid "Sorts the list by filename." -msgstr "/Trier la liste/Par Nom de fichier" - -#: src/audacious/ui_manager.c:329 src/audacious/ui_manager.c:359 -#, fuzzy +msgstr "Trier la liste par nom de fichier" + +#: src/audacious/ui_manager.c:329 +#: src/audacious/ui_manager.c:359 msgid "Sorts the list by full pathname." -msgstr "/Trier la liste/Par Nom de fichier" - -#: src/audacious/ui_manager.c:332 src/audacious/ui_manager.c:362 -#, fuzzy +msgstr "Tri de la liste par nom d'emplacement." + +#: src/audacious/ui_manager.c:332 +#: src/audacious/ui_manager.c:362 msgid "By Date" -msgstr "Date" - -#: src/audacious/ui_manager.c:333 src/audacious/ui_manager.c:363 -#, fuzzy +msgstr "Par Date" + +#: src/audacious/ui_manager.c:333 +#: src/audacious/ui_manager.c:363 msgid "Sorts the list by modification time." -msgstr "/Trier la liste/Par Titre" - -#: src/audacious/ui_manager.c:336 src/audacious/ui_manager.c:366 -#, fuzzy +msgstr "Tri de la liste par temps de modification." + +#: src/audacious/ui_manager.c:336 +#: src/audacious/ui_manager.c:366 msgid "By Track Number" -msgstr "Numéro de piste" - -#: src/audacious/ui_manager.c:337 src/audacious/ui_manager.c:367 -#, fuzzy +msgstr "Par Numéro de Piste" + +#: src/audacious/ui_manager.c:337 +#: src/audacious/ui_manager.c:367 msgid "Sorts the list by track number." -msgstr "/Trier la Liste/Par Numéro de Piste" - -#: src/audacious/ui_manager.c:340 src/audacious/ui_manager.c:370 -#, fuzzy +msgstr "Trier la Liste par numéro de piste" + +#: src/audacious/ui_manager.c:340 +#: src/audacious/ui_manager.c:370 msgid "By Playlist Entry" -msgstr "/Trier la Liste/Par Entrée de liste d'écoute" - -#: src/audacious/ui_manager.c:341 src/audacious/ui_manager.c:371 -#, fuzzy +msgstr "Trier la Liste par entrée de la playlist" + +#: src/audacious/ui_manager.c:341 +#: src/audacious/ui_manager.c:371 msgid "Sorts the list by playlist entry." -msgstr "/Trier la Liste/Par Entrée de liste d'écoute" +msgstr "Trier la Liste par entrée de la playlist." #: src/audacious/ui_manager.c:344 -#, fuzzy msgid "Sort Selected" -msgstr "/Trier la sélection" +msgstr "Trier la sélection" #: src/audacious/ui_manager.c:380 -#, fuzzy msgid "File" -msgstr "Titre" +msgstr "Fichier" #: src/audacious/ui_manager.c:381 msgid "Help" -msgstr "" +msgstr "Aide" #: src/audacious/ui_manager.c:383 -#, fuzzy msgid "Plugin Services" -msgstr "Greffons" - -#: src/audacious/ui_manager.c:385 src/audacious/ui_manager.c:388 -#, fuzzy +msgstr "Services Greffon" + +#: src/audacious/ui_manager.c:385 +#: src/audacious/ui_manager.c:388 msgid "View Track Details" -msgstr "/Afficher le détail" - -#: src/audacious/ui_manager.c:386 src/audacious/ui_manager.c:389 -#, fuzzy +msgstr "Afficher le Détail" + +#: src/audacious/ui_manager.c:386 +#: src/audacious/ui_manager.c:389 msgid "View track details" -msgstr "/Afficher le détail" +msgstr "Afficher le Détail" #: src/audacious/ui_manager.c:394 -#, fuzzy msgid "Play File" -msgstr "/Jouer le Fichier" +msgstr "Jouer le Fichier" #: src/audacious/ui_manager.c:395 -#, fuzzy msgid "Load and play a file" -msgstr "Charger les méta-données des listes et fichiers" +msgstr "Charger et jouer un fichier" #: src/audacious/ui_manager.c:397 -#, fuzzy msgid "Play Location" -msgstr "/Jouer le Chemin" +msgstr "Jouer le Chemin" #: src/audacious/ui_manager.c:398 msgid "Play media from the selected location" -msgstr "" +msgstr "Lire le média de la location sélectionnée" #: src/audacious/ui_manager.c:400 -#, fuzzy msgid "Last.fm radio" -msgstr "/Jouer le Chemin" +msgstr "Radio Last.fm" #: src/audacious/ui_manager.c:401 -#, fuzzy msgid "Play Last.fm radio" -msgstr "/Jouer le Chemin" +msgstr "Jouer Last.fm" #: src/audacious/ui_manager.c:405 -#, fuzzy msgid "Preferences" -msgstr "/Préférences" +msgstr "Préférences" #: src/audacious/ui_manager.c:406 -#, fuzzy msgid "Open preferences window" -msgstr "Fenêtre des Préférences" +msgstr "Ouvrir les Préférences" #: src/audacious/ui_manager.c:408 -#, fuzzy msgid "_Quit" -msgstr "/_Quitter" +msgstr "_Quitter" #: src/audacious/ui_manager.c:409 -#, fuzzy msgid "Quit Audacious" -msgstr "À Propos d'Audacious" - -#: src/audacious/ui_manager.c:411 src/audacious/ui_manager.c:412 -#, fuzzy +msgstr "Quitter Audacious" + +#: src/audacious/ui_manager.c:411 +#: src/audacious/ui_manager.c:412 msgid "Set A-B" -msgstr "/Activer A-B" - -#: src/audacious/ui_manager.c:414 src/audacious/ui_manager.c:415 -#, fuzzy +msgstr "Activer A-B" + +#: src/audacious/ui_manager.c:414 +#: src/audacious/ui_manager.c:415 msgid "Clear A-B" -msgstr "/Effacer A-B" - -#: src/audacious/ui_manager.c:417 src/audacious/ui_manager.c:418 -#, fuzzy +msgstr "Effacer A-B" + +#: src/audacious/ui_manager.c:417 +#: src/audacious/ui_manager.c:418 msgid "Jump to Playlist Start" -msgstr "/Retourner au début de la liste" - -#: src/audacious/ui_manager.c:420 src/audacious/ui_manager.c:421 -#, fuzzy +msgstr "Retourner au début de la liste" + +#: src/audacious/ui_manager.c:420 +#: src/audacious/ui_manager.c:421 msgid "Jump to File" -msgstr "/Aller au Fichier" +msgstr "Aller au Fichier" #: src/audacious/ui_manager.c:426 -#, fuzzy msgid "Queue Toggle" -msgstr "/Basculer dans la file" +msgstr "Basculer dans la file" #: src/audacious/ui_manager.c:427 msgid "Enables/disables the entry in the playlist's queue." -msgstr "" +msgstr "Activer/Désactiver l'entrée dans la file de la playlist." #: src/audacious/ui_manager.c:434 -#, fuzzy msgid "Load" -msgstr "/Charger" +msgstr "Charger" #: src/audacious/ui_manager.c:435 -#, fuzzy msgid "Import" -msgstr "/Importer" +msgstr "Importer" #: src/audacious/ui_manager.c:436 -#, fuzzy msgid "Save" -msgstr "/Sauver" +msgstr "Sauver" #: src/audacious/ui_manager.c:437 -#, fuzzy msgid "Delete" -msgstr "/Effacer" - -#: src/audacious/ui_manager.c:439 src/audacious/ui_manager.c:460 +msgstr "Effacer" + +#: src/audacious/ui_manager.c:439 +#: src/audacious/ui_manager.c:460 #: src/audacious/ui_manager.c:475 msgid "Preset" msgstr "Pré-réglage" @@ -2036,166 +1924,140 @@ msgid "Load preset" msgstr "Charger pré-réglages" -#: src/audacious/ui_manager.c:442 src/audacious/ui_manager.c:463 +#: src/audacious/ui_manager.c:442 +#: src/audacious/ui_manager.c:463 #: src/audacious/ui_manager.c:478 -#, fuzzy msgid "Auto-load preset" -msgstr "/Charger/le pré-réglage chargé auto." +msgstr "Charger le pré-réglage" #: src/audacious/ui_manager.c:443 -#, fuzzy msgid "Load auto-load preset" -msgstr "/Charger/le pré-réglage chargé auto." - -#: src/audacious/ui_manager.c:445 src/audacious/ui_manager.c:466 -#, fuzzy +msgstr "Charger le pré-réglage" + +#: src/audacious/ui_manager.c:445 +#: src/audacious/ui_manager.c:466 msgid "Default" -msgstr "Thème par défaut:" +msgstr "Défaut" #: src/audacious/ui_manager.c:446 -#, fuzzy msgid "Load default preset into equalizer" -msgstr "Sauver pré-réglages auto." +msgstr "Charger le preset par défaut dans l'équaliseur" #: src/audacious/ui_manager.c:448 -#, fuzzy msgid "Zero" -msgstr "stéréo" +msgstr "Zéro" #: src/audacious/ui_manager.c:449 -#, fuzzy msgid "Set equalizer preset levels to zero" -msgstr "Sauver pré-réglages de l'équaliseur" +msgstr "Preset de l'équaliseur au niveau zéro" #: src/audacious/ui_manager.c:451 -#, fuzzy msgid "From file" -msgstr "/Charger/à partir d'un fichier" +msgstr "/A partir du fichier" #: src/audacious/ui_manager.c:452 -#, fuzzy msgid "Load preset from file" -msgstr "Charger pré-réglages" +msgstr "Charger les preset à partir du fichier" #: src/audacious/ui_manager.c:454 -#, fuzzy msgid "From WinAMP EQF file" -msgstr "/Charger/à partir d'un fichier EQF de Winamp" +msgstr "A partir d'un fichier EQF de Winamp" #: src/audacious/ui_manager.c:455 -#, fuzzy msgid "Load preset from WinAMP EQF file" -msgstr "/Charger/à partir d'un fichier EQF de Winamp" +msgstr "Charger un preset à partir d'un fichier EQF de Winamp" #: src/audacious/ui_manager.c:457 -#, fuzzy msgid "WinAMP Presets" -msgstr "/Importer/les pré-réglages Winamp" +msgstr "Pré-réglages Winamp" #: src/audacious/ui_manager.c:458 -#, fuzzy msgid "Import WinAMP presets" -msgstr "/Importer/les pré-réglages Winamp" +msgstr "Importer les pré-réglages Winamp" #: src/audacious/ui_manager.c:461 msgid "Save preset" msgstr "Sauver pré-réglages" #: src/audacious/ui_manager.c:464 -#, fuzzy msgid "Save auto-load preset" -msgstr "/Sauver/le pré-réglage chargé auto." +msgstr "Sauver le pré-réglage" #: src/audacious/ui_manager.c:467 -#, fuzzy msgid "Save default preset" -msgstr "Sauver pré-réglages auto." +msgstr "Sauver pré-réglages auto" #: src/audacious/ui_manager.c:469 -#, fuzzy msgid "To file" -msgstr "Charger les fichiers" +msgstr "Vers le fichier" #: src/audacious/ui_manager.c:470 -#, fuzzy msgid "Save preset to file" -msgstr "Sauver pré-réglages" +msgstr "Sauver le preset vers le fichier" #: src/audacious/ui_manager.c:472 -#, fuzzy msgid "To WinAMP EQF file" -msgstr "/Sauver/dans un fichier EQF de Winamp" +msgstr "Vers un fichier EQF de Winamp" #: src/audacious/ui_manager.c:473 -#, fuzzy msgid "Save preset to WinAMP EQF file" -msgstr "/Sauver/dans un fichier EQF de Winamp" +msgstr "Sauver le preset vers un fichier EQF de Winamp" #: src/audacious/ui_manager.c:476 msgid "Delete preset" msgstr "Effacer pré-réglages" #: src/audacious/ui_manager.c:479 -#, fuzzy msgid "Delete auto-load preset" -msgstr "/Effacer/le pré-réglage chargé auto." - -#: src/audacious/ui_playlist.c:476 -#, fuzzy +msgstr "Effacer le pré-réglage chargé auto." + +#: src/audacious/ui_playlist.c:477 msgid "Search entries in active playlist" -msgstr "Montrer les séparateurs dans la liste d'écoute" - -#: src/audacious/ui_playlist.c:484 -msgid "" -"Select entries in playlist by filling one or more fields. Fields use regular " -"expressions syntax, case-insensitive. If you don't know how regular " -"expressions work, simply insert a literal portion of what you're searching " -"for." -msgstr "" - -#: src/audacious/ui_playlist.c:492 -#, fuzzy +msgstr "Chercher les entrées dans la playlist active" + +#: src/audacious/ui_playlist.c:485 +msgid "Select entries in playlist by filling one or more fields. Fields use regular expressions syntax, case-insensitive. If you don't know how regular expressions work, simply insert a literal portion of what you're searching for." +msgstr "Sélectionner les entrées dans la playlist en fichant un ou plusieurs champs. Les champs utilise des syntaxes d'expressions régulières, des cases insensitives. Si vous ne connaissez pas comment fonctionne des expressions régulières, insérer simplement une portion littérale de ce que vous cherchez." + +#: src/audacious/ui_playlist.c:493 msgid "Title: " -msgstr "Titre" - -#: src/audacious/ui_playlist.c:499 -#, fuzzy +msgstr "Titre:" + +#: src/audacious/ui_playlist.c:500 msgid "Album: " -msgstr "Album" - -#: src/audacious/ui_playlist.c:506 -#, fuzzy +msgstr "Album:" + +#: src/audacious/ui_playlist.c:507 msgid "Artist: " -msgstr "Artiste" - -#: src/audacious/ui_playlist.c:513 -#, fuzzy +msgstr "Artiste:" + +#: src/audacious/ui_playlist.c:514 msgid "Filename: " -msgstr "Nom du ficher:" - -#: src/audacious/ui_playlist.c:521 +msgstr "Nom du Fichier:" + +#: src/audacious/ui_playlist.c:522 msgid "Clear previous selection before searching" -msgstr "" - -#: src/audacious/ui_playlist.c:524 +msgstr "Effacer la précédente sélection avant de rechercher" + +#: src/audacious/ui_playlist.c:525 msgid "Automatically toggle queue for matching entries" msgstr "" -#: src/audacious/ui_playlist.c:527 +#: src/audacious/ui_playlist.c:528 msgid "Create a new playlist with matching entries" -msgstr "" - -#: src/audacious/ui_playlist.c:747 +msgstr "Créer une nouvelle playlist avec des entrées assorties" + +#: src/audacious/ui_playlist.c:748 #, c-format msgid "Error writing playlist \"%s\": %s" msgstr "Erreur à l'écriture de la liste \"%s\": %s" -#: src/audacious/ui_playlist.c:769 +#: src/audacious/ui_playlist.c:770 #, c-format msgid "%s already exist. Continue?" msgstr "%s existe déjà . Continuer ?" -#: src/audacious/ui_playlist.c:784 +#: src/audacious/ui_playlist.c:785 #, c-format msgid "" "<b><big>Unable to save playlist.</big></b>\n" @@ -2206,84 +2068,87 @@ "\n" "Type de fichier inconnu pour '%s'.\n" -#: src/audacious/ui_playlist.c:907 -#, fuzzy +#: src/audacious/ui_playlist.c:911 msgid "Save as Static Playlist" -msgstr "Sauver la Liste d'écoute" - -#: src/audacious/ui_playlist.c:914 +msgstr "Sauver comme liste d'écoute statique" + +#: src/audacious/ui_playlist.c:918 msgid "Use Relative Path" -msgstr "" - -#: src/audacious/ui_playlist.c:936 +msgstr "Utiliser un emplacement relatif" + +#: src/audacious/ui_playlist.c:940 msgid "Load Playlist" msgstr "Charger Liste d'écoute" -#: src/audacious/ui_playlist.c:949 +#: src/audacious/ui_playlist.c:953 msgid "Save Playlist" msgstr "Sauver la Liste d'écoute" -#: src/audacious/ui_playlist.c:1500 +#: src/audacious/ui_playlist.c:1508 msgid "Audacious Playlist Editor" msgstr "Éditeur de liste d'écoute" #: src/audacious/ui_playlist_manager.c:255 -#, fuzzy msgid "Playlist Manager" -msgstr "/Ne pas avancer dans la liste" +msgstr "/Gestionnaire de Playlist" #: src/audacious/ui_playlist_manager.c:294 msgid "Entries" -msgstr "" +msgstr "Entrées" #: src/audacious/ui_playlist_manager.c:306 -#, fuzzy msgid "_Rename" -msgstr "Nom du ficher" - -#: src/audacious/ui_preferences.c:111 +msgstr "_Renommer" + +#: src/audacious/ui_preferences.c:112 msgid "Audio" msgstr "Audio" -#: src/audacious/ui_preferences.c:112 +#: src/audacious/ui_preferences.c:113 msgid "Connectivity" msgstr "Proxy" -#: src/audacious/ui_preferences.c:125 +#: src/audacious/ui_preferences.c:126 msgid "Tracknumber" msgstr "Numéro de piste" -#: src/audacious/ui_preferences.c:128 -msgid "Filepath" -msgstr "Chemin du fichier" - #: src/audacious/ui_preferences.c:129 +msgid "Filepath" +msgstr "Chemin du fichier" + +#: src/audacious/ui_preferences.c:130 msgid "Date" msgstr "Date" -#: src/audacious/ui_preferences.c:131 +#: src/audacious/ui_preferences.c:132 msgid "Comment" msgstr "Commentaire" -#: src/audacious/ui_preferences.c:152 +#: src/audacious/ui_preferences.c:133 +msgid "Codec" +msgstr "Codec" + +#: src/audacious/ui_preferences.c:134 +msgid "Quality" +msgstr "Qualité" + +#: src/audacious/ui_preferences.c:155 msgid "localhost" msgstr "localhost" -#: src/audacious/ui_preferences.c:396 src/audacious/ui_preferences.c:483 -#: src/audacious/ui_preferences.c:572 src/audacious/ui_preferences.c:668 +#: src/audacious/ui_preferences.c:390 msgid "Enabled" msgstr "Actif" -#: src/audacious/ui_preferences.c:412 src/audacious/ui_preferences.c:499 -#: src/audacious/ui_preferences.c:588 src/audacious/ui_preferences.c:684 +#: src/audacious/ui_preferences.c:406 msgid "Description" msgstr "Description" -#: src/audacious/ui_preferences.c:1684 +#: src/audacious/ui_preferences.c:1382 msgid "Category" msgstr "Rubrique" -#: src/audacious/ui_preferences.c:2231 +#: src/audacious/ui_preferences.c:1929 msgid "Preferences Window" msgstr "Fenêtre des Préférences" @@ -2340,80 +2205,8 @@ msgstr "Skin Winamp 2.x non-archivé" #: src/audacious/ui_urlopener.c:88 -#, fuzzy msgid "Add/Open URL Dialog" -msgstr "Fenêtre d'Ajout/Ouverture de fichiers" - -#~ msgid "" -#~ "<b><big>No playable CD found.</big></b>\n" -#~ "\n" -#~ "No CD inserted, or inserted CD is not an audio CD.\n" -#~ msgstr "" -#~ "<b><big>Pas de CD jouable.</big></b>\n" -#~ "\n" -#~ "Pas de CD à lire, ou le CD inséré n'est pas un CD audio.\n" - -#, fuzzy -#~ msgid "Add CD..." -#~ msgstr "/Ajouter les pistes d'un CD..." - -#, fuzzy -#~ msgid "Play CD" -#~ msgstr "/Lecture du CD" - -#~ msgid "Performer/Artist" -#~ msgstr "Artiste" - -#~ msgid "File name" -#~ msgstr "Nom du fichier" - -#~ msgid "File path" -#~ msgstr "Chemin du fichier" - -#~ msgid "File extension" -#~ msgstr "Extension du fichier" - -#~ msgid "Track name" -#~ msgstr "Nom du morceau" - -#~ msgid "Track number" -#~ msgstr "Numéro de piste" - -#~ msgid "%{n:...%}: Display \"...\" only if element %n is present" -#~ msgstr "%{n:...%}: Affiche \"...\" si plus de %n éléments sont présents" - -#~ msgid "" -#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n" -#~ "Please use GTK+ %s or newer.\n" -#~ msgstr "" -#~ "Désolé, votre version de GTK+ (%d.%d.%d) ne fonctionne pas avec " -#~ "Audacious.\n" -#~ "Mettez à jour GTK+ vers la version %s ou plus.\n" - -#~ msgid "OPTIONS MENU" -#~ msgstr "MENU OPTIONS" - -#~ msgid "DISABLE ALWAYS ON TOP" -#~ msgstr "DESACTIVER TOUJOURS AU-DESSUS" - -#~ msgid "ENABLE ALWAYS ON TOP" -#~ msgstr "ACTIVER TOUJOURS AU-DESSUS" - -#~ msgid "FILE INFO BOX" -#~ msgstr "INFOS FICHIER" - -#~ msgid "DISABLE DOUBLESIZE" -#~ msgstr "DESACTIVER DOUBLE-TAILLE" - -#~ msgid "ENABLE DOUBLESIZE" -#~ msgstr "ACTIVER DOUBLE-TAILLE" - -#~ msgid "VISUALIZATION MENU" -#~ msgstr "MENU DES EFFETS VISUELS" - -#, fuzzy -#~ msgid "Track name: " -#~ msgstr "Nom du morceau" +msgstr "Ajouter / Ouvrir un URL" #~ msgid "" #~ "<b><big>Unable to play files.</big></b>\n" @@ -2427,13 +2220,17 @@ #~ "Les fichiers suivants ne peuvent être lus. Veuillez vérifier que:\n" #~ "1. ils sont accessibles.\n" #~ "2. vous avez activé le greffon pour le média correspondant." - #~ msgid "Don't show this warning anymore" #~ msgstr "Ne plus afficher cet avertissement" - #~ msgid "Show more _details" #~ msgstr "Afficher plus de _détails" - +#~ msgid "" +#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n" +#~ "Please use GTK+ %s or newer.\n" +#~ msgstr "" +#~ "Désolé, votre version de GTK+ (%d.%d.%d) ne fonctionne pas avec " +#~ "Audacious.\n" +#~ "Mettez à jour GTK+ vers la version %s ou plus.\n" #~ msgid "" #~ "\n" #~ "Received SIGSEGV\n" @@ -2449,43 +2246,76 @@ #~ "comment \n" #~ "c'est arrivé, envoyez un mail (en anglais) expliquant clairement vos " #~ "manipulations à http://bugs-meta.atheme.org/\n" - +#~ msgid "OPTIONS MENU" +#~ msgstr "MENU OPTIONS" +#~ msgid "DISABLE ALWAYS ON TOP" +#~ msgstr "DESACTIVER TOUJOURS AU-DESSUS" +#~ msgid "ENABLE ALWAYS ON TOP" +#~ msgstr "ACTIVER TOUJOURS AU-DESSUS" +#~ msgid "FILE INFO BOX" +#~ msgstr "INFOS FICHIER" +#~ msgid "DISABLE DOUBLESIZE" +#~ msgstr "DESACTIVER DOUBLE-TAILLE" +#~ msgid "ENABLE DOUBLESIZE" +#~ msgstr "ACTIVER DOUBLE-TAILLE" +#~ msgid "VISUALIZATION MENU" +#~ msgstr "MENU DES EFFETS VISUELS" +#~ msgid "" +#~ "<b><big>No playable CD found.</big></b>\n" +#~ "\n" +#~ "No CD inserted, or inserted CD is not an audio CD.\n" +#~ msgstr "" +#~ "<b><big>Pas de CD jouable.</big></b>\n" +#~ "\n" +#~ "Pas de CD à lire, ou le CD inséré n'est pas un CD audio.\n" +#~ msgid "Play CD" +#~ msgstr "Lecture du CD" +#~ msgid "Add CD..." +#~ msgstr "Ajouter un CD..." +#~ msgid "Adds a CD to the playlist." +#~ msgstr "Ajouter un CD à la playlist." +#~ msgid "Track name: " +#~ msgstr "Nom du Morceau:" +#~ msgid "Album name: " +#~ msgstr "Nom Album:" +#~ msgid "Performer/Artist" +#~ msgstr "Artiste" +#~ msgid "File name" +#~ msgstr "Nom du fichier" +#~ msgid "File path" +#~ msgstr "Chemin du fichier" +#~ msgid "File extension" +#~ msgstr "Extension du fichier" +#~ msgid "Track name" +#~ msgstr "Nom du morceau" +#~ msgid "Track number" +#~ msgstr "Numéro de piste" +#~ msgid "%{n:...%}: Display \"...\" only if element %n is present" +#~ msgstr "%{n:...%}: Affiche \"...\" si plus de %n éléments sont présents" #~ msgid "Enable playlist transparency" #~ msgstr "Activer la transparence de la liste d'écoute" - #~ msgid "%s: option `%s' is ambiguous\n" #~ msgstr "%s: l'option '%s' est ambigüe\n" - #~ msgid "%s: option `--%s' doesn't allow an argument\n" #~ msgstr "%s l'option '--%s' n'accepte pas de paramètre\n" - #~ msgid "%s: option `%c%s' doesn't allow an argument\n" #~ msgstr "%s: l'option '%c%s' n'accepte pas de paramètre\n" - #~ msgid "%s: option `%s' requires an argument\n" #~ msgstr "%s: l'option '%s' nécessite un paramètre\n" - #~ msgid "%s: unrecognized option `--%s'\n" #~ msgstr "%s: option '--%s' inconnue\n" - #~ msgid "%s: unrecognized option `%c%s'\n" #~ msgstr "%s: option '%c%s' inconnue\n" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: option interdite -- %c\n" - #~ msgid "%s: invalid option -- %c\n" #~ msgstr "%s: option incorrecte -- %c\n" - #~ msgid "%s: option requires an argument -- %c\n" #~ msgstr "%s: option nécessitant un paramètre -- %c\n" - #~ msgid "%s: option `-W %s' is ambiguous\n" #~ msgstr "%s: l'option `-W %s' est ambigüe\n" - #~ msgid "%s: option `-W %s' doesn't allow an argument\n" #~ msgstr "%s: l'option '-W %s' n'accepte pas de paramètre\n" - #~ msgid "" #~ "Usage: audacious [options] [files] ...\n" #~ "\n" @@ -2496,135 +2326,94 @@ #~ "\n" #~ "Options:\n" #~ "--------\n" - #~ msgid "Display this text and exit" #~ msgstr "Affiche ce message et quitte" - #~ msgid "Activate Audacious" #~ msgstr "Activer Audacious" - #~ msgid "Previous session ID" #~ msgstr "ID de la session précédente" - #~ msgid "Disable error/warning interception (logging)" #~ msgstr "Désactiver les logs d'erreurs/mises en garde" - #~ msgid "Print version number and exit\n" #~ msgstr "Affiche le numéro de version et quitte\n" - #~ msgid "Add/Open Files dialog" #~ msgstr "Fenêtre d'Ajout/Ouverture de fichiers" - #~ msgid "Close Dialog on Add" #~ msgstr "Fermer la fenêtre après l'ajout" - #~ msgid "Deselect All" #~ msgstr "Aucun" - #~ msgid "Track Information Popup" #~ msgstr "Popup d'information de la piste" - #~ msgid "Artist Popup" #~ msgstr "Fenêtre Artiste" - #~ msgid "<i>Genre</i>" #~ msgstr "<i>Genre</i>" - #~ msgid "<i>Year</i>" #~ msgstr "<i>Année</i>" - #~ msgid "<i>Track Number</i>" #~ msgstr "<i>Numéro de piste</i>" - #~ msgid "<i>Track Length</i>" #~ msgstr "<i>Durée du Morceau</i>" - #~ msgid "label65" #~ msgstr "label65" - #~ msgid "label76" #~ msgstr "label76" - #~ msgid "/View Track Details" #~ msgstr "/Afficher le détail" - #~ msgid "/Visualization Mode/Analyzer" #~ msgstr "/Type de graphique/Analyseur" - #~ msgid "/Visualization Mode/Scope" #~ msgstr "/Type de graphique/Scope" #, fuzzy #~ msgid "/Visualization Mode/Voiceprint" #~ msgstr "/Type de graphique/Scope" - #~ msgid "/Visualization Mode/Off" #~ msgstr "/Type de graphique/Aucun" - #~ msgid "/Analyzer Mode/Normal" #~ msgstr "/Type Analyseur/Normal" - #~ msgid "/Analyzer Mode/Lines" #~ msgstr "/Type Analyseur/Lignes" - #~ msgid "/Analyzer Mode/Bars" #~ msgstr "/Type Analyseur/Barres" - #~ msgid "/Analyzer Mode/Peaks" #~ msgstr "/Type Analyseur/Crêtes" #, fuzzy #~ msgid "/Voiceprint mode/Normal" #~ msgstr "/Type Analyseur/Normal" - #~ msgid "/WindowShade VU Mode/Normal" #~ msgstr "/Mode Fenêtre Réduite/Normale" - #~ msgid "/WindowShade VU Mode/Smooth" #~ msgstr "/Mode Fenêtre Réduite/Lissée" - #~ msgid "/Analyzer Falloff/Slowest" #~ msgstr "/Effet Retombée Analyseur/Le plus lent" - #~ msgid "/Analyzer Falloff/Slow" #~ msgstr "/Effet Retombée Analyseur/Lent" - #~ msgid "/Analyzer Falloff/Medium" #~ msgstr "/Effet Retombée Analyseur/Moyen" - #~ msgid "/Analyzer Falloff/Fast" #~ msgstr "/Effet Retombée Analyseur/Rapide" - #~ msgid "/Analyzer Falloff/Fastest" #~ msgstr "/Effet Retombée Analyseur/Le plus rapide" - #~ msgid "/Peaks Falloff/Slowest" #~ msgstr "/Effet Retombée Crêtes/Le plus lent" - #~ msgid "/Peaks Falloff/Slow" #~ msgstr "/Effet Retombée Crêtes/Lent" - #~ msgid "/Peaks Falloff/Medium" #~ msgstr "/Effet Retombée Crêtes/Moyen" - #~ msgid "/Peaks Falloff/Fast" #~ msgstr "/Effet Retombée Crêtes/Rapide" - #~ msgid "/Peaks Falloff/Fastest" #~ msgstr "/Effet Retombée Crêtes/Le plus rapide" - #~ msgid "/-" #~ msgstr "/-" - #~ msgid "/Jump to Time" #~ msgstr "/Aller au Temps" - #~ msgid "/About Audacious" #~ msgstr "/A Propos d'Audacious" - #~ msgid "/Files..." #~ msgstr "/Fichiers..." - #~ msgid "/Internet location..." #~ msgstr "/Adresse Internet..." @@ -2639,75 +2428,53 @@ #, fuzzy #~ msgid "Displays track information." #~ msgstr "Information de la Piste" - #~ msgid "Chinese:" #~ msgstr "Chinois:" - #~ msgid "/Load/Preset" #~ msgstr "/Charger/un pré-réglage" - #~ msgid "/Load/Default" #~ msgstr "/Charger/le pré-réglage par défaut" - #~ msgid "/Load/Zero" #~ msgstr "/Charger/remise à zéro" - #~ msgid "/Save/Preset" #~ msgstr "/Sauver/le pré-réglage" - #~ msgid "/Save/Default" #~ msgstr "/Sauver/le pré-réglage par défaut" - #~ msgid "/Save/To file" #~ msgstr "/Sauver/dans un fichier" - #~ msgid "/Delete/Preset" #~ msgstr "/Effacer/le pré-réglage" - #~ msgid "Load auto-preset" #~ msgstr "Charger pré-réglages auto." - #~ msgid "Load equalizer preset" #~ msgstr "Charger pré-réglages de l'équaliseur" - #~ msgid "Delete auto-preset" #~ msgstr "Effacer pré-réglages auto." - #~ msgid "/Show Popup Info" #~ msgstr "/Montrer les infos Popup" - #~ msgid "/Remove Duplicates/By Title" #~ msgstr "/Enlever les fichiers dupliqués/Par Titre" - #~ msgid "/Remove Duplicates/By Filename" #~ msgstr "/Enlever les fichiers dupliqués/Par Nom de Fichier" - #~ msgid "/Update View" #~ msgstr "/Rafraîchir la Liste" - #~ msgid "/Select All" #~ msgstr "/Sélectionner tout" - #~ msgid "/Sort List/By Date" #~ msgstr "/Trier la liste/Par Date" - #~ msgid "/Sort Selection/By Title" #~ msgstr "/Trier la sélection/Par Titre" - #~ msgid "/Sort Selection/By Artist" #~ msgstr "/Trier la Sélection/Par Artiste" - #~ msgid "/Sort Selection/By Filename" #~ msgstr "/Trier la sélection/Par Nom de Fichier" - #~ msgid "/Sort Selection/By Path + Filename" #~ msgstr "/Trier la sélection/Par Chemin + Nom de Fichier" - #~ msgid "/Sort Selection/By Date" #~ msgstr "/Trier la sélection/Par Date" - #~ msgid "/Sort Selection/By Track Number" #~ msgstr "/Trier la Sélection/Par Numéro de Piste" - #~ msgid "/Sort Selection/By Playlist Entry" #~ msgstr "/Trier la Sélection/Par Entrée de Liste d'écoute" + +
--- a/skins/Classic/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/Classic - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/Classic/pledit.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#a6c1df -Current=#eeeeee -NormalBG=#000000 -SelectedBG=#666666 -Font=Helvetica
--- a/skins/Classic/skin-classic.hints Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -[skin] -skinDescription=The default skin for Audacious. (Classic variant) -mainwinOthertext=1
--- a/skins/Classic/skin.hints Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -[skin] -skinDescription=The default skin for Audacious. -mainwinOthertext=1 -mainwinOthertextVisible=1 -mainwinTextVisible=1 -mainwinVisVisible=1 -mainwinMenurowVisible=1
--- a/skins/Classic/viscolor.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -0,0,0 // [background color 1] -0,0,0 // [background color 2] -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -126,126,126 // [osc 1] -126,126,126 // [osc 2] -126,126,126 // [osc 3] -126,126,126 // [osc 4] -126,126,126 // [osc 5] -130,130,131 // [peak color]
--- a/skins/Default/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/Default - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/Default/pledit.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#a6c1df -Current=#eeeeee -NormalBG=#000000 -SelectedBG=#666666 -Font=Helvetica
--- a/skins/Default/skin-classic.hints Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -[skin] -skinDescription=The default skin for Audacious. (Classic variant) -mainwinOthertext=1
--- a/skins/Default/skin.hints Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -[skin] -skinDescription=The default skin for Audacious. -mainwinOthertext=1 -mainwinVisX=19 -mainwinVisY=39 -mainwinTextX=19 -mainwinTextY=26 -mainwinTextWidth=246 -mainwinInfobarX=111 -mainwinInfobarY=42 -mainwinNumber0X=30 -mainwinNumber0Y=56 -mainwinNumber1X=42 -mainwinNumber1Y=56 -mainwinNumber2X=54 -mainwinNumber2Y=56 -mainwinNumber3X=72 -mainwinNumber3Y=56 -mainwinNumber4X=84 -mainwinNumber4Y=56 -mainwinPlayStatusX=19 -mainwinPlayStatusY=58 -mainwinMenurowVisible=1 -mainwinOthertextIsStatus=1 -mainwinOthertextVisible=1 -mainwinTextVisible=1 -mainwinVisVisible=1 -
--- a/skins/Default/viscolor.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -0,0,0 // [background color 1] -0,0,0 // [background color 2] -9,13,15 -19,26,31 -29,39,47 -39,52,63 -49,65,79 -59,78,95 -69,91,111 -79,105,127 -88,118,143 -98,131,159 -108,144,175 -118,157,191 -128,170,207 -138,183,223 -148,196,239 -158,210,255 -240,240,240 // [osc 1] -220,220,220 // [osc 2] -170,170,170 // [osc 3] -100,100,100 // [osc 4] -20,20,20 // [osc 5] -200,200,220 // [peak color]
--- a/skins/Ivory/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/Ivory - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/Ivory/pledit.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#325e84 -Current=#111111 -NormalBG=#FFFFFF -SelectedBG=#999999 -Font=Helvetica
--- a/skins/Ivory/skin.hints Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -[skin] -skinDescription=Ivory -mainwinOthertext=1 -mainwinVisX=335 -mainwinVisY=53 -mainwinTextX=93 -mainwinTextY=42 -mainwinTextWidth=319 -mainwinInfobarX=173 -mainwinInfobarY=64 -mainwinNumber0X=105 -mainwinNumber0Y=57 -mainwinNumber1X=117 -mainwinNumber1Y=57 -mainwinNumber2X=129 -mainwinNumber2Y=57 -mainwinNumber3X=147 -mainwinNumber3Y=57 -mainwinNumber4X=159 -mainwinNumber4Y=57 -mainwinPlayStatusX=93 -mainwinPlayStatusY=60 -mainwinOthertextIsStatus=1 -mainwinVolumeX=126 -mainwinVolumeY=22 -mainwinBalanceX=200 -mainwinBalanceY=22 -mainwinPositionX=130 -mainwinPositionY=80 -mainwinTextVisible=1 -mainwinOthertextVisible=1 -mainwinVisVisible=1 -mainwinMenurowVisible=0 -mainwinWidth=425 -mainwinHeight=100 -mainwinPreviousX=5 -mainwinPreviousY=48 -mainwinPlayX=33 -mainwinPlayY=48 -mainwinPauseX=33 -mainwinPauseY=70 -mainwinStopX=33 -mainwinStopY=26 -mainwinNextX=61 -mainwinNextY=48 -mainwinEjectX=390 -mainwinEjectY=77 -mainwinEQButtonX=249 -mainwinEQButtonY=22 -mainwinPLButtonX=272 -mainwinPLButtonY=22 -mainwinShuffleX=355 -mainwinShuffleY=20 -mainwinRepeatX=400 -mainwinRepeatY=20 -mainwinAboutX=999 -mainwinAboutY=999 -mainwinMinimizeX=393 -mainwinMinimizeY=3 -mainwinShadeX=403 -mainwinShadeY=3 -mainwinCloseX=413 -mainwinCloseY=3 -
--- a/skins/Ivory/viscolor.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -255,255,255 // [background color 1] -255,255,255 // [background color 2] -255,255,255 -240,242,244 -226,230,234 -212,218,223 -198,205,213 -184,193,203 -170,181,192 -156,168,182 -142,156,172 -128,144,161 -114,131,151 -100,119,140 -86,107,130 -72,94,120 -58,82,109 -44,70,99 -30,58,89 -129,129,129 // [osc 1] -150,150,150 // [osc 2] -170,170,170 // [osc 3] -200,200,200 // [osc 4] -240,240,240 // [osc 5] -125,125,124 // [peak color]
--- a/skins/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -include ../buildsys.mk - -SUBDIRS = Default Classic TinyPlayer Osmosis Ivory -
--- a/skins/Osmosis/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/Osmosis - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/Osmosis/pledit.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#a6c1df -Current=#eeeeee -NormalBG=#000000 -SelectedBG=#666666 -Font=Helvetica
--- a/skins/Osmosis/skin.hints Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -[skin] -skinDescription=Osmosis -mainwinOthertext=1 -mainwinVisX=335 -mainwinVisY=53 -mainwinTextX=93 -mainwinTextY=42 -mainwinTextWidth=319 -mainwinInfobarX=173 -mainwinInfobarY=64 -mainwinNumber0X=105 -mainwinNumber0Y=57 -mainwinNumber1X=117 -mainwinNumber1Y=57 -mainwinNumber2X=129 -mainwinNumber2Y=57 -mainwinNumber3X=147 -mainwinNumber3Y=57 -mainwinNumber4X=159 -mainwinNumber4Y=57 -mainwinPlayStatusX=93 -mainwinPlayStatusY=60 -mainwinOthertextIsStatus=1 -mainwinVolumeX=126 -mainwinVolumeY=22 -mainwinBalanceX=200 -mainwinBalanceY=22 -mainwinPositionX=130 -mainwinPositionY=80 -mainwinTextVisible=1 -mainwinOthertextVisible=1 -mainwinVisVisible=1 -mainwinMenurowVisible=0 -mainwinWidth=425 -mainwinHeight=100 -mainwinPreviousX=5 -mainwinPreviousY=48 -mainwinPlayX=33 -mainwinPlayY=48 -mainwinPauseX=33 -mainwinPauseY=70 -mainwinStopX=33 -mainwinStopY=26 -mainwinNextX=61 -mainwinNextY=48 -mainwinEjectX=390 -mainwinEjectY=77 -mainwinEQButtonX=249 -mainwinEQButtonY=22 -mainwinPLButtonX=272 -mainwinPLButtonY=22 -mainwinShuffleX=355 -mainwinShuffleY=20 -mainwinRepeatX=400 -mainwinRepeatY=20 -mainwinAboutX=999 -mainwinAboutY=999 -mainwinMinimizeX=393 -mainwinMinimizeY=3 -mainwinShadeX=403 -mainwinShadeY=3 -mainwinCloseX=413 -mainwinCloseY=3 -
--- a/skins/Osmosis/viscolor.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -0,0,0 // [background color 1] -0,0,0 // [background color 2] -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -126,126,126 // [osc 1] -126,126,126 // [osc 2] -126,126,126 // [osc 3] -126,126,126 // [osc 4] -126,126,126 // [osc 5] -130,130,131 // [peak color]
--- a/skins/TinyPlayer/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/TinyPlayer - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/TinyPlayer/pledit.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#a6c1df -Current=#eeeeee -NormalBG=#000000 -SelectedBG=#666666 -Font=Helvetica
--- a/skins/TinyPlayer/skin.hints Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -[skin] -skinDescription=TinyPlayer skin -mainwinOthertext=1 -mainwinVisX=189 -mainwinVisY=36 -mainwinTextX=1 -mainwinTextY=80 -mainwinTextWidth=273 -mainwinInfobarX=0 -mainwinInfobarY=0 -mainwinNumber0X=30 -mainwinNumber0Y=19 -mainwinNumber1X=42 -mainwinNumber1Y=19 -mainwinNumber2X=54 -mainwinNumber2Y=19 -mainwinNumber3X=72 -mainwinNumber3Y=19 -mainwinNumber4X=84 -mainwinNumber4Y=19 -mainwinPlayStatusX=11 -mainwinPlayStatusY=22 -mainwinOthertextIsStatus=0 -mainwinVolumeX=106 -mainwinVolumeY=22 -mainwinBalanceX=180 -mainwinBalanceY=22 -mainwinPositionX=16 -mainwinPositionY=36 -mainwinTextVisible=1 -mainwinOthertextVisible=0 -mainwinVisVisible=0 -mainwinMenurowVisible=0 -mainwinWidth=275 -mainwinHeight=87 -mainwinPreviousX=16 -mainwinPreviousY=53 -mainwinPlayX=39 -mainwinPlayY=53 -mainwinPauseX=62 -mainwinPauseY=53 -mainwinStopX=85 -mainwinStopY=53 -mainwinNextX=108 -mainwinNextY=53 -mainwinEjectX=136 -mainwinEjectY=53 -mainwinEQButtonX=219 -mainwinEQButtonY=22 -mainwinPLButtonX=242 -mainwinPLButtonY=22 -mainwinShuffleX=164 -mainwinShuffleY=56 -mainwinRepeatX=210 -mainwinRepeatY=56 -mainwinAboutX=247 -mainwinAboutY=53
--- a/skins/TinyPlayer/viscolor.txt Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -0,0,0 // [background color 1] -0,0,0 // [background color 2] -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -126,126,126 // [osc 1] -126,126,126 // [osc 2] -126,126,126 // [osc 3] -126,126,126 // [osc 4] -126,126,126 // [osc 5] -130,130,131 // [peak color]
--- a/src/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ b/src/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -1,14 +1,9 @@ -.SILENT: +SUBDIRS = libguess audacious libid3tag include ../extra.mk -SUBDIRS = libguess - ifdef USE_DBUS -SUBDIRS += libaudclient audtool +SUBDIRS := libaudclient audtool $(SUBDIRS) endif -SUBDIRS += audacious libid3tag - include ../buildsys.mk -
--- a/src/audacious/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -1,172 +1,198 @@ include ../../extra.mk -SUBDIRS = $(INTL_OBJECTIVE) glade images ui +SUBDIRS = ${INTL_OBJECTIVE} PROG = audacious - -LDFLAGS += $(AUDLDFLAGS) - -INCLUDES = \ - auddrct.h \ - configdb.h \ - custom_uri.h \ - dbus.h \ - discovery.h \ - dbus-service.h \ - eventqueue.h \ - flow.h \ - formatter.h \ - rcfile.h \ - i18n.h \ - input.h \ - hook.h \ - main.h \ - mime.h \ - output.h \ - playback.h \ - playlist.h \ - playlist_container.h \ - plugin.h \ - strings.h \ - tuple.h \ - tuple_formatter.h \ - tuple_compiler.h \ - ui_fileinfopopup.h \ - ui_lastfm.h\ - ui_plugin_menu.h \ - ui_preferences.h \ - util.h \ - vfs.h \ - vfs_buffer.h \ - vfs_buffered_file.h \ - xconvert.h - -SRCS = \ - auddrct.c \ - build_stamp.c \ - configdb.c \ - custom_uri.c \ - discovery.c \ - dnd.c \ - dock.c \ - effect.c \ - eventqueue.c \ - fft.c \ - flow.c \ - formatter.c \ - general.c \ - glade.c \ - hints.c \ - hook.c \ - iir.c \ - iir_cfs.c \ - iir_fpu.c \ - input.c \ - logger.c \ - main.c \ - memorypool.c \ - mime.c \ - output.c \ - pixbuf_effects.c \ - playback.c \ - playback_evlisteners.c \ - playlist.c \ - playlist_container.c \ - playlist_evlisteners.c \ - pluginenum.c \ - rcfile.c \ - signals.c \ - strings.c \ - tuple.c \ - tuple_formatter.c \ - tuple_compiler.c \ - skin.c \ - ui_about.c \ - ui_albumart.c \ - ui_credits.c \ - ui_equalizer.c \ - ui_fileinfo.c \ - ui_fileinfopopup.c \ - ui_fileopener.c \ - ui_jumptotrack.c \ - ui_lastfm.c\ - ui_main.c \ - ui_main_evlisteners.c \ - ui_manager.c \ - ui_playlist.c \ - ui_playlist_manager.c \ - ui_preferences.c \ - ui_skinned_cursor.c \ - ui_skinned_window.c \ - ui_skinned_button.c \ - ui_skinned_textbox.c \ - ui_skinned_number.c \ - ui_skinned_horizontal_slider.c \ - ui_vis.c \ - ui_svis.c \ - ui_skinned_menurow.c \ - ui_skinned_playstatus.c \ - ui_skinned_monostereo.c \ - ui_skinned_equalizer_slider.c \ - ui_skinned_equalizer_graph.c \ - ui_skinned_playlist_slider.c \ - ui_skinned_playlist.c \ - ui_skinselector.c \ - ui_urlopener.c \ - util.c \ - vfs.c \ - vfs_buffer.c \ - vfs_buffered_file.c \ - vfs_common.c \ - visualization.c \ - volumecontrol.c \ - sync-menu.c \ - xconvert.c +SRCS = auddrct.c \ + build_stamp.c \ + configdb.c \ + custom_uri.c \ + discovery.c \ + dnd.c \ + dock.c \ + effect.c \ + eventqueue.c \ + fft.c \ + flow.c \ + formatter.c \ + general.c \ + glade.c \ + hints.c \ + hook.c \ + iir.c \ + iir_cfs.c \ + iir_fpu.c \ + input.c \ + logger.c \ + main.c \ + memorypool.c \ + mime.c \ + output.c \ + pixbuf_effects.c \ + playback.c \ + playback_evlisteners.c \ + playlist.c \ + playlist_container.c \ + playlist_evlisteners.c \ + pluginenum.c \ + rcfile.c \ + signals.c \ + strings.c \ + tuple.c \ + tuple_formatter.c \ + tuple_compiler.c \ + skin.c \ + ui_about.c \ + ui_albumart.c \ + ui_credits.c \ + ui_equalizer.c \ + ui_fileinfo.c \ + ui_fileinfopopup.c \ + ui_fileopener.c \ + ui_jumptotrack.c \ + ui_main.c \ + ui_main_evlisteners.c \ + ui_manager.c \ + ui_playlist.c \ + ui_playlist_manager.c \ + ui_preferences.c \ + ui_skinned_cursor.c \ + ui_skinned_window.c \ + ui_skinned_button.c \ + ui_skinned_textbox.c \ + ui_skinned_number.c \ + ui_skinned_horizontal_slider.c \ + ui_vis.c \ + ui_svis.c \ + ui_skinned_menurow.c \ + ui_skinned_playstatus.c \ + ui_skinned_monostereo.c \ + ui_skinned_equalizer_slider.c \ + ui_skinned_equalizer_graph.c \ + ui_skinned_playlist_slider.c \ + ui_skinned_playlist.c \ + ui_skinselector.c \ + ui_urlopener.c \ + util.c \ + vfs.c \ + vfs_buffer.c \ + vfs_buffered_file.c \ + vfs_common.c \ + visualization.c \ + volumecontrol.c \ + sync-menu.c \ + xconvert.c ifdef USE_DBUS SRCS += dbus.c endif -LIBDEP = ../libguess/libguess.a +INCLUDES = auddrct.h \ + configdb.h \ + custom_uri.h \ + dbus.h \ + discovery.h \ + dbus-service.h \ + eventqueue.h \ + flow.h \ + formatter.h \ + rcfile.h \ + i18n.h \ + input.h \ + hook.h \ + main.h \ + mime.h \ + output.h \ + playback.h \ + playlist.h \ + playlist_container.h \ + plugin.h \ + strings.h \ + tuple.h \ + tuple_formatter.h \ + tuple_compiler.h \ + ui_fileinfopopup.h \ + ui_plugin_menu.h \ + ui_preferences.h \ + util.h \ + vfs.h \ + vfs_buffer.h \ + vfs_buffered_file.h \ + xconvert.h + +DATA = glade/fileinfo.glade \ + glade/prefswin.glade \ + images/about-logo.png \ + images/appearance.png \ + images/audacious_eq.xpm \ + images/audacious_player.xpm \ + images/audacious_playlist.xpm \ + images/audio.png \ + images/connectivity.png \ + images/eq.png \ + images/info.png \ + images/menu_invert_playlist.png \ + images/menu_queue_toggle.png \ + images/menu_randomize_playlist.png \ + images/menu_remove_dups.png \ + images/menu_remove_unavail.png \ + images/menu_select_all.png \ + images/menu_select_invert.png \ + images/menu_select_none.png \ + images/menu_sort_artist.png \ + images/menu_sort_filename.png \ + images/menu_sort_pathfile.png \ + images/menu_sort_title.png \ + images/mouse.png \ + images/pl.png \ + images/play.png \ + images/playlist.png \ + images/plugins.png \ + ui/equalizer.ui \ + ui/mainwin.ui \ + ui/playlist.ui \ + ui/carbon-menubar.ui + +CLEAN = build_stamp.c + +LIB_DEPS += ../libguess/libguess.a include ../../buildsys.mk -LIBADD += $(LDADD) +LDFLAGS += ${EXPORTDYN} +LIBS += ${LDADD} -ifdef USE_DBUS +ifdef USE_DBUS CPPFLAGS += -I../libaudclient DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h LIBS += -L../libaudclient -laudclient endif -LDFLAGS += ${EXPORTDYN} - -depend-hook: $(DBUS_BINDINGS) +pre-depend: ${DBUS_BINDINGS} -CPPFLAGS += -DHAVE_CONFIG_H \ - $(MOWGLI_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(BEEP_DEFINES) \ - $(ARCH_DEFINES) \ - $(DBUS_CFLAGS) \ - $(samplerate_CFLAGS) \ - $(REGEX_CFLAGS) \ - $(LIBMCS_CFLAGS) \ - -D_AUDACIOUS_CORE \ - -I.. -I../.. \ - -I./intl +CPPFLAGS += -DHAVE_CONFIG_H \ + ${MOWGLI_CFLAGS} \ + ${GTK_CFLAGS} \ + ${LIBGLADE_CFLAGS} \ + ${BEEP_DEFINES} \ + ${ARCH_DEFINES} \ + ${DBUS_CFLAGS} \ + ${samplerate_CFLAGS} \ + ${REGEX_CFLAGS} \ + ${LIBMCS_CFLAGS} \ + -D_AUDACIOUS_CORE \ + -I.. -I../.. \ + -I./intl -LIBS += \ - $(LIBINTL) \ - $(samplerate_LIBS) \ - ../libguess/libguess.a \ - $(GTK_LIBS) \ - $(DBUS_LIBS) \ - $(MOWGLI_LIBS) \ - $(LIBMCS_LIBS) \ - $(LIBGLADE_LIBS) \ - $(REGEX_LIBS) +LIBS += ${LIBINTL} \ + ${samplerate_LIBS} \ + ../libguess/libguess.a \ + ${GTK_LIBS} \ + ${DBUS_LIBS} \ + ${MOWGLI_LIBS} \ + ${LIBMCS_LIBS} \ + ${LIBGLADE_LIBS} \ + ${REGEX_LIBS} build_stamp.c: if [ -d ../../.hg ]; then \ @@ -174,28 +200,21 @@ [ -z "$$revh" ] || echo "$$revh" > build_stamp.c; \ fi -clean-hook: - if [ -d ../../.hg ]; then \ - rm -f build_stamp.c; \ - fi - -DBUS_BINDINGS_SOURCES = \ - objects.xml \ - mpris_root.xml \ - mpris_tracklist.xml \ - mpris_player.xml +DBUS_BINDINGS_SOURCES = objects.xml \ + mpris_root.xml \ + mpris_tracklist.xml \ + mpris_player.xml desktop_DATA = audacious.desktop -desktopdir = $(datadir)/applications +desktopdir = ${datadir}/applicationu -dbus-server-bindings.h: $(DBUS_BINDINGS_SOURCES) - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=audacious_rc objects.xml > $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@ +dbus-server-bindings.h: ${DBUS_BINDINGS_SOURCES} + ${DBUS_BINDING_TOOL} --mode=glib-server --prefix=audacious_rc objects.xml > $@ + ${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@ + ${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@ + ${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@ -dbus-client-bindings.h: $(DBUS_BINDINGS_SOURCES) - $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=audacious_rc objects.xml > $@ +dbus-client-bindings.h: ${DBUS_BINDINGS_SOURCES} + ${DBUS_BINDING_TOOL} --mode=glib-client --prefix=audacious_rc objects.xml > $@ -OBJECTIVE_DATA = audacious.desktop:$(datadir)/applications - +OBJECTIVE_DATA = audacious.desktop:${datadir}/applications
--- a/src/audacious/actions-mainwin.h Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/actions-mainwin.h Mon Sep 24 15:18:04 2007 +0300 @@ -73,5 +73,4 @@ void action_preferences(void); void action_quit(void); void action_current_track_info(void); -void action_lastfm(void); #endif
--- a/src/audacious/glade/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../../../buildsys.mk - -gladexmldir = $(pkgdatadir)/glade - -install-extra: - y="fileinfo.glade prefswin.glade"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${gladexmldir} && ${INSTALL} -m 644 $$i ${DESTDIR}${gladexmldir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="fileinfo.glade prefswin.glade"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${gladexmldir}/$$i ]; then \ - if rm -f ${DESTDIR}${gladexmldir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done; -
--- a/src/audacious/images/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../../../buildsys.mk - -imagesdir = $(pkgdatadir)/images - -install-extra: - y="*.png *.xpm"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${imagesdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${imagesdir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.xpm"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${imagesdir}/$$i ]; then \ - if rm -f ${DESTDIR}${imagesdir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done; -
--- a/src/audacious/intl/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/intl/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -1,42 +1,40 @@ -SRCS = \ - bindtextdom.c \ - dcgettext.c \ - dgettext.c \ - gettext.c \ - finddomain.c \ - loadmsgcat.c \ - localealias.c \ - textdomain.c \ - l10nflist.c \ - explodename.c \ - dcigettext.c \ - dcngettext.c \ - dngettext.c \ - ngettext.c \ - plural.c \ - plural-exp.c \ - localcharset.c \ - relocatable.c \ - localename.c \ - log.c \ - osdep.c \ - os2compat.c \ - intl-compat.c - STATIC_LIB_NOINST = libintl.a +SRCS = bindtextdom.c \ + dcgettext.c \ + dgettext.c \ + gettext.c \ + finddomain.c \ + loadmsgcat.c \ + localealias.c \ + textdomain.c \ + l10nflist.c \ + explodename.c \ + dcigettext.c \ + dcngettext.c \ + dngettext.c \ + ngettext.c \ + plural.c \ + plural-exp.c \ + localcharset.c \ + relocatable.c \ + localename.c \ + log.c \ + osdep.c \ + os2compat.c \ + intl-compat.c include ../../../buildsys.mk include ../../../extra.mk -localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/intl -aliaspath = $(localedir) +localedir = ${datadir)}locale +gettextsrcdir = ${datadir}/gettext/intl +aliaspath = ${localedir} -DEFS += -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ - -DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \ - -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DINSTALLPREFIX=\"$(libdir)\" -DNO_XMALLOC \ +DEFS += -DLOCALEDIR=\"${localedir}\" -DLOCALE_ALIAS_PATH=\"${aliaspath}\" \ + -DLIBDIR=\"${libdir}\" -DIN_LIBINTL \ + -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"${libdir}\" -DINSTALLPREFIX=\"${libdir}\" -DNO_XMALLOC \ -Dset_relocation_prefix=libintl_set_relocation_prefix \ -Drelocate=libintl_relocate \ -DDEPENDS_ON_LIBICONV=1 -CPPFLAGS += -I../../.. -I../.. -I. $(DEFS) +CPPFLAGS += -I../../.. -I../.. -I. ${DEFS}
--- a/src/audacious/logger.c Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/logger.c Mon Sep 24 15:18:04 2007 +0300 @@ -57,6 +57,7 @@ static LogHandler log_handlers[] = { {NULL, LOG_ALL_LEVELS, 0}, {"Glib", LOG_ALL_LEVELS, 0}, + {"GThread", LOG_ALL_LEVELS, 0}, {"Gtk", LOG_ALL_LEVELS, 0} };
--- a/src/audacious/skin.c Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/skin.c Mon Sep 24 15:18:04 2007 +0300 @@ -309,14 +309,6 @@ width = gdk_pixbuf_get_width(pixbuf); height = gdk_pixbuf_get_height(pixbuf); - /* create the windows if they haven't been created yet, needed for bootstrapping */ - if (mainwin == NULL) - { - mainwin_create(); - equalizerwin_create(); - playlistwin_create(); - } - if (!(pixmap = gdk_pixmap_new(mainwin->window, width, height, gdk_rgb_get_visual()->depth))) { g_object_unref(pixbuf); @@ -375,6 +367,9 @@ basenames[i] = NULL; } + if (filename == NULL) + return FALSE; + if (!(gpm = pixmap_new_from_file(filename))) { g_warning("loading of %s failed", filename); g_free(filename); @@ -517,6 +512,16 @@ { bmp_active_skin = skin_new(); + skin_parse_hints(bmp_active_skin, NULL); + + /* create the windows if they haven't been created yet, needed for bootstrapping */ + if (mainwin == NULL) + { + mainwin_create(); + equalizerwin_create(); + playlistwin_create(); + } + if (!bmp_active_skin_load(path)) { /* FIXME: Oddly, g_message() causes a crash if path is NULL on * Solaris (see bug #165) */ @@ -617,6 +622,9 @@ skin->properties.mainwin_close_x = 264; skin->properties.mainwin_close_y = 3; + if (path_p == NULL) + return; + filename = find_file_recursively(path_p, "skin.hints"); if (filename == NULL) @@ -1392,13 +1400,17 @@ else cursor_gdk = gdk_cursor_new(GDK_LEFT_PTR); - gdk_window_set_cursor(mainwin->window, cursor_gdk); - gdk_window_set_cursor(playlistwin->window, cursor_gdk); - gdk_window_set_cursor(equalizerwin->window, cursor_gdk); + if (mainwin && playlistwin && equalizerwin) + { + gdk_window_set_cursor(mainwin->window, cursor_gdk); + gdk_window_set_cursor(playlistwin->window, cursor_gdk); + gdk_window_set_cursor(equalizerwin->window, cursor_gdk); + } + gdk_cursor_unref(cursor_gdk); } -static void +static gboolean skin_load_pixmaps(Skin * skin, const gchar * path) { GdkPixmap *text_pm; @@ -1422,6 +1434,9 @@ filename = find_file_recursively(path, "pledit.txt"); inifile = open_ini_file(filename); + if (!inifile) + return FALSE; + skin->colors[SKIN_PLEDIT_NORMAL] = skin_load_color(inifile, "Text", "Normal", "#2499ff"); skin->colors[SKIN_PLEDIT_CURRENT] = @@ -1442,6 +1457,8 @@ skin_mask_create(skin, path, SKIN_MASK_EQ_SHADE, equalizerwin->window); skin_load_viscolor(skin, path, "viscolor.txt"); + + return TRUE; } static gboolean @@ -1470,7 +1487,9 @@ /* Parse the hints for this skin. */ skin_parse_hints(skin, NULL); - skin_load_pixmaps(skin, path); + if (!skin_load_pixmaps(skin, path)) + return FALSE; + skin_load_cursor(skin, path); return TRUE; @@ -1484,7 +1503,13 @@ /* Parse the hints for this skin. */ skin_parse_hints(skin, cpath); - skin_load_pixmaps(skin, cpath); + if (!skin_load_pixmaps(skin, cpath)) + { + del_directory(cpath); + g_free(cpath); + return FALSE; + } + skin_load_cursor(skin, cpath); del_directory(cpath);
--- a/src/audacious/ui/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../../../buildsys.mk - -gladexmldir = $(pkgdatadir)/ui - -install-extra: - y="*.ui"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${gladexmldir} && ${INSTALL} -m 644 $$i ${DESTDIR}${gladexmldir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.ui"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${gladexmldir}/$$i ]; then \ - if rm -f ${DESTDIR}${gladexmldir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done; -
--- a/src/audacious/ui/mainwin.ui Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/ui/mainwin.ui Mon Sep 24 15:18:04 2007 +0300 @@ -14,8 +14,7 @@ <separator /> <menuitem action="play file" /> <menuitem action="play location" /> - <menuitem action="lastfm" /> - <separator /> + <separator /> <menu action="visualization"> <menu action="vismode"> <menuitem action="vismode analyzer" />
--- a/src/audacious/ui_credits.c Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/ui_credits.c Mon Sep 24 15:18:04 2007 +0300 @@ -180,6 +180,7 @@ NULL, N_("French:"), "Adam Cecile", + "Stanislas Zeller", NULL, N_("German:"), "Michael Färber",
--- a/src/audacious/ui_lastfm.c Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,377 +0,0 @@ -#include <gtk/gtk.h> -#include <glib/gi18n.h> -#include <gdk/gdkkeysyms.h> -#include "configdb.h" -#include "playback.h" -#define DEBUG 1 -typedef struct { - gchar *username, - *session; -}last_fm; - -typedef struct -{ - gchar *artist, - *title; -} -track_data; - -last_fm *login_data=NULL; -Playlist *current_playlist=NULL; -GtkWidget *lastfm_url_entry, *lastfm_label,*artist_label,*title_label,*album_label, *gui_window=NULL; - -gpointer open_url(gpointer url) -{ - gchar*s=g_new0(gchar,20); - VFSFile* fd = vfs_fopen((gchar*)url,"r"); - if(fd) - { - vfs_fgets(s,20,fd); - g_print("Got data: '%s'\n",s); - vfs_fclose(fd); - } - g_free(s); - g_free(url); - return NULL; -} -void command(gchar *comm) -{ - /* get the session from mowgli*/ - if(login_data->session) - { - g_free(login_data->session); - login_data->session=NULL; - } - login_data->session = g_strdup(mowgli_global_storage_get("lastfm_session_id")); - gchar *url=g_strdup_printf("http://ws.audioscrobbler.com/radio/control.php?session=%s&command=%s&debug=0",login_data->session,comm); - g_thread_create(open_url,url,FALSE,NULL); - if(!g_str_has_prefix(comm,"love")) - g_thread_create((gpointer)playback_initiate,NULL,FALSE,NULL); - return; - -} -static void change_track_data_cb(gpointer track, gpointer unused) -{ - gchar **inf, - **t, - *alb, - *tr; - tr=g_strdup(((track_data*)track)->title); - - if(tr==NULL) - return ; - if(g_strrstr(tr,"last.fm")==NULL) - { - gtk_entry_set_text(GTK_ENTRY(lastfm_url_entry), _("Not last.fm stream")); - return; - } - -#if DEBUG - g_print("New Track: %s \n",tr); -#endif - if(g_str_has_prefix(tr,"lastfm://")) - return; - if(g_strrstr(tr,"Neighbour")!=NULL) - { - gchar *temp=g_strdup_printf("lastfm://user/%s/neighbours", login_data->username); - gtk_entry_set_text(GTK_ENTRY(lastfm_url_entry),temp); - g_free(temp); - } - if(g_strrstr(tr,"Personal")!=NULL) - { - gchar *temp=g_strdup_printf("lastfm://user/%s/personal", login_data->username); - gtk_entry_set_text(GTK_ENTRY(lastfm_url_entry),temp); - g_free(temp); - } - - inf = g_strsplit(tr," - ",2); - if(inf[0]==NULL || inf[1]==NULL) - return; - gchar* artist_markup=g_strdup_printf(_("<b>Artist:</b> %s") ,inf[0]); - gtk_label_set_markup(GTK_LABEL(artist_label),artist_markup); - g_free(artist_markup); - - t = g_strsplit(inf[1], g_strrstr(inf[1],"("),2); - if(t[0]==NULL) return; - alb = g_strdup(mowgli_global_storage_get("lastfm_album")); - - gchar* title_markup=g_strdup_printf(_("<b>Title:</b> %s") ,t[0]); - gtk_label_set_markup( GTK_LABEL(title_label),title_markup); - g_free(title_markup); - - gchar* album_markup=g_strdup_printf(_("<b>Album:</b> %s") ,alb); - gtk_label_set_markup( GTK_LABEL(album_label),album_markup); - g_free(album_markup); - - g_strfreev(inf); - g_strfreev(t); - g_free(alb); - g_free(tr); - - return ; -} - -static void show_login_error_dialog(void) -{ - const gchar *markup = - _("<b><big>Couldn't find your lastfm login data.</big></b>\n\n" - "Check if your Scrobbler's plugin login settings are configured properly.\n"); - - GtkWidget *dialog = - gtk_message_dialog_new_with_markup(NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _(markup)); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); -} - - - -void init_last_fm(void) -{ - login_data = g_new0(last_fm,1); - login_data->username = NULL; - login_data->session = NULL; - ConfigDb *cfg = NULL; - - if ((cfg = bmp_cfg_db_open()) != NULL) - { - login_data->username=NULL; - bmp_cfg_db_get_string(cfg, "audioscrobbler","username", - &login_data->username); - if(login_data->username==NULL) - show_login_error_dialog(); - g_free(cfg); - } - - current_playlist = g_new0(Playlist,1); - current_playlist = playlist_get_active(); - track_data * tr=g_new0(track_data,1); - tr->title =NULL; - hook_associate( "playlist set info" , change_track_data_cb ,tr); - -} - -/*event callback functions*/ - -gboolean love_press_callback(GtkWidget *love) -{ - command("love"); - return FALSE; -} - -gboolean skip_press_callback(GtkWidget *skip) -{ - command("skip"); - return FALSE; -} -gboolean ban_press_callback(GtkWidget *ban) -{ - command("ban"); - return FALSE; -} - - -gboolean add_press_callback(GtkWidget *love) -{ - gchar *text=NULL; - gint poz=0; - text = g_strdup(gtk_entry_get_text(GTK_ENTRY(lastfm_url_entry))); - if(playback_get_playing()==TRUE) - playback_stop(); - - poz = playlist_get_length(current_playlist); - playlist_add_url(current_playlist, text); - sleep(1); - playlist_set_position(current_playlist, poz); - playback_initiate(); - g_free(text); - return FALSE; -} - -gboolean neighbours_press_callback(GtkWidget *love) -{ - gchar *temp=g_strdup_printf("lastfm://user/%s/neighbours", login_data->username); - gtk_entry_set_text(GTK_ENTRY(lastfm_url_entry),temp); - g_free(temp); - return FALSE; -} - -gboolean personal_press_callback(GtkWidget *love) -{ - gchar *per=g_strdup_printf("lastfm://user/%s/personal", login_data->username); - gtk_entry_set_text(GTK_ENTRY(lastfm_url_entry),per); - g_free(per); - return FALSE; -} - -gboolean delete_window_callback(GtkWidget *window) -{ - gtk_widget_destroy(window); - window=NULL; - return FALSE; -} -static gboolean keypress_callback(GtkWidget * widget, GdkEventKey * event, gpointer data) -{ - switch (event->keyval) - { - case GDK_Escape: - gtk_widget_hide_all(widget); - break; - default: - return FALSE; - } - return TRUE; -} - - -GtkWidget *ui_lastfm_create(void) -{ - GtkWidget *window; - GtkWidget *box1,*box2,*vboxw,*vbox1,*vbox2,*v_hbox1,*v_hbox2,*labelbox; - GtkWidget *love,*ban,*skip,*add,*neighbours,*personal; - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_position(GTK_WINDOW(window),GTK_WIN_POS_CENTER); - gtk_window_set_title(GTK_WINDOW(window), _("Audacious last.fm radio tuner")); - lastfm_label = gtk_label_new_with_mnemonic(_("Station:")); - title_label = gtk_label_new(NULL); - artist_label = gtk_label_new(NULL); - album_label = gtk_label_new(NULL); - lastfm_url_entry = gtk_entry_new(); - gtk_editable_set_editable (GTK_EDITABLE(lastfm_url_entry),TRUE); - gchar* artist_markup=g_strdup(_("<b>Artist:</b>")); - gtk_label_set_markup(GTK_LABEL(artist_label),artist_markup); - g_free(artist_markup); - - gchar* title_markup=g_strdup(_("<b>Title:</b>")); - gtk_label_set_markup( GTK_LABEL(title_label),title_markup); - g_free(title_markup); - - gchar* album_markup=g_strdup_printf(_("<b>Album:</b>")); - gtk_label_set_markup( GTK_LABEL(album_label),album_markup); - g_free(album_markup); - - love = gtk_button_new_with_label (_("Love")); - ban = gtk_button_new_with_label (_("Ban")); - skip = gtk_button_new_with_label (_("Skip")); - add = gtk_button_new_with_label (_("Tune in")); - - neighbours = gtk_button_new_with_label(_("Neighbours' radio")); - personal = gtk_button_new_with_label(_("Personal radio")); - - box1 = gtk_hbox_new(FALSE,1); - box2 = gtk_hbox_new(FALSE,1); - - vboxw = gtk_vbox_new(FALSE,1); - - vbox1 = gtk_vbox_new(FALSE,1); - vbox2 = gtk_vbox_new(FALSE,1); - - v_hbox1 = gtk_vbox_new(FALSE,1); - v_hbox2 = gtk_hbox_new(FALSE,1); - labelbox = gtk_vbox_new(FALSE,1); - - gtk_misc_set_alignment(GTK_MISC(artist_label),0,0); - gtk_misc_set_alignment(GTK_MISC(title_label),0,0); - gtk_misc_set_alignment(GTK_MISC(album_label),0,0); - - gtk_box_pack_start(GTK_BOX(vboxw),box1,FALSE,TRUE,1); - gtk_box_pack_end(GTK_BOX(vboxw),box2,TRUE,TRUE,1); - - gtk_box_pack_start(GTK_BOX(box1),lastfm_label,FALSE,TRUE,1); - gtk_box_pack_start(GTK_BOX(box1),lastfm_url_entry,TRUE,TRUE,1); - gtk_box_pack_start(GTK_BOX(box1),add,FALSE,TRUE,1); - - gtk_box_set_spacing(GTK_BOX(box1),2); - gtk_container_set_border_width(GTK_CONTAINER(box1),2); - - gtk_box_pack_start(GTK_BOX(box2),vbox1,FALSE,TRUE,1); - gtk_box_pack_start(GTK_BOX(box2),vbox2,TRUE,TRUE,1); - - gtk_box_pack_start(GTK_BOX(vbox1),neighbours,FALSE,TRUE,3); - gtk_box_pack_start(GTK_BOX(vbox1),personal,FALSE,TRUE,3); - gtk_box_set_spacing(GTK_BOX(vbox1),2); - gtk_container_set_border_width(GTK_CONTAINER(vbox1),2); - - gtk_box_pack_start(GTK_BOX(vbox2),v_hbox1,TRUE,TRUE,1); - gtk_box_pack_start(GTK_BOX(vbox2),v_hbox2,TRUE,TRUE,1); - - gtk_box_pack_start(GTK_BOX(v_hbox1),artist_label,TRUE,TRUE,1); - gtk_box_pack_start(GTK_BOX(v_hbox1),title_label,TRUE,TRUE,1); - gtk_box_pack_start(GTK_BOX(v_hbox1),album_label,TRUE,TRUE,1); - gtk_box_set_spacing(GTK_BOX(v_hbox1),2); - gtk_container_set_border_width(GTK_CONTAINER(v_hbox1),2); - - - gtk_box_pack_start(GTK_BOX(v_hbox2),love,TRUE,TRUE,1); - gtk_box_pack_start(GTK_BOX(v_hbox2),skip,TRUE,TRUE,1); - gtk_box_pack_start(GTK_BOX(v_hbox2),ban,TRUE,TRUE,1); - gtk_box_set_spacing(GTK_BOX(v_hbox1),2); - gtk_container_set_border_width(GTK_CONTAINER(v_hbox1),2); - - - - gtk_container_add (GTK_CONTAINER (window), vboxw); - - g_signal_connect (G_OBJECT (love), "button_press_event",G_CALLBACK (love_press_callback), NULL); - g_signal_connect (G_OBJECT (add), "button_press_event",G_CALLBACK (add_press_callback), NULL); - g_signal_connect (G_OBJECT (ban), "button_press_event",G_CALLBACK (ban_press_callback), NULL); - g_signal_connect (G_OBJECT (skip), "button_press_event",G_CALLBACK (skip_press_callback), NULL); - g_signal_connect (G_OBJECT (neighbours), "button_press_event",G_CALLBACK (neighbours_press_callback), NULL); - g_signal_connect (G_OBJECT (personal), "button_press_event",G_CALLBACK (personal_press_callback), NULL); - g_signal_connect (G_OBJECT (window), "delete_event",G_CALLBACK (gtk_widget_hide_all), window); - g_signal_connect (G_OBJECT (window), "key_press_event",G_CALLBACK(keypress_callback), NULL); - - gtk_widget_set_size_request(GTK_WIDGET(window),400,124); - gtk_window_set_resizable(GTK_WINDOW(window),FALSE); - gtk_widget_show_all(gui_window); - return window; -} -#if 0 -static void no_lastfm_plugin_dialog(void) -{ - const gchar *markup = - N_("<b><big>The lastfm radio plugin could not be found.</big></b>\n\n" - "Check if the AudioScrobbler plugin was compiled in\n"); - - GtkWidget *dialog = - gtk_message_dialog_new_with_markup(NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _(markup)); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); -} -#endif - - -void ui_lastfm(void) -{ - /*if(!mowgli_global_storage_get("lastfm_loaded")) - { - no_lastfm_plugin_dialog(); - return; - } - */ - init_last_fm(); - if(!gui_window) - { - if((gui_window = ui_lastfm_create())!=NULL); - gtk_widget_show_all(gui_window); - - #if 0 - /*here should be set the artist, title and album labels at the first run, because it isn't captured by the hook*/ - gchar* current_title = playlist_get_songtitle(current_playlist,playlist_get_position(current_playlist)); - if(current_title) - change_track_data_cb(current_title,NULL); -#endif - } - else - gtk_widget_show_all(gui_window); - -} -
--- a/src/audacious/ui_lastfm.h Wed Sep 19 17:48:49 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -void ui_lastfm(void);
--- a/src/audacious/ui_main.c Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/ui_main.c Mon Sep 24 15:18:04 2007 +0300 @@ -73,7 +73,6 @@ #include "ui_preferences.h" #include "ui_skinselector.h" #include "ui_urlopener.h" -#include "ui_lastfm.h" #include "strings.h" #include "util.h" #include "visualization.h" @@ -372,17 +371,6 @@ 1, GDK_CURRENT_TIME); } -static void -mainwin_about_cb(void) -{ - gint x, y; - gdk_window_get_pointer(NULL, &x, &y, NULL); - ui_manager_popup_menu_show(GTK_MENU(mainwin_general_menu), - x + 6 * (1 + cfg.doublesize), - y + MAINWIN_SHADED_HEIGHT * (1 + cfg.doublesize), - 1, GDK_CURRENT_TIME); -} - void mainwin_minimize_cb(void) { @@ -861,6 +849,16 @@ } static gboolean +mainwin_widget_contained(GdkEventButton *event, int x, int y, int w, int h) +{ + if ((event->x > x && event->y > y) && + (event->x < x+w && event->y < y+h)) + return TRUE; + + return FALSE; +} + +static gboolean mainwin_mouse_button_press(GtkWidget * widget, GdkEventButton * event, gpointer callback_data) @@ -888,7 +886,21 @@ } if (event->button == 3) { - if ( (event->y > 70) && (event->x < 128) ) + /* Pop up playback menu if right clicked over playback-control widgets, + * otherwise popup general menu + */ + if (mainwin_widget_contained(event, bmp_active_skin->properties.mainwin_position_x, + bmp_active_skin->properties.mainwin_position_y, 248, 10) || + mainwin_widget_contained(event, bmp_active_skin->properties.mainwin_previous_x, + bmp_active_skin->properties.mainwin_previous_y, 23, 18) || + mainwin_widget_contained(event, bmp_active_skin->properties.mainwin_play_x, + bmp_active_skin->properties.mainwin_play_y, 23, 18) || + mainwin_widget_contained(event, bmp_active_skin->properties.mainwin_pause_x, + bmp_active_skin->properties.mainwin_pause_y, 23, 18) || + mainwin_widget_contained(event, bmp_active_skin->properties.mainwin_stop_x, + bmp_active_skin->properties.mainwin_stop_y, 23, 18) || + mainwin_widget_contained(event, bmp_active_skin->properties.mainwin_next_x, + bmp_active_skin->properties.mainwin_next_y, 23, 18)) { ui_manager_popup_menu_show(GTK_MENU(mainwin_playback_menu), @@ -1783,9 +1795,6 @@ case MAINWIN_GENERAL_PLAYLOCATION: mainwin_show_add_url_window(); break; - case MAINWIN_GENERAL_LASTFM: - action_lastfm(); - break; case MAINWIN_GENERAL_FILEINFO: playlist_fileinfo_current(playlist); break; @@ -2481,7 +2490,6 @@ mainwin_about = ui_skinned_button_new(); ui_skinned_small_button_setup(mainwin_about, SKINNED_WINDOW(mainwin)->fixed, 247, 83, 20, 25); g_signal_connect(mainwin_about, "clicked", show_about_window, NULL); - g_signal_connect(mainwin_about, "right-clicked", mainwin_about_cb, NULL ); mainwin_vis = ui_vis_new(SKINNED_WINDOW(mainwin)->fixed, 24, 43, 76); g_signal_connect(mainwin_vis, "button-press-event", G_CALLBACK(mainwin_vis_cb), NULL); @@ -2980,12 +2988,6 @@ } void -action_lastfm( void ) -{ - ui_lastfm(); -} - -void action_jump_to_playlist_start( void ) { Playlist *playlist = playlist_get_active();
--- a/src/audacious/ui_main.h Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/ui_main.h Mon Sep 24 15:18:04 2007 +0300 @@ -53,7 +53,6 @@ MAINWIN_GENERAL_PLAYFILE, MAINWIN_GENERAL_PLAYLOCATION, - MAINWIN_GENERAL_LASTFM, MAINWIN_GENERAL_FILEINFO, MAINWIN_GENERAL_PREFS,
--- a/src/audacious/ui_manager.c Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/ui_manager.c Mon Sep 24 15:18:04 2007 +0300 @@ -397,10 +397,7 @@ { "play location", GTK_STOCK_NETWORK , N_("Play Location"), "<Ctrl>L", N_("Play media from the selected location"), G_CALLBACK(action_play_location) }, - { "lastfm", NULL, N_("Last.fm radio"), "<Alt>L", - N_("Play Last.fm radio"), G_CALLBACK(action_lastfm) }, - - { "plugins", NULL , N_("Plugins") }, + { "plugins", NULL , N_("Plugin services") }, { "preferences", GTK_STOCK_PREFERENCES , N_("Preferences"), "<Ctrl>P", N_("Open preferences window"), G_CALLBACK(action_preferences) },
--- a/src/audacious/ui_skinned_button.c Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/ui_skinned_button.c Mon Sep 24 15:18:04 2007 +0300 @@ -28,7 +28,6 @@ PRESSED, RELEASED, CLICKED, - RIGHT_CLICKED, DOUBLED, REDRAW, LAST_SIGNAL @@ -128,7 +127,6 @@ klass->pressed = button_pressed; klass->released = button_released; klass->clicked = NULL; - klass->right_clicked = NULL; klass->doubled = ui_skinned_button_toggle_doublesize; klass->redraw = ui_skinned_button_redraw; @@ -147,11 +145,6 @@ G_STRUCT_OFFSET (UiSkinnedButtonClass, clicked), NULL, NULL, gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - button_signals[RIGHT_CLICKED] = - g_signal_new ("right-clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (UiSkinnedButtonClass, right_clicked), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - button_signals[DOUBLED] = g_signal_new ("toggle-double-size", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (UiSkinnedButtonClass, doubled), NULL, NULL, @@ -455,6 +448,11 @@ if (event->button == 1) ui_skinned_button_pressed (button); + else if (event->button == 3) { + event->x = event->x + button->x; + event->y = event->y + button->y; + return FALSE; + } } return TRUE; @@ -465,10 +463,7 @@ if (event->button == 1) { button = UI_SKINNED_BUTTON(widget); ui_skinned_button_released(button); - } else if (event->button == 3) { - g_signal_emit(widget, button_signals[RIGHT_CLICKED], 0); } - return TRUE; }
--- a/src/audacious/ui_skinned_horizontal_slider.c Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audacious/ui_skinned_horizontal_slider.c Mon Sep 24 15:18:04 2007 +0300 @@ -295,21 +295,25 @@ if (event->type == GDK_BUTTON_PRESS) { if (event->button == 1) { - gint x; + gint x; - x = event->x - (priv->knob_width / (priv->double_size ? 1 : 2)); - hs->pressed = TRUE; + x = event->x - (priv->knob_width / (priv->double_size ? 1 : 2)); + hs->pressed = TRUE; - priv->position = x/(1+priv->double_size); - if (priv->position < priv->min) - priv->position = priv->min; - if (priv->position > priv->max) - priv->position = priv->max; - if (priv->frame_cb) - priv->frame = priv->frame_cb(priv->position); + priv->position = x/(1+priv->double_size); + if (priv->position < priv->min) + priv->position = priv->min; + if (priv->position > priv->max) + priv->position = priv->max; + if (priv->frame_cb) + priv->frame = priv->frame_cb(priv->position); - g_signal_emit_by_name(widget, "motion", priv->position); - gtk_widget_queue_draw(widget); + g_signal_emit_by_name(widget, "motion", priv->position); + gtk_widget_queue_draw(widget); + } else if (event->button == 3) { + event->x = event->x + hs->x; + event->y = event->y + hs->y; + return FALSE; } } return TRUE;
--- a/src/audtool/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ b/src/audtool/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -1,33 +1,24 @@ -include ../../extra.mk - PROG = audtool - -SRCS = \ - audtool_main.c \ - audtool_handlers_general.c \ - audtool_handlers_playback.c \ - audtool_handlers_playlist.c \ - audtool_handlers_playqueue.c \ - audtool_handlers_vitals.c \ - audtool_report.c +SRCS = audtool_main.c \ + audtool_handlers_general.c \ + audtool_handlers_playback.c \ + audtool_handlers_playlist.c \ + audtool_handlers_playqueue.c \ + audtool_handlers_vitals.c \ + audtool_report.c include ../../buildsys.mk - -LIBS += \ - $(DBUS_LIBS) \ - -L../libaudclient -laudclient \ - $(GTK_LIBS) \ - $(MOWGLI_LIBS) \ - $(LIBGLADE_LIBS) +include ../../extra.mk -CFLAGS += \ - $(GTK_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(BEEP_DEFINES) \ - $(ARCH_DEFINES) \ - $(MOWGLI_CFLAGS) \ - -I.. -I../.. \ - -I../intl - -CPPFLAGS += $(CFLAGS) +CPPFLAGS += ${CFLAGS} -I.. -I../.. -I../intl +CFLAGS += ${GTK_CFLAGS} \ + ${DBUS_CFLAGS} \ + ${LIBGLADE_CFLAGS} \ + ${BEEP_DEFINES} \ + ${ARCH_DEFINES} \ + ${MOWGLI_CFLAGS} +LIBS += ${DBUS_LIBS} \ + -L../libaudclient -laudclient \ + ${GTK_LIBS} \ + ${MOWGLI_LIBS} \ + ${LIBGLADE_LIBS}
--- a/src/libaudclient/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ b/src/libaudclient/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -1,5 +1,3 @@ -include ../../extra.mk - LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX} LIB_MAJOR = 1 LIB_MINOR = 0 @@ -9,25 +7,20 @@ INCLUDES = audctrl.h include ../../buildsys.mk - -depend-hook: - cd ../audacious; make dbus-client-bindings.h +include ../../extra.mk -LIBS += \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(MOWGLI_LIBS) \ - $(GCONF_LIBS) \ - $(LIBMCS_LIBS) +pre-depend: + cd ../audacious; ${MAKE} ${MFLAGS} dbus-client-bindings.h -CFLAGS += $(LIB_CFLAGS) \ - $(MOWGLI_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBMCS_CFLAGS) \ - -D_AUDACIOUS_CORE \ - -I.. -I../.. \ - -I../intl - -CPPFLAGS = ${CFLAGS} +CPPFLAGS = ${LIB_CPPFLAGS} ${CFLAGS} -D_AUDACIOUS_CORE -I.. -I../.. -I../intl +CFLAGS += ${LIB_CFLAGS} \ + ${MOWGLI_CFLAGS} \ + ${GTK_CFLAGS} \ + ${GCONF_CFLAGS} \ + ${DBUS_CFLAGS} \ + ${LIBMCS_CFLAGS} +LIBS += ${GLIB_LIBS} \ + ${DBUS_LIBS} \ + ${MOWGLI_LIBS} \ + ${GCONF_LIBS} \ + ${LIBMCS_LIBS}
--- a/src/libguess/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ b/src/libguess/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -1,12 +1,10 @@ STATIC_LIB_NOINST = libguess.a - -SRCS = \ - guess.c \ - arabic_impl.c \ - cjk_impl.c \ - greek_impl.c \ - hebrew_impl.c \ - russian_impl.c \ - turkish_impl.c +SRCS = guess.c \ + arabic_impl.c \ + cjk_impl.c \ + greek_impl.c \ + hebrew_impl.c \ + russian_impl.c \ + turkish_impl.c include ../../buildsys.mk
--- a/src/libid3tag/Makefile Wed Sep 19 17:48:49 2007 +0300 +++ b/src/libid3tag/Makefile Mon Sep 24 15:18:04 2007 +0300 @@ -1,35 +1,32 @@ -include ../../extra.mk - LIB = ${LIB_PREFIX}audid3tag${LIB_SUFFIX} LIB_MAJOR = 1 LIB_MINOR = 0 -LIBDIR = $(plugindir) +LIBDIR = ${plugindir} INCLUDES = id3tag.h -SRCS = \ - compat.c \ - debug.c \ - file.c \ - frametype.c \ - latin1.c \ - render.c \ - ucs4.c \ - utf8.c \ - version.c \ - crc.c \ - field.c \ - frame.c \ - genre.c \ - parse.c \ - tag.c \ - utf16.c \ - util.c +SRCS = compat.c \ + debug.c \ + file.c \ + frametype.c \ + latin1.c \ + render.c \ + ucs4.c \ + utf8.c \ + version.c \ + crc.c \ + field.c \ + frame.c \ + genre.c \ + parse.c \ + tag.c \ + utf16.c \ + util.c include ../../buildsys.mk +include ../../extra.mk -CPPFLAGS += -I.. $(GLIB_CFLAGS) -CFLAGS += $(LIB_CFLAGS) - -LIBS += $(GLIB_LIBS) +CPPFLAGS += ${LIB_CPPFLAGS} -I.. ${GLIB_CFLAGS} +CFLAGS += ${LIB_CFLAGS} +LIBS += ${GLIB_LIBS}