# HG changeset patch # User William Pitcock # Date 1200931802 21600 # Node ID cc565360e405948f27b4b428ee6cb3dba1e8288d # Parent 6e269660fbc374dbc5ec764b603621c83cfb3b31# Parent 15df056e763485d2140adcb771b52547bb5af23e Automated merge with ssh://hg.atheme.org//hg/audacious diff -r 6e269660fbc3 -r cc565360e405 po/sr.po --- a/po/sr.po Mon Jan 21 10:09:35 2008 -0600 +++ b/po/sr.po Mon Jan 21 10:10:02 2008 -0600 @@ -1,4 +1,4 @@ -# translation of sr.po to +# translation of audacious.pot to Serbian Cyrillic # Strahinja Kustudic , 2007, 2008. # Copyright (C) 2007 Strahinja Kustudić # This file is distributed under the same license as the Audacious package. @@ -7,13 +7,12 @@ "Project-Id-Version: sr\n" "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n" "POT-Creation-Date: 2008-01-10 15:53+0100\n" -"PO-Revision-Date: 2008-01-03 10:42+0100\n" +"PO-Revision-Date: 2008-01-20 20:16+0100\n" "Last-Translator: Strahinja Kustudic \n" -"Language-Team: \n" +"Language-Team: <\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" #: src/audacious/input.c:638 #, c-format @@ -265,7 +264,7 @@ msgstr " (неисправан UTF-8)" #: src/audacious/ui_about.c:46 -#, fuzzy, c-format +#, c-format msgid "" "Audacious %s\n" "\n" @@ -273,7 +272,7 @@ msgstr "" "Аудациоус %s\n" "\n" -"Сва права задржана, 2005-2007 Аудациоус Развојни Тим" +"Сва права задржана, 2005-2008 Аудациоус Развојни Тим" #: src/audacious/ui_about.c:125 src/audacious/ui_credits.c:363 #: src/audacious/ui_manager.c:391 src/audacious/ui_manager.c:392 @@ -285,7 +284,7 @@ msgstr "Заслуге" #: src/audacious/ui_credits.c:47 -#, fuzzy, c-format +#, c-format msgid "" "Audacious %s\n" "A skinned multimedia player for many platforms.\n" @@ -295,7 +294,7 @@ "Аудациоус %s\n" "Маскирани мултимедијални плејер за више платформи.\n" "\n" -"Сва права задржана, 2005-2007 Аудациоус Развојни Тим\n" +"Сва права задржана, 2005-2008 Аудациоус Развојни Тим\n" #: src/audacious/ui_credits.c:53 msgid "Audacious core developers:" @@ -470,625 +469,596 @@ msgstr "Претподешавања" #: src/audacious/ui_fileinfo.c:101 -#, fuzzy msgid "Blues" -msgstr "Плаво" +msgstr "Блуз" #: src/audacious/ui_fileinfo.c:101 msgid "Classic Rock" -msgstr "" +msgstr "Класични рок" #: src/audacious/ui_fileinfo.c:101 msgid "Country" -msgstr "" +msgstr "Кантри" #: src/audacious/ui_fileinfo.c:101 -#, fuzzy msgid "Dance" -msgstr "Датум" +msgstr "Денс" #: src/audacious/ui_fileinfo.c:102 msgid "Disco" -msgstr "" +msgstr "Диско" #: src/audacious/ui_fileinfo.c:102 msgid "Funk" -msgstr "" +msgstr "Фанки" #: src/audacious/ui_fileinfo.c:102 msgid "Grunge" -msgstr "" +msgstr "Гранџ" #: src/audacious/ui_fileinfo.c:102 msgid "Hip-Hop" -msgstr "" +msgstr "Хип хоп" #: src/audacious/ui_fileinfo.c:103 msgid "Jazz" -msgstr "" +msgstr "Џез" #: src/audacious/ui_fileinfo.c:103 msgid "Metal" -msgstr "" +msgstr "Метал" #: src/audacious/ui_fileinfo.c:103 msgid "New Age" -msgstr "" +msgstr "Њу Ејџ" #: src/audacious/ui_fileinfo.c:103 -#, fuzzy msgid "Oldies" -msgstr "линије" +msgstr "Евергрин" #: src/audacious/ui_fileinfo.c:104 msgid "Other" -msgstr "" +msgstr "Остало" #: src/audacious/ui_fileinfo.c:104 msgid "Pop" -msgstr "" +msgstr "Поп" #: src/audacious/ui_fileinfo.c:104 msgid "R&B" -msgstr "" +msgstr "R&B" #: src/audacious/ui_fileinfo.c:104 msgid "Rap" -msgstr "" +msgstr "Реп" #: src/audacious/ui_fileinfo.c:104 -#, fuzzy msgid "Reggae" -msgstr "_Преименуј" +msgstr "Реге" #: src/audacious/ui_fileinfo.c:105 msgid "Rock" -msgstr "" +msgstr "Рок" #: src/audacious/ui_fileinfo.c:105 msgid "Techno" -msgstr "" +msgstr "Техно" #: src/audacious/ui_fileinfo.c:105 msgid "Industrial" -msgstr "" +msgstr "Индустрија" #: src/audacious/ui_fileinfo.c:105 msgid "Alternative" -msgstr "" +msgstr "Алтернатива" #: src/audacious/ui_fileinfo.c:106 msgid "Ska" -msgstr "" +msgstr "Ска" #: src/audacious/ui_fileinfo.c:106 msgid "Death Metal" -msgstr "" +msgstr "Дет метал" #: src/audacious/ui_fileinfo.c:106 -#, fuzzy msgid "Pranks" -msgstr "Врхови" +msgstr "Пранкс" #: src/audacious/ui_fileinfo.c:106 msgid "Soundtrack" -msgstr "" +msgstr "Тема из филма" #: src/audacious/ui_fileinfo.c:107 msgid "Euro-Techno" -msgstr "" +msgstr "Еуро-техно" #: src/audacious/ui_fileinfo.c:107 msgid "Ambient" -msgstr "" +msgstr "Амбијентална" #: src/audacious/ui_fileinfo.c:107 msgid "Trip-Hop" -msgstr "" +msgstr "Трип-Хоп" #: src/audacious/ui_fileinfo.c:107 msgid "Vocal" -msgstr "" +msgstr "Вокал" #: src/audacious/ui_fileinfo.c:108 msgid "Jazz+Funk" -msgstr "" +msgstr "Џез и Фанки" #: src/audacious/ui_fileinfo.c:108 -#, fuzzy msgid "Fusion" -msgstr "Руски" +msgstr "Фузија" #: src/audacious/ui_fileinfo.c:108 -#, fuzzy msgid "Trance" -msgstr "Изглед" +msgstr "Тренс" #: src/audacious/ui_fileinfo.c:108 msgid "Classical" -msgstr "" +msgstr "Класична" #: src/audacious/ui_fileinfo.c:109 msgid "Instrumental" -msgstr "" +msgstr "Инструментал" #: src/audacious/ui_fileinfo.c:109 msgid "Acid" -msgstr "" +msgstr "Ацид" #: src/audacious/ui_fileinfo.c:109 -#, fuzzy msgid "House" -msgstr "Миш" +msgstr "Хаус" #: src/audacious/ui_fileinfo.c:109 msgid "Game" -msgstr "" +msgstr "Музика из игре" #: src/audacious/ui_fileinfo.c:110 msgid "Sound Clip" -msgstr "" +msgstr "Тонски запис" #: src/audacious/ui_fileinfo.c:110 msgid "Gospel" -msgstr "" +msgstr "Верска" #: src/audacious/ui_fileinfo.c:110 -#, fuzzy msgid "Noise" -msgstr "Ниједан" +msgstr "Шум" #: src/audacious/ui_fileinfo.c:110 msgid "AlternRock" -msgstr "" +msgstr "АлтернРок" #: src/audacious/ui_fileinfo.c:111 -#, fuzzy msgid "Bass" -msgstr "Траке" +msgstr "Бас" #: src/audacious/ui_fileinfo.c:111 msgid "Soul" -msgstr "" +msgstr "Соул" #: src/audacious/ui_fileinfo.c:111 msgid "Punk" -msgstr "" +msgstr "Панк" #: src/audacious/ui_fileinfo.c:111 -#, fuzzy msgid "Space" -msgstr "Сачувати" +msgstr "Спејс" #: src/audacious/ui_fileinfo.c:112 msgid "Meditative" -msgstr "" +msgstr "Медитациона" #: src/audacious/ui_fileinfo.c:112 msgid "Instrumental Pop" -msgstr "" +msgstr "Инструментални поп" #: src/audacious/ui_fileinfo.c:113 msgid "Instrumental Rock" -msgstr "" +msgstr "Инструментални рок" #: src/audacious/ui_fileinfo.c:113 msgid "Ethnic" -msgstr "" +msgstr "Етно" #: src/audacious/ui_fileinfo.c:113 msgid "Gothic" -msgstr "" +msgstr "Готска" #: src/audacious/ui_fileinfo.c:114 msgid "Darkwave" -msgstr "" +msgstr "Црни талас" #: src/audacious/ui_fileinfo.c:114 msgid "Techno-Industrial" -msgstr "" +msgstr "Техно-Индустрија" #: src/audacious/ui_fileinfo.c:114 msgid "Electronic" -msgstr "" +msgstr "Електронска" #: src/audacious/ui_fileinfo.c:115 msgid "Pop-Folk" -msgstr "" +msgstr "Поп-Фолк" #: src/audacious/ui_fileinfo.c:115 msgid "Eurodance" -msgstr "" +msgstr "Еуроденс" #: src/audacious/ui_fileinfo.c:115 msgid "Dream" -msgstr "" +msgstr "Дрим" #: src/audacious/ui_fileinfo.c:116 msgid "Southern Rock" -msgstr "" +msgstr "Јужњачки рок" #: src/audacious/ui_fileinfo.c:116 -#, fuzzy msgid "Comedy" -msgstr "Коментар" +msgstr "Комедија" #: src/audacious/ui_fileinfo.c:116 -#, fuzzy msgid "Cult" -msgstr "Сопствени" +msgstr "Култна" #: src/audacious/ui_fileinfo.c:117 msgid "Gangsta Rap" -msgstr "" +msgstr "Гангстерски реп" #: src/audacious/ui_fileinfo.c:117 msgid "Top 40" -msgstr "" +msgstr "Најпопуларнијих 40" #: src/audacious/ui_fileinfo.c:117 msgid "Christian Rap" -msgstr "" +msgstr "Хришћански реп" #: src/audacious/ui_fileinfo.c:118 msgid "Pop/Funk" -msgstr "" +msgstr "Поп/Фанки" #: src/audacious/ui_fileinfo.c:118 msgid "Jungle" -msgstr "" +msgstr "Џангл" #: src/audacious/ui_fileinfo.c:118 msgid "Native American" -msgstr "" +msgstr "Традиционална америчка" #: src/audacious/ui_fileinfo.c:119 msgid "Cabaret" -msgstr "" +msgstr "Кабаре" #: src/audacious/ui_fileinfo.c:119 msgid "New Wave" -msgstr "" +msgstr "Нови талас" #: src/audacious/ui_fileinfo.c:119 msgid "Psychedelic" -msgstr "" +msgstr "Психоделично" #: src/audacious/ui_fileinfo.c:119 -#, fuzzy msgid "Rave" -msgstr "Сачувати" +msgstr "Рејв" #: src/audacious/ui_fileinfo.c:120 -#, fuzzy msgid "Showtunes" -msgstr "Најспорије" +msgstr "Музика из представа" #: src/audacious/ui_fileinfo.c:120 -#, fuzzy msgid "Trailer" -msgstr "Наслов" +msgstr "Трејлер" #: src/audacious/ui_fileinfo.c:120 msgid "Lo-Fi" -msgstr "" +msgstr "Lo-Fi" #: src/audacious/ui_fileinfo.c:120 msgid "Tribal" -msgstr "" +msgstr "Племенска" #: src/audacious/ui_fileinfo.c:121 msgid "Acid Punk" -msgstr "" +msgstr "Ацид панк" #: src/audacious/ui_fileinfo.c:121 msgid "Acid Jazz" -msgstr "" +msgstr "Ацид џез" #: src/audacious/ui_fileinfo.c:121 -#, fuzzy msgid "Polka" -msgstr "Пусти" +msgstr "Полка" #: src/audacious/ui_fileinfo.c:121 -#, fuzzy msgid "Retro" -msgstr "Нула" +msgstr "Ретро" #: src/audacious/ui_fileinfo.c:122 msgid "Musical" -msgstr "" +msgstr "Музичка" #: src/audacious/ui_fileinfo.c:122 msgid "Rock & Roll" -msgstr "" +msgstr "Рокенрол" #: src/audacious/ui_fileinfo.c:122 msgid "Hard Rock" -msgstr "" +msgstr "Хард рок" #: src/audacious/ui_fileinfo.c:122 msgid "Folk" -msgstr "" +msgstr "Народна" #: src/audacious/ui_fileinfo.c:123 msgid "Folk/Rock" -msgstr "" +msgstr "Народна/Рок" #: src/audacious/ui_fileinfo.c:123 msgid "National Folk" -msgstr "" +msgstr "Национална" #: src/audacious/ui_fileinfo.c:123 msgid "Swing" -msgstr "" +msgstr "Свинг" #: src/audacious/ui_fileinfo.c:124 msgid "Fast-Fusion" -msgstr "" +msgstr "Фаст-Фјужн" #: src/audacious/ui_fileinfo.c:124 msgid "Bebob" -msgstr "" +msgstr "Бибоп" #: src/audacious/ui_fileinfo.c:124 -#, fuzzy msgid "Latin" -msgstr "Линије" +msgstr "Латино" #: src/audacious/ui_fileinfo.c:124 msgid "Revival" -msgstr "" +msgstr "Оживљење" #: src/audacious/ui_fileinfo.c:125 msgid "Celtic" -msgstr "" +msgstr "Келтска" #: src/audacious/ui_fileinfo.c:125 -#, fuzzy msgid "Bluegrass" -msgstr "Плаво" +msgstr "Блу-грас" #: src/audacious/ui_fileinfo.c:125 msgid "Avantgarde" -msgstr "" +msgstr "Авангардна" #: src/audacious/ui_fileinfo.c:126 msgid "Gothic Rock" -msgstr "" +msgstr "Готски рок" #: src/audacious/ui_fileinfo.c:126 msgid "Progressive Rock" -msgstr "" +msgstr "Прогресивни рок" #: src/audacious/ui_fileinfo.c:127 msgid "Psychedelic Rock" -msgstr "" +msgstr "Психоделични рок" #: src/audacious/ui_fileinfo.c:127 msgid "Symphonic Rock" -msgstr "" +msgstr "Симфонијски рок" #: src/audacious/ui_fileinfo.c:127 -#, fuzzy msgid "Slow Rock" -msgstr "Споро" +msgstr "Лагани рок" #: src/audacious/ui_fileinfo.c:128 msgid "Big Band" -msgstr "" +msgstr "Биг Бeнд" #: src/audacious/ui_fileinfo.c:128 msgid "Chorus" -msgstr "" +msgstr "Хорска" #: src/audacious/ui_fileinfo.c:128 msgid "Easy Listening" -msgstr "" +msgstr "Лака за слушање" #: src/audacious/ui_fileinfo.c:129 msgid "Acoustic" -msgstr "" +msgstr "Акустична" #: src/audacious/ui_fileinfo.c:129 msgid "Humour" -msgstr "" +msgstr "Хумор" #: src/audacious/ui_fileinfo.c:129 msgid "Speech" -msgstr "" +msgstr "Говор" #: src/audacious/ui_fileinfo.c:129 msgid "Chanson" -msgstr "" +msgstr "Шансона" #: src/audacious/ui_fileinfo.c:130 msgid "Opera" -msgstr "" +msgstr "Опера" #: src/audacious/ui_fileinfo.c:130 msgid "Chamber Music" -msgstr "" +msgstr "Камерна музика" #: src/audacious/ui_fileinfo.c:130 msgid "Sonata" -msgstr "" +msgstr "Соната" #: src/audacious/ui_fileinfo.c:130 msgid "Symphony" -msgstr "" +msgstr "Симфонија" #: src/audacious/ui_fileinfo.c:131 msgid "Booty Bass" -msgstr "" +msgstr "Бути Бас" #: src/audacious/ui_fileinfo.c:131 -#, fuzzy msgid "Primus" -msgstr "Претходна" +msgstr "Примус" #: src/audacious/ui_fileinfo.c:131 msgid "Porn Groove" -msgstr "" +msgstr "Еротска" #: src/audacious/ui_fileinfo.c:132 src/audacious/ui_fileinfo.c:134 -#, fuzzy msgid "Satire" -msgstr "Ватра" +msgstr "Сатирична" #: src/audacious/ui_fileinfo.c:132 src/audacious/ui_fileinfo.c:134 -#, fuzzy msgid "Slow Jam" -msgstr "Споро" +msgstr "Лагани џем" #: src/audacious/ui_fileinfo.c:132 src/audacious/ui_fileinfo.c:134 msgid "Club" -msgstr "" +msgstr "Клубска" #: src/audacious/ui_fileinfo.c:132 src/audacious/ui_fileinfo.c:134 msgid "Tango" -msgstr "" +msgstr "Танго" #: src/audacious/ui_fileinfo.c:133 src/audacious/ui_fileinfo.c:135 msgid "Samba" -msgstr "" +msgstr "Самба" #: src/audacious/ui_fileinfo.c:133 src/audacious/ui_fileinfo.c:135 msgid "Folklore" -msgstr "" +msgstr "Фолклор" #: src/audacious/ui_fileinfo.c:133 src/audacious/ui_fileinfo.c:135 msgid "Ballad" -msgstr "" +msgstr "Балада" #: src/audacious/ui_fileinfo.c:133 src/audacious/ui_fileinfo.c:135 msgid "Power Ballad" -msgstr "" +msgstr "Бржа балада" #: src/audacious/ui_fileinfo.c:136 msgid "Rhythmic Soul" -msgstr "" +msgstr "Ритмични соул" #: src/audacious/ui_fileinfo.c:136 msgid "Freestyle" -msgstr "" +msgstr "Фристајл" #: src/audacious/ui_fileinfo.c:136 -#, fuzzy msgid "Duet" -msgstr "Холандски:" +msgstr "Дует" #: src/audacious/ui_fileinfo.c:137 msgid "Punk Rock" -msgstr "" +msgstr "Панк рок" #: src/audacious/ui_fileinfo.c:137 msgid "Drum Solo" -msgstr "" +msgstr "Соло бубњеви" #: src/audacious/ui_fileinfo.c:137 msgid "A Cappella" -msgstr "" +msgstr "Капела" #: src/audacious/ui_fileinfo.c:138 msgid "Euro-House" -msgstr "" +msgstr "Еуро-Хаус" #: src/audacious/ui_fileinfo.c:138 msgid "Dance Hall" -msgstr "" +msgstr "Денс" #: src/audacious/ui_fileinfo.c:138 msgid "Goa" -msgstr "" +msgstr "Гоа" #: src/audacious/ui_fileinfo.c:139 msgid "Drum & Bass" -msgstr "" +msgstr "Драменбес" #: src/audacious/ui_fileinfo.c:139 msgid "Club-House" -msgstr "" +msgstr "Клаб-Хаус" #: src/audacious/ui_fileinfo.c:139 msgid "Hardcore" -msgstr "" +msgstr "Хардкор" #: src/audacious/ui_fileinfo.c:140 -#, fuzzy msgid "Terror" -msgstr "Нула" +msgstr "Терор" #: src/audacious/ui_fileinfo.c:140 -#, fuzzy msgid "Indie" -msgstr "Укључи:" +msgstr "Инди" #: src/audacious/ui_fileinfo.c:140 msgid "BritPop" -msgstr "" +msgstr "БритПоп" #: src/audacious/ui_fileinfo.c:140 msgid "Negerpunk" -msgstr "" +msgstr "Нигерпанк" #: src/audacious/ui_fileinfo.c:141 msgid "Polsk Punk" -msgstr "" +msgstr "Пољски панк" #: src/audacious/ui_fileinfo.c:141 -#, fuzzy msgid "Beat" -msgstr "Понови" +msgstr "Бит" #: src/audacious/ui_fileinfo.c:141 msgid "Christian Gangsta Rap" -msgstr "" +msgstr "Хришћански гангстерски реп" #: src/audacious/ui_fileinfo.c:142 msgid "Heavy Metal" -msgstr "" +msgstr "Хеви метал" #: src/audacious/ui_fileinfo.c:142 msgid "Black Metal" -msgstr "" +msgstr "Црни метал" #: src/audacious/ui_fileinfo.c:142 msgid "Crossover" -msgstr "" +msgstr "Прелазна" #: src/audacious/ui_fileinfo.c:143 msgid "Contemporary Christian" -msgstr "" +msgstr "Савремена хришћанска" #: src/audacious/ui_fileinfo.c:143 msgid "Christian Rock" -msgstr "" +msgstr "Хришћански рок" #: src/audacious/ui_fileinfo.c:144 msgid "Merengue" -msgstr "" +msgstr "Мирингва" #: src/audacious/ui_fileinfo.c:144 msgid "Salsa" -msgstr "" +msgstr "Салса" #: src/audacious/ui_fileinfo.c:144 msgid "Thrash Metal" -msgstr "" +msgstr "Треш метал" #: src/audacious/ui_fileinfo.c:145 msgid "Anime" -msgstr "" +msgstr "Аниме" #: src/audacious/ui_fileinfo.c:145 msgid "JPop" -msgstr "" +msgstr "ЏејПоп" #: src/audacious/ui_fileinfo.c:145 -#, fuzzy msgid "Synthpop" -msgstr "Заустави" +msgstr "Синтпоп" #: src/audacious/ui_fileinfo.c:223 src/audacious/ui_fileinfo.c:555 #: src/audacious/ui_fileinfo.c:558 src/audacious/ui_fileinfo.c:561 @@ -1156,18 +1126,16 @@ msgstr "Локација" #: src/audacious/ui_fileinfo.c:708 -#, fuzzy msgid "Raw Metadata" -msgstr "Година" +msgstr "Сирови метаподаци" #: src/audacious/ui_fileinfo.c:725 msgid "Key" -msgstr "" +msgstr "Кључ" #: src/audacious/ui_fileinfo.c:738 -#, fuzzy msgid "Value" -msgstr "Плаво" +msgstr "Вредност" #: src/audacious/ui_fileinfo.c:826 #, c-format @@ -1740,8 +1708,7 @@ msgid "" "Searches the playlist and selects playlist entries based on specific " "criteria." -msgstr "" -"Претржује листу нумера и означи ставке листе нумера по одређеном критеријуму." +msgstr "Претржује листу нумера и означи ставке листе нумера по одређеном критеријуму." #: src/audacious/ui_manager.c:256 msgid "Invert Selection" @@ -2290,8 +2257,7 @@ #: src/audacious/ui_preferences.c:204 msgid "This enables the window manager to show decorations for windows." -msgstr "" -"Ово омогућава програму за управљањe прозорима да прикаже украсе на прозорима." +msgstr "Ово омогућава програму за управљањe прозорима да прикаже украсе на прозорима." #: src/audacious/ui_preferences.c:205 msgid "Use XMMS-style file selector instead of the default selector" @@ -2422,8 +2388,7 @@ #: src/audacious/ui_preferences.c:237 msgid "Load metadata when adding the file to the playlist or opening it" -msgstr "" -"Учитај мета-податке при додавању датотеке у листу или приликом отварања" +msgstr "Учитај мета-податке при додавању датотеке у листу или приликом отварања" #: src/audacious/ui_preferences.c:238 msgid "On display" @@ -2880,3 +2845,4 @@ #: src/audacious/ui_urlopener.c:86 msgid "Add/Open URL Dialog" msgstr "Оквир додај/отвори URL" + diff -r 6e269660fbc3 -r cc565360e405 po/sr@Latn.po --- a/po/sr@Latn.po Mon Jan 21 10:09:35 2008 -0600 +++ b/po/sr@Latn.po Mon Jan 21 10:10:02 2008 -0600 @@ -1,4 +1,4 @@ -# translation of sr@Latn.po to +# translation of audacious.pot to Serbian Latin # Strahinja Kustudic , 2007, 2008. # Copyright (C) 2007 Strahinja Kustudić # This file is distributed under the same license as the Audacious package. @@ -7,13 +7,12 @@ "Project-Id-Version: sr@Latn\n" "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n" "POT-Creation-Date: 2008-01-10 15:53+0100\n" -"PO-Revision-Date: 2008-01-03 10:41+0100\n" +"PO-Revision-Date: 2008-01-20 20:16+0100\n" "Last-Translator: Strahinja Kustudic \n" -"Language-Team: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" #: src/audacious/input.c:638 #, c-format @@ -265,7 +264,7 @@ msgstr " (neispravan UTF-8)" #: src/audacious/ui_about.c:46 -#, fuzzy, c-format +#, c-format msgid "" "Audacious %s\n" "\n" @@ -273,7 +272,7 @@ msgstr "" "Audacious %s\n" "\n" -"Sva prava zadržana, 2005-2007 Audacious Razvojni Tim" +"Sva prava zadržana, 2005-2008 Audacious Razvojni Tim" #: src/audacious/ui_about.c:125 src/audacious/ui_credits.c:363 #: src/audacious/ui_manager.c:391 src/audacious/ui_manager.c:392 @@ -285,7 +284,7 @@ msgstr "Zasluge" #: src/audacious/ui_credits.c:47 -#, fuzzy, c-format +#, c-format msgid "" "Audacious %s\n" "A skinned multimedia player for many platforms.\n" @@ -295,7 +294,7 @@ "Audacious %s\n" "Maskirani multimedijalni plejer za više platformi.\n" "\n" -"Sva prava zadržana, 2005-2007 Audacious Razvojni Tim\n" +"Sva prava zadržana, 2005-2008 Audacious Razvojni Tim\n" #: src/audacious/ui_credits.c:53 msgid "Audacious core developers:" @@ -470,625 +469,596 @@ msgstr "Pretpodešavanja" #: src/audacious/ui_fileinfo.c:101 -#, fuzzy msgid "Blues" -msgstr "Plavo" +msgstr "Bluz" #: src/audacious/ui_fileinfo.c:101 msgid "Classic Rock" -msgstr "" +msgstr "Klasični rok" #: src/audacious/ui_fileinfo.c:101 msgid "Country" -msgstr "" +msgstr "Kantri" #: src/audacious/ui_fileinfo.c:101 -#, fuzzy msgid "Dance" -msgstr "Datum" +msgstr "Dens" #: src/audacious/ui_fileinfo.c:102 msgid "Disco" -msgstr "" +msgstr "Disko" #: src/audacious/ui_fileinfo.c:102 msgid "Funk" -msgstr "" +msgstr "Fanki" #: src/audacious/ui_fileinfo.c:102 msgid "Grunge" -msgstr "" +msgstr "Grandž" #: src/audacious/ui_fileinfo.c:102 msgid "Hip-Hop" -msgstr "" +msgstr "Hip Hop" #: src/audacious/ui_fileinfo.c:103 msgid "Jazz" -msgstr "" +msgstr "Džez" #: src/audacious/ui_fileinfo.c:103 msgid "Metal" -msgstr "" +msgstr "Metal" #: src/audacious/ui_fileinfo.c:103 msgid "New Age" -msgstr "" +msgstr "Nju Ejdž" #: src/audacious/ui_fileinfo.c:103 -#, fuzzy msgid "Oldies" -msgstr "linije" +msgstr "Evergrin" #: src/audacious/ui_fileinfo.c:104 msgid "Other" -msgstr "" +msgstr "Ostalo" #: src/audacious/ui_fileinfo.c:104 msgid "Pop" -msgstr "" +msgstr "Pop" #: src/audacious/ui_fileinfo.c:104 msgid "R&B" -msgstr "" +msgstr "R&B" #: src/audacious/ui_fileinfo.c:104 msgid "Rap" -msgstr "" +msgstr "Rep" #: src/audacious/ui_fileinfo.c:104 -#, fuzzy msgid "Reggae" -msgstr "_Preimenuj" +msgstr "Rege" #: src/audacious/ui_fileinfo.c:105 msgid "Rock" -msgstr "" +msgstr "Rok" #: src/audacious/ui_fileinfo.c:105 msgid "Techno" -msgstr "" +msgstr "Tehno" #: src/audacious/ui_fileinfo.c:105 msgid "Industrial" -msgstr "" +msgstr "Industrija" #: src/audacious/ui_fileinfo.c:105 msgid "Alternative" -msgstr "" +msgstr "Alternativa" #: src/audacious/ui_fileinfo.c:106 msgid "Ska" -msgstr "" +msgstr "Ska" #: src/audacious/ui_fileinfo.c:106 msgid "Death Metal" -msgstr "" +msgstr "Det metal" #: src/audacious/ui_fileinfo.c:106 -#, fuzzy msgid "Pranks" -msgstr "Vrhovi" +msgstr "Pranks" #: src/audacious/ui_fileinfo.c:106 msgid "Soundtrack" -msgstr "" +msgstr "Tema iz filma" #: src/audacious/ui_fileinfo.c:107 msgid "Euro-Techno" -msgstr "" +msgstr "Euro-Tehno" #: src/audacious/ui_fileinfo.c:107 msgid "Ambient" -msgstr "" +msgstr "Ambijentalna" #: src/audacious/ui_fileinfo.c:107 msgid "Trip-Hop" -msgstr "" +msgstr "Trip-Hop" #: src/audacious/ui_fileinfo.c:107 msgid "Vocal" -msgstr "" +msgstr "Vokal" #: src/audacious/ui_fileinfo.c:108 msgid "Jazz+Funk" -msgstr "" +msgstr "Džez i Fanki" #: src/audacious/ui_fileinfo.c:108 -#, fuzzy msgid "Fusion" -msgstr "Ruski" +msgstr "Fuzija" #: src/audacious/ui_fileinfo.c:108 -#, fuzzy msgid "Trance" -msgstr "Izgled" +msgstr "Trens" #: src/audacious/ui_fileinfo.c:108 msgid "Classical" -msgstr "" +msgstr "Klasična" #: src/audacious/ui_fileinfo.c:109 msgid "Instrumental" -msgstr "" +msgstr "Instrumental" #: src/audacious/ui_fileinfo.c:109 msgid "Acid" -msgstr "" +msgstr "Acid" #: src/audacious/ui_fileinfo.c:109 -#, fuzzy msgid "House" -msgstr "Miš" +msgstr "Haus" #: src/audacious/ui_fileinfo.c:109 msgid "Game" -msgstr "" +msgstr "Muzika iz igre" #: src/audacious/ui_fileinfo.c:110 msgid "Sound Clip" -msgstr "" +msgstr "Tonski zapis" #: src/audacious/ui_fileinfo.c:110 msgid "Gospel" -msgstr "" +msgstr "Verska" #: src/audacious/ui_fileinfo.c:110 -#, fuzzy msgid "Noise" -msgstr "Nijedan" +msgstr "Šum" #: src/audacious/ui_fileinfo.c:110 msgid "AlternRock" -msgstr "" +msgstr "AlternRok" #: src/audacious/ui_fileinfo.c:111 -#, fuzzy msgid "Bass" -msgstr "Trake" +msgstr "Bas" #: src/audacious/ui_fileinfo.c:111 msgid "Soul" -msgstr "" +msgstr "Soul" #: src/audacious/ui_fileinfo.c:111 msgid "Punk" -msgstr "" +msgstr "Pank" #: src/audacious/ui_fileinfo.c:111 -#, fuzzy msgid "Space" -msgstr "Sačuvati" +msgstr "Spejs" #: src/audacious/ui_fileinfo.c:112 msgid "Meditative" -msgstr "" +msgstr "Meditaciona" #: src/audacious/ui_fileinfo.c:112 msgid "Instrumental Pop" -msgstr "" +msgstr "Instrumentalni pop" #: src/audacious/ui_fileinfo.c:113 msgid "Instrumental Rock" -msgstr "" +msgstr "Instrumentalni rok" #: src/audacious/ui_fileinfo.c:113 msgid "Ethnic" -msgstr "" +msgstr "Etno" #: src/audacious/ui_fileinfo.c:113 msgid "Gothic" -msgstr "" +msgstr "Gotska" #: src/audacious/ui_fileinfo.c:114 msgid "Darkwave" -msgstr "" +msgstr "Crni talas" #: src/audacious/ui_fileinfo.c:114 msgid "Techno-Industrial" -msgstr "" +msgstr "Tehno-Industrija" #: src/audacious/ui_fileinfo.c:114 msgid "Electronic" -msgstr "" +msgstr "Elektronska" #: src/audacious/ui_fileinfo.c:115 msgid "Pop-Folk" -msgstr "" +msgstr "Pop-Folk" #: src/audacious/ui_fileinfo.c:115 msgid "Eurodance" -msgstr "" +msgstr "Eurodens" #: src/audacious/ui_fileinfo.c:115 msgid "Dream" -msgstr "" +msgstr "Drim" #: src/audacious/ui_fileinfo.c:116 msgid "Southern Rock" -msgstr "" +msgstr "Južnjački rok" #: src/audacious/ui_fileinfo.c:116 -#, fuzzy msgid "Comedy" -msgstr "Komentar" +msgstr "Komedija" #: src/audacious/ui_fileinfo.c:116 -#, fuzzy msgid "Cult" -msgstr "Sopstveni" +msgstr "Kultna" #: src/audacious/ui_fileinfo.c:117 msgid "Gangsta Rap" -msgstr "" +msgstr "Gangsterski rep" #: src/audacious/ui_fileinfo.c:117 msgid "Top 40" -msgstr "" +msgstr "Najpolularnijih 40" #: src/audacious/ui_fileinfo.c:117 msgid "Christian Rap" -msgstr "" +msgstr "Hrišćanski rep" #: src/audacious/ui_fileinfo.c:118 msgid "Pop/Funk" -msgstr "" +msgstr "Pop/Fanki" #: src/audacious/ui_fileinfo.c:118 msgid "Jungle" -msgstr "" +msgstr "Džangl" #: src/audacious/ui_fileinfo.c:118 msgid "Native American" -msgstr "" +msgstr "Tradicionalna američka" #: src/audacious/ui_fileinfo.c:119 msgid "Cabaret" -msgstr "" +msgstr "Kabare" #: src/audacious/ui_fileinfo.c:119 msgid "New Wave" -msgstr "" +msgstr "Novi talas" #: src/audacious/ui_fileinfo.c:119 msgid "Psychedelic" -msgstr "" +msgstr "Psihodelično" #: src/audacious/ui_fileinfo.c:119 -#, fuzzy msgid "Rave" -msgstr "Sačuvati" +msgstr "Rejv" #: src/audacious/ui_fileinfo.c:120 -#, fuzzy msgid "Showtunes" -msgstr "Najsporiji" +msgstr "Muzika iz predstave" #: src/audacious/ui_fileinfo.c:120 -#, fuzzy msgid "Trailer" -msgstr "Naslov" +msgstr "Trejler" #: src/audacious/ui_fileinfo.c:120 msgid "Lo-Fi" -msgstr "" +msgstr "Lo-Fi" #: src/audacious/ui_fileinfo.c:120 msgid "Tribal" -msgstr "" +msgstr "Plemenska" #: src/audacious/ui_fileinfo.c:121 msgid "Acid Punk" -msgstr "" +msgstr "Acid pank" #: src/audacious/ui_fileinfo.c:121 msgid "Acid Jazz" -msgstr "" +msgstr "Acid džez" #: src/audacious/ui_fileinfo.c:121 -#, fuzzy msgid "Polka" -msgstr "Pusti" +msgstr "Polka" #: src/audacious/ui_fileinfo.c:121 -#, fuzzy msgid "Retro" -msgstr "Nula" +msgstr "Retro" #: src/audacious/ui_fileinfo.c:122 msgid "Musical" -msgstr "" +msgstr "Muzička" #: src/audacious/ui_fileinfo.c:122 msgid "Rock & Roll" -msgstr "" +msgstr "Rokenrol" #: src/audacious/ui_fileinfo.c:122 msgid "Hard Rock" -msgstr "" +msgstr "Hard rok" #: src/audacious/ui_fileinfo.c:122 msgid "Folk" -msgstr "" +msgstr "Narodna" #: src/audacious/ui_fileinfo.c:123 msgid "Folk/Rock" -msgstr "" +msgstr "Narodna/Rok" #: src/audacious/ui_fileinfo.c:123 msgid "National Folk" -msgstr "" +msgstr "Nacionalna" #: src/audacious/ui_fileinfo.c:123 msgid "Swing" -msgstr "" +msgstr "Sving" #: src/audacious/ui_fileinfo.c:124 msgid "Fast-Fusion" -msgstr "" +msgstr "Fast-Fjužn" #: src/audacious/ui_fileinfo.c:124 msgid "Bebob" -msgstr "" +msgstr "Bibop" #: src/audacious/ui_fileinfo.c:124 -#, fuzzy msgid "Latin" -msgstr "Linije" +msgstr "Latino" #: src/audacious/ui_fileinfo.c:124 msgid "Revival" -msgstr "" +msgstr "Oživljenje" #: src/audacious/ui_fileinfo.c:125 msgid "Celtic" -msgstr "" +msgstr "Keltska" #: src/audacious/ui_fileinfo.c:125 -#, fuzzy msgid "Bluegrass" -msgstr "Plavo" +msgstr "Blu-gras" #: src/audacious/ui_fileinfo.c:125 msgid "Avantgarde" -msgstr "" +msgstr "Avangardna" #: src/audacious/ui_fileinfo.c:126 msgid "Gothic Rock" -msgstr "" +msgstr "Gotski rok" #: src/audacious/ui_fileinfo.c:126 msgid "Progressive Rock" -msgstr "" +msgstr "Progresivni rok" #: src/audacious/ui_fileinfo.c:127 msgid "Psychedelic Rock" -msgstr "" +msgstr "Psihodelični rok" #: src/audacious/ui_fileinfo.c:127 msgid "Symphonic Rock" -msgstr "" +msgstr "Simfonijski rok" #: src/audacious/ui_fileinfo.c:127 -#, fuzzy msgid "Slow Rock" -msgstr "Spor" +msgstr "Lagani rok" #: src/audacious/ui_fileinfo.c:128 msgid "Big Band" -msgstr "" +msgstr "Big Bend" #: src/audacious/ui_fileinfo.c:128 msgid "Chorus" -msgstr "" +msgstr "Horska" #: src/audacious/ui_fileinfo.c:128 msgid "Easy Listening" -msgstr "" +msgstr "Laka za slušanje" #: src/audacious/ui_fileinfo.c:129 msgid "Acoustic" -msgstr "" +msgstr "Akuctična" #: src/audacious/ui_fileinfo.c:129 msgid "Humour" -msgstr "" +msgstr "Humor" #: src/audacious/ui_fileinfo.c:129 msgid "Speech" -msgstr "" +msgstr "Govor" #: src/audacious/ui_fileinfo.c:129 msgid "Chanson" -msgstr "" +msgstr "Šansona" #: src/audacious/ui_fileinfo.c:130 msgid "Opera" -msgstr "" +msgstr "Opera" #: src/audacious/ui_fileinfo.c:130 msgid "Chamber Music" -msgstr "" +msgstr "Kamerna muzika" #: src/audacious/ui_fileinfo.c:130 msgid "Sonata" -msgstr "" +msgstr "Sonata" #: src/audacious/ui_fileinfo.c:130 msgid "Symphony" -msgstr "" +msgstr "Simfonija" #: src/audacious/ui_fileinfo.c:131 msgid "Booty Bass" -msgstr "" +msgstr "Buti Bas" #: src/audacious/ui_fileinfo.c:131 -#, fuzzy msgid "Primus" -msgstr "Prethodna" +msgstr "Primus" #: src/audacious/ui_fileinfo.c:131 msgid "Porn Groove" -msgstr "" +msgstr "Erotska" #: src/audacious/ui_fileinfo.c:132 src/audacious/ui_fileinfo.c:134 -#, fuzzy msgid "Satire" -msgstr "Vatra" +msgstr "Satirična" #: src/audacious/ui_fileinfo.c:132 src/audacious/ui_fileinfo.c:134 -#, fuzzy msgid "Slow Jam" -msgstr "Spor" +msgstr "Lagani džem" #: src/audacious/ui_fileinfo.c:132 src/audacious/ui_fileinfo.c:134 msgid "Club" -msgstr "" +msgstr "Klubska" #: src/audacious/ui_fileinfo.c:132 src/audacious/ui_fileinfo.c:134 msgid "Tango" -msgstr "" +msgstr "Tango" #: src/audacious/ui_fileinfo.c:133 src/audacious/ui_fileinfo.c:135 msgid "Samba" -msgstr "" +msgstr "Samba" #: src/audacious/ui_fileinfo.c:133 src/audacious/ui_fileinfo.c:135 msgid "Folklore" -msgstr "" +msgstr "Folklor" #: src/audacious/ui_fileinfo.c:133 src/audacious/ui_fileinfo.c:135 msgid "Ballad" -msgstr "" +msgstr "Balada" #: src/audacious/ui_fileinfo.c:133 src/audacious/ui_fileinfo.c:135 msgid "Power Ballad" -msgstr "" +msgstr "Brža balada" #: src/audacious/ui_fileinfo.c:136 msgid "Rhythmic Soul" -msgstr "" +msgstr "Ritmični soul" #: src/audacious/ui_fileinfo.c:136 msgid "Freestyle" -msgstr "" +msgstr "Fristajl" #: src/audacious/ui_fileinfo.c:136 -#, fuzzy msgid "Duet" -msgstr "Holandski:" +msgstr "Duet" #: src/audacious/ui_fileinfo.c:137 msgid "Punk Rock" -msgstr "" +msgstr "Pank rok" #: src/audacious/ui_fileinfo.c:137 msgid "Drum Solo" -msgstr "" +msgstr "Solo bubnjevi" #: src/audacious/ui_fileinfo.c:137 msgid "A Cappella" -msgstr "" +msgstr "A Cappella" #: src/audacious/ui_fileinfo.c:138 msgid "Euro-House" -msgstr "" +msgstr "Euro-Haus" #: src/audacious/ui_fileinfo.c:138 msgid "Dance Hall" -msgstr "" +msgstr "Dens" #: src/audacious/ui_fileinfo.c:138 msgid "Goa" -msgstr "" +msgstr "Goa" #: src/audacious/ui_fileinfo.c:139 msgid "Drum & Bass" -msgstr "" +msgstr "Dramenbes" #: src/audacious/ui_fileinfo.c:139 msgid "Club-House" -msgstr "" +msgstr "Klab-Haus" #: src/audacious/ui_fileinfo.c:139 msgid "Hardcore" -msgstr "" +msgstr "Hardkor" #: src/audacious/ui_fileinfo.c:140 -#, fuzzy msgid "Terror" -msgstr "Nula" +msgstr "Teror" #: src/audacious/ui_fileinfo.c:140 -#, fuzzy msgid "Indie" -msgstr "Uključi:" +msgstr "Indi" #: src/audacious/ui_fileinfo.c:140 msgid "BritPop" -msgstr "" +msgstr "BritPop" #: src/audacious/ui_fileinfo.c:140 msgid "Negerpunk" -msgstr "" +msgstr "Nigerpank" #: src/audacious/ui_fileinfo.c:141 msgid "Polsk Punk" -msgstr "" +msgstr "Poljsk pank" #: src/audacious/ui_fileinfo.c:141 -#, fuzzy msgid "Beat" -msgstr "Ponovi" +msgstr "Bit" #: src/audacious/ui_fileinfo.c:141 msgid "Christian Gangsta Rap" -msgstr "" +msgstr "Hrišćanski gangsterski rep" #: src/audacious/ui_fileinfo.c:142 msgid "Heavy Metal" -msgstr "" +msgstr "Hevi metal" #: src/audacious/ui_fileinfo.c:142 msgid "Black Metal" -msgstr "" +msgstr "Crni metal" #: src/audacious/ui_fileinfo.c:142 msgid "Crossover" -msgstr "" +msgstr "Prelazna" #: src/audacious/ui_fileinfo.c:143 msgid "Contemporary Christian" -msgstr "" +msgstr "Savremena hrišćanska" #: src/audacious/ui_fileinfo.c:143 msgid "Christian Rock" -msgstr "" +msgstr "Hrišćanski rok" #: src/audacious/ui_fileinfo.c:144 msgid "Merengue" -msgstr "" +msgstr "Miringva" #: src/audacious/ui_fileinfo.c:144 msgid "Salsa" -msgstr "" +msgstr "Salsa" #: src/audacious/ui_fileinfo.c:144 msgid "Thrash Metal" -msgstr "" +msgstr "Threš metal" #: src/audacious/ui_fileinfo.c:145 msgid "Anime" -msgstr "" +msgstr "Anime" #: src/audacious/ui_fileinfo.c:145 msgid "JPop" -msgstr "" +msgstr "DžejPop" #: src/audacious/ui_fileinfo.c:145 -#, fuzzy msgid "Synthpop" -msgstr "Zaustavi" +msgstr "Sintpop" #: src/audacious/ui_fileinfo.c:223 src/audacious/ui_fileinfo.c:555 #: src/audacious/ui_fileinfo.c:558 src/audacious/ui_fileinfo.c:561 @@ -1156,18 +1126,16 @@ msgstr "Lokacija" #: src/audacious/ui_fileinfo.c:708 -#, fuzzy msgid "Raw Metadata" -msgstr "Godina" +msgstr "Sirovi metapodaci" #: src/audacious/ui_fileinfo.c:725 msgid "Key" -msgstr "" +msgstr "Ključ" #: src/audacious/ui_fileinfo.c:738 -#, fuzzy msgid "Value" -msgstr "Plavo" +msgstr "Vrednost" #: src/audacious/ui_fileinfo.c:826 #, c-format @@ -2425,8 +2393,7 @@ #: src/audacious/ui_preferences.c:237 msgid "Load metadata when adding the file to the playlist or opening it" -msgstr "" -"Učitaj meta-podatke pri dodavanju datoteke u listu ili prilikom otvaranja" +msgstr "Učitaj meta-podatke pri dodavanju datoteke u listu ili prilikom otvaranja" #: src/audacious/ui_preferences.c:238 msgid "On display" @@ -2884,3 +2851,4 @@ #: src/audacious/ui_urlopener.c:86 msgid "Add/Open URL Dialog" msgstr "Dodaj/otvori URL okvir" + diff -r 6e269660fbc3 -r cc565360e405 src/audacious/main.c --- a/src/audacious/main.c Mon Jan 21 10:09:35 2008 -0600 +++ b/src/audacious/main.c Mon Jan 21 10:10:02 2008 -0600 @@ -102,6 +102,7 @@ gboolean enqueue_to_temp; gboolean version; gchar *previous_session_id; + gboolean macpack; }; typedef struct _BmpCmdLineOpt BmpCmdLineOpt; @@ -1031,6 +1032,9 @@ {"headless", 'H', 0, G_OPTION_ARG_NONE, &options.headless, N_("Enable headless operation"), NULL}, {"no-log", 'N', 0, G_OPTION_ARG_NONE, &options.no_log, N_("Print all errors and warnings to stdout"), NULL}, {"version", 'v', 0, G_OPTION_ARG_NONE, &options.version, N_("Show version and builtin features"), NULL}, + #ifdef GDK_WINDOWING_QUARTZ + {"macpack", 'n', 0, G_OPTION_ARG_NONE, &options.macpack, N_("Used in macpacking"), NULL}, /* Make this hidden */ + #endif {G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &options.filenames, N_("FILE..."), NULL}, {NULL}, }; diff -r 6e269660fbc3 -r cc565360e405 src/audacious/skin.c --- a/src/audacious/skin.c Mon Jan 21 10:09:35 2008 -0600 +++ b/src/audacious/skin.c Mon Jan 21 10:10:02 2008 -0600 @@ -1830,16 +1830,14 @@ { gint i; GdkPixbuf *pixbuf; - GdkImage *img; SkinPixmap *eqmainpm; - GdkPixmap *pixmap; - GdkGC *gc; - + guchar* pixels,*p; + guint rowstride, n_channels; g_return_if_fail(skin != NULL); eqmainpm = &skin->pixmaps[SKIN_EQMAIN]; if (eqmainpm->pixbuf && - eqmainpm->current_width >= 116 && eqmainpm->current_height >= 313) + eqmainpm->current_width >= 116 && eqmainpm->current_height >= 313) pixbuf = eqmainpm->pixbuf; else return; @@ -1847,24 +1845,16 @@ if (!GDK_IS_PIXBUF(pixbuf)) return; - pixmap = gdk_pixmap_new(NULL, eqmainpm->current_width, eqmainpm->current_height, - gdk_rgb_get_visual()->depth); - gc = gdk_gc_new(pixmap); - gdk_draw_pixbuf(pixmap, gc, pixbuf, 0, 0, 0, 0, eqmainpm->current_width, eqmainpm->current_height, - GDK_RGB_DITHER_MAX, 0, 0); - - if (!(img = gdk_drawable_get_image(pixmap, 115, 294, 1, 19))) { - g_object_unref(gc); - g_object_unref(pixmap); - return; + pixels = gdk_pixbuf_get_pixels (pixbuf); + rowstride = gdk_pixbuf_get_rowstride (pixbuf); + n_channels = gdk_pixbuf_get_n_channels (pixbuf); + for (i = 0; i < 19; i++) + { + p = pixels + rowstride * (i + 294) + 115 * n_channels; + colors[i] = (p[0] << 16) | (p[1] << 8) | p[2]; + if(n_channels == 4) /* should we really treat the Alpha channel? */ + colors[i]= (colors[i] << 8) | p[3]; } - - for (i = 0; i < 19; i++) - colors[i] = gdk_image_get_pixel(img, 0, i); - - g_object_unref(img); - g_object_unref(gc); - g_object_unref(pixmap); } diff -r 6e269660fbc3 -r cc565360e405 src/audacious/strings.c --- a/src/audacious/strings.c Mon Jan 21 10:09:35 2008 -0600 +++ b/src/audacious/strings.c Mon Jan 21 10:10:02 2008 -0600 @@ -149,7 +149,8 @@ gboolean str_has_prefix_nocase(const gchar * str, const gchar * prefix) { - return (strncasecmp(str, prefix, strlen(prefix)) == 0); + /* strncasecmp causes segfaults when str is NULL*/ + return (str && (strncasecmp(str, prefix, strlen(prefix)) == 0)); } gboolean diff -r 6e269660fbc3 -r cc565360e405 src/audacious/ui_equalizer.c --- a/src/audacious/ui_equalizer.c Mon Jan 21 10:09:35 2008 -0600 +++ b/src/audacious/ui_equalizer.c Mon Jan 21 10:10:02 2008 -0600 @@ -770,27 +770,38 @@ import_winamp_eqf(VFSFile * file) { gchar header[31]; - gchar name[257]; + gchar *name; + gchar *filename; gchar bands[11]; gint i = 0; GList *list = NULL; EqualizerPreset *preset; vfs_fread(header, 1, 31, file); - if (!strncmp(header, "Winamp EQ library file v1.1", 27)) { - while (vfs_fread(name, 1, 257, file)) { - preset = equalizer_preset_new(name); - preset->preamp = 20.0 - ((bands[10] * 40.0) / 64); + if (!strncmp(header, "Winamp EQ library file v1.1", 27)) + { + + g_print("The EQF header is OK\n"); - vfs_fread(bands, 1, 11, file); + if(vfs_fseek(file, 0x120, SEEK_SET) == -1) + return NULL; + if(vfs_fread(bands, 1, 11, file) != 11) + return NULL; - for (i = 0; i < 10; i++) - preset->bands[i] = 20.0 - ((bands[i] * 40.0) / 64); + filename = g_filename_from_uri(file->uri,NULL,NULL); + name = g_path_get_basename(filename); + g_free(filename); + g_print("The preset name is '%s'\n", name); - list = g_list_prepend(list, preset); - } + preset = equalizer_preset_new(name); + g_free(name); + preset->preamp = 20.0 - ((bands[10] * 40.0) / 64.0); + + for (i = 0; i < 10; i++) + preset->bands[i] = 20.0 - ((bands[i] * 40.0) / 64.0); + + list = g_list_prepend(list, preset); } - list = g_list_reverse(list); return list; } @@ -806,18 +817,18 @@ if (!strncmp(header, "Winamp EQ library file v1.1", 27)) { /* Skip name */ - if (vfs_fseek(file, 257, SEEK_CUR) == -1) + if (vfs_fseek(file, 0x120, SEEK_SET) == -1) return; if (vfs_fread(bands, 1, 11, file) != 11) return; ui_skinned_equalizer_slider_set_position(equalizerwin_preamp, - 20.0 - ((bands[10] * 40.0) / 63.0)); + 20.0 - ((bands[10] * 40.0) / 64.0)); /*this was divided by 63, but shouldn't it be 64? --majeru*/ for (i = 0; i < 10; i++) ui_skinned_equalizer_slider_set_position(equalizerwin_bands[i], - 20.0 - ((bands[i] * 40.0) / 64.0)); + 20.0 - ((bands[i] * 40.0) / 64.0)); } equalizerwin_eq_changed(); @@ -1321,14 +1332,14 @@ action_equ_load_preset_file(void) { GtkWidget *dialog; - gchar *filename; + gchar *file_uri; dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - load_preset_file(filename); - g_free(filename); + file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog)); + load_preset_file(file_uri); + g_free(file_uri); } gtk_widget_destroy(dialog); } @@ -1337,14 +1348,14 @@ action_equ_load_preset_eqf(void) { GtkWidget *dialog; - gchar *filename; + gchar *file_uri; dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - load_winamp_file(filename); - g_free(filename); + file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog)); + load_winamp_file(file_uri); + g_free(file_uri); } gtk_widget_destroy(dialog); } @@ -1353,14 +1364,14 @@ action_equ_import_winamp_presets(void) { GtkWidget *dialog; - gchar *filename; + gchar *file_uri; dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - import_winamp_file(filename); - g_free(filename); + file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog)); + import_winamp_file(file_uri); + g_free(file_uri); } gtk_widget_destroy(dialog); } @@ -1420,16 +1431,16 @@ action_equ_save_preset_file(void) { GtkWidget *dialog; - gchar *filename; + gchar *file_uri; gchar *songname; Playlist *playlist = playlist_get_active(); dialog = make_filebrowser(Q_("Save equalizer preset"), TRUE); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - save_preset_file(filename); - g_free(filename); + file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog)); + save_preset_file(file_uri); + g_free(file_uri); } songname = playlist_get_filename(playlist, playlist_get_position(playlist)); @@ -1449,14 +1460,14 @@ action_equ_save_preset_eqf(void) { GtkWidget *dialog; - gchar *filename; + gchar *file_uri; dialog = make_filebrowser(Q_("Save equalizer preset"), TRUE); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - save_winamp_file(filename); - g_free(filename); + file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog)); + save_winamp_file(file_uri); + g_free(file_uri); } gtk_widget_destroy(dialog); } diff -r 6e269660fbc3 -r cc565360e405 src/audacious/ui_playlist.c --- a/src/audacious/ui_playlist.c Mon Jan 21 10:09:35 2008 -0600 +++ b/src/audacious/ui_playlist.c Mon Jan 21 10:10:02 2008 -0600 @@ -1145,6 +1145,7 @@ guint keyval; gboolean refresh = FALSE; + guint cur_pos; if (cfg.playlist_shaded) return FALSE; @@ -1235,6 +1236,12 @@ gtk_window_present(GTK_WINDOW(equalizerwin)); } break; + case GDK_space: + cur_pos=playlist_get_position(playlist); + UI_SKINNED_PLAYLIST(playlistwin_list)->first = + cur_pos - (UI_SKINNED_PLAYLIST(playlistwin_list)->num_visible >> 1); + refresh = TRUE; + break; default: return FALSE; }