Mercurial > audlegacy
changeset 3904:086b94f5b96f
Automated merge with ssh://hg.atheme.org//hg/audacious
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Tue, 06 Nov 2007 12:39:15 -0600 (2007-11-06) |
parents | 134cc28dc468 (current diff) 7d5c7b49aa03 (diff) |
children | c79bf496191f |
files | |
diffstat | 9 files changed, 150 insertions(+), 258 deletions(-) [+] |
line wrap: on
line diff
--- a/po/ru.po Tue Nov 06 12:38:53 2007 -0600 +++ b/po/ru.po Tue Nov 06 12:39:15 2007 -0600 @@ -1,22 +1,26 @@ # Russian translation for Audacious. # Copyright (C) 2006,2007 Alexander Orlov <alxorlov@pochta.ru> # This file is distributed under the same license as the Audacious package. -# Alexander Orlov <alxorlov@pochta.ru>, 2007. # # �舒 仂�仆仂于� 于亰�� 仗亠�亠于仂亟 �亳�舒仍亳� �亳仗舒�仂于舒 亟仍� BMP. # 丕仍���亠仆亳� 仗亠�亠于仂亟舒 仗�亳于亠���于����� :) # +# Alexander Orlov <alxorlov@pochta.ru>, 2007. +# Vitaly Lipatov <lav@etersoft.ru>, 2007. +# msgid "" msgstr "" -"Project-Id-Version: audacious 1.3\n" +"Project-Id-Version: audacious 1.4\n" "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n" "POT-Creation-Date: 2007-10-13 14:15+0200\n" -"PO-Revision-Date: 2007-04-12 21:52+0300\n" -"Last-Translator: Alexander Orlov <alxorlov@pochta.ru>\n" +"PO-Revision-Date: 2007-11-02 02:05+0300\n" +"Last-Translator: Vitaly Lipatov <lav@etersoft.ru>\n" "Language-Team: none\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" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/audacious/glade.c:45 #, c-format @@ -47,7 +51,7 @@ #: src/audacious/glade/fileinfo.glade:255 msgid "<span size=\"small\">Comment</span>" -msgstr "<span size=\"small\"><b>�仂仄亠仆�舒�亳亳</b></span>" +msgstr "<span size=\"small\"><b>�仂仄仄亠仆�舒�亳亳</b></span>" #: src/audacious/glade/fileinfo.glade:313 msgid "<span size=\"small\">Genre</span>" @@ -130,9 +134,8 @@ msgstr "��弍仂� ��亳��舒 亟仍� 亞仍舒于仆仂亞仂 仂从仆舒" #: src/audacious/glade/prefswin.glade:1072 -#, fuzzy msgid "Select playlist font:" -msgstr "��弍仂� ��亳��舒 亟仍� 亞仍舒于仆仂亞仂 仂从仆舒" +msgstr "��弍仂� ��亳��舒 亟仍� �仗亳�从舒 于仂�仗�仂亳亰于亠亟亠仆亳�" #: src/audacious/glade/prefswin.glade:1112 msgid "" @@ -189,10 +192,12 @@ "If selected, the file information text in the main window will scroll back " "and forth. If not selected, the text will only scroll in one direction." msgstr "" +"��仍亳 于�弍�舒仆仂, �亠从��仂于舒� 亳仆�仂�仄舒�亳� 仂 �舒亶仍亠 于 亞仍舒于仆仂仄 仂从仆亠 弍�亟亠� 仗�仂从���亳于舒���� 于亰舒亟 亳 于仗亠��亟. " +"��仍亳 仆亠 于�弍�舒仆仂, �亠从�� 仗�仂从���亳于舒亠��� �仂仍�从仂 于 仂亟仆仂仄 仆舒仗�舒于仍亠仆亳亳." #: src/audacious/glade/prefswin.glade:1380 msgid "Use two-way text scroller" -msgstr "" +msgstr "�于�仆舒仗�舒于仍亠仆仆舒� 仗�仂从���从舒 �亠从��舒" #: src/audacious/glade/prefswin.glade:1422 src/audacious/ui_preferences.c:111 msgid "Appearance" @@ -306,7 +311,7 @@ #: src/audacious/glade/prefswin.glade:2191 msgid "Always refresh directory when opening file dialog" -msgstr "��亠于亞亟舒 仂弍仆仂于仍��� 从舒�舒仍仂亞 仗�亳 仂�从���亳亳 仂从仆舒 于�弍仂�舒 �舒亶仍仂于" +msgstr "��亠亞亟舒 仂弍仆仂于仍��� 从舒�舒仍仂亞 仗�亳 仂�从���亳亳 仂从仆舒 于�弍仂�舒 �舒亶仍仂于" #: src/audacious/glade/prefswin.glade:2225 msgid "<b>Song Display</b>" @@ -434,7 +439,6 @@ msgstr "�舒亰仄亠� 弍��亠�舒:" #: src/audacious/glade/prefswin.glade:3593 -#, fuzzy msgid "" "<span size=\"small\">This is the amount of time to prebuffer audio streams " "by, in milliseconds.\n" @@ -445,7 +449,7 @@ "<span size=\"small\">亅�仂 于�亠仄� 仗�亠亟于舒�亳�亠仍�仆仂亶 弍��亠�亳亰舒�亳亳 亰于�从仂于�� 仗仂�仂从仂于, " "于 仄亳仍仍亳�亠从�仆亟舒�.\n" "丕于亠仍亳���亠 ��仂 亰仆舒�亠仆亳亠, 亠�仍亳 仗�亳 仗�仂亳亞��于舒仆亳亳 亰于�从 仗�亠��于舒亠���. \n" -"丕��亳�亠, ��仂 仗�亳 �仍亳�从仂仄 弍仂仍��亳� 亰仆舒�亠仆亳�� Audacious 弍�亟亠� �舒弍仂�舒�� 仄亠亟仍亠仆仆仂." +"丕��亳�亠, ��仂 仗�亳 �仍亳�从仂仄 弍仂仍��亳� 亰仆舒�亠仆亳�� Audacious 弍�亟亠� �舒弍仂�舒�� 亰舒仄亠亟仍亠仆仆仂." "</span>" #: src/audacious/glade/prefswin.glade:3663 @@ -531,11 +535,11 @@ #: src/audacious/glade/prefswin.glade:4249 msgid "<b>Sampling Rate Converter</b>" -msgstr "" +msgstr "<b>��亠仂弍�舒亰仂于舒仆亳亠 �舒��仂�� 亟亳�从�亠�亳亰舒�亳亳</b>" #: src/audacious/glade/prefswin.glade:4289 msgid "Enable Sampling Rate Converter" -msgstr "" +msgstr "�从仍��亳�� 仗�亠仂弍�舒亰仂于舒仆亳亠 �舒��仂�� 亟亳�从�亠�亳亰舒�亳亳" #: src/audacious/glade/prefswin.glade:4338 msgid "" @@ -548,7 +552,7 @@ #: src/audacious/glade/prefswin.glade:4361 msgid "Interpolation Engine:" -msgstr "" +msgstr "�仍亞仂�亳�仄 亳仆�亠�仗仂仍��亳亳:" #: src/audacious/glade/prefswin.glade:4389 msgid "" @@ -556,30 +560,34 @@ "This should be the max supported sampling rate of\n" "the sound card or output plugin.</span>" msgstr "" +"<span size=\"small\">��亠 仗仂�仂从亳 弍�亟�� 仗�亠仂弍�舒亰仂于舒仆� 从 ��仂亶 �舒��仂�亠\n" +"亟亳�从�亠�亳亰舒�亳亳, 从仂�仂�舒� 亟仂仍亢仆舒 弍��� 仄舒从�亳仄舒仍�仆仂亶 仗仂亟亟亠�亢亳于舒亠仄仂亶\n" +"�舒��仂�仂亶 亰于�从仂于仂亶 从舒��� 亳仍亳 于��仂亟仆仂亞仂 仄仂亟�仍�.</span>" #: src/audacious/glade/prefswin.glade:4461 msgid "Sampling Rate [Hz]:" -msgstr "" +msgstr "丼舒��仂�舒 亟亳�从�亠�亳亰舒�亳亳 [��]:" #: src/audacious/glade/prefswin.glade:4517 -#, fuzzy msgid "<b>Volume Control</b>" -msgstr "<b>�仂仍亠�仂 仄��亳</b>" +msgstr "<b>�亠亞�仍亳�仂于从舒 亞�仂仄从仂��亳</b>" #: src/audacious/glade/prefswin.glade:4556 msgid "" "Use software volume control. This may be useful for situations where your " "audio system does not support controlling the playback volume." msgstr "" +"��仗仂仍�亰仂于舒�� 仗�仂亞�舒仄仄仆仂亠 �仗�舒于仍亠仆亳亠 亞�仂仄从仂����. " +"亅�仂 仄仂亢亠� 弍��� 仗仂仍亠亰仆仂, 亠�仍亳 于舒�舒 亰于�从仂于舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� " +"�仗�舒于仍亠仆亳亠 亞�仂仄从仂���� 于仂�仗�仂亳亰于亠亟亠仆亳�." #: src/audacious/glade/prefswin.glade:4558 msgid "Use software volume control" -msgstr "" +msgstr "��仂亞�舒仄仄仆舒� �亠亞�仍亳�仂于从舒 亞�仂仄从仂��亳" #: src/audacious/glade/prefswin.glade:4746 -#, fuzzy msgid "Reload Plugins" -msgstr "�仂亟�仍亳" +msgstr "�亠�亠亰舒亞��亰亳�� 仄仂亟�仍亳" #: src/audacious/glade/prefswin.glade:4807 msgid "Popup Information Settings" @@ -693,7 +701,7 @@ #: src/audacious/main.c:1066 msgid "Skip backwards in playlist" -msgstr "�亠�亠亶�亳 从 仗�亠亟�亟��亠亶 仗亠�仆亠 于 �仗亳�从亠 仗亠�亠仆" +msgstr "�亠�亠亶�亳 从 仗�亠亟�亟��亠亶 仗亠�仆亠 于 �仗亳�从亠 于仂�仗�仂亳亰于亠亟亠仆亳�" #: src/audacious/main.c:1067 msgid "Start playing current playlist" @@ -741,7 +749,7 @@ #: src/audacious/main.c:1078 msgid "Print all errors and warnings to stdout" -msgstr "��于仂亟亳�� 于�亠 仂�亳弍从亳 亳 仗�亠亟�仗�亠亢亟亠仆亳� ��舒仆亟舒��仆�亶 于�于仂亟" +msgstr "��于仂亟亳�� 于�亠 仂�亳弍从亳 亳 仗�亠亟�仗�亠亢亟亠仆亳� 于 ��舒仆亟舒��仆�亶 于�于仂亟" #: src/audacious/main.c:1079 msgid "Show version and builtin features" @@ -822,6 +830,19 @@ "report:\n" "\n" msgstr "" +"\n" +"Audacious 仗仂仍��亳仍 �亳亞仆舒仍 11 (SIGSEGV).\n" +"\n" +"�� 仗�亳仆仂�亳仄 亳亰于亳仆亠仆亳� 亰舒 仆亠�亟仂弍��于仂, 仆仂 Audacious 舒于舒�亳亶仆仂 亰舒于亠��舒亠� �舒弍仂��.\n" +"亅�仂 仂�亳弍从舒 仗�仂亞�舒仄仄�, 亳 �舒从仂亞仂 仆亠 亟仂仍亢仆仂 仗�仂亳��仂亟亳�� 于 仆仂�仄舒仍�仆�� ��仍仂于亳��.\n" +"丐亠从��亳亠 仗舒�舒仄亠��� 弍�亟�� �仂��舒仆亠仆� 亳 仆亠 亟仂仍亢仆� 弍��� 仗仂于�亠亢亟亠仆�.\n" +"\n" +"�� 仄仂亢亠�亠 仗仂仄仂�� �仍���亳�� 从舒�亠��于仂 Audacious 亰舒仗仂仍仆亠仆亳亠仄 仂����舒 仂 仗�仂弍仍亠仄亠 仆舒 http://bugs-" +"meta.atheme.org\n" +"��亳于亠亟亳�亠 �舒仄 于亠�� �亠从�� �仍亠亟���亠亞仂 �仂仂弍�亠仆亳� 亳 仂仗亳�亳�亠 ��仂 亳仄亠仆仆仂 于� 亟亠仍舒仍亳\n" +"从仂亞亟舒 仗�仂亳亰仂�仍舒 亟舒仆仆舒� 舒于舒�亳�.\n" +"亅�仂 仗仂仄仂亢亠� 弍����仂 仂弍�舒弍仂�舒�� 于舒� 仂���� 亳 仗仂仆��� 于 ��仄 仗�仂弍仍亠仄舒:\n" +"\n" #: src/audacious/signals.c:80 msgid "" @@ -829,12 +850,16 @@ "Bugs can be reported at http://bugs-meta.atheme.org against the Audacious " "product.\n" msgstr "" +"\n" +"�弍 仂�亳弍从舒� 于 Audacious 仄仂亢仆仂 �仂仂弍�亳�� 仆舒 http://bugs-meta.atheme.org .\n" #: src/audacious/signals.c:266 msgid "" "Your signaling implementation is broken.\n" "Expect unusable crash reports.\n" msgstr "" +"�亠舒仍亳亰舒�亳� �亳��亠仄� �亳亞仆舒仍仂于 仆亠从仂��亠从�仆舒.\n" +"�仂亰仄仂亢仆� 弍亠�仗仂仍亠亰仆�亠 �仂仂弍�亠仆亳� 仂 仗舒亟亠仆亳亳 仗�仂亞�舒仄仄�.\n" #: src/audacious/strings.c:170 msgid " (invalid UTF-8)" @@ -861,7 +886,7 @@ msgstr "�于�仂��" #: src/audacious/ui_credits.c:47 -#, fuzzy, c-format +#, c-format msgid "" "<big><b>Audacious %s</b></big>\n" "A skinned multimedia player for many platforms.\n" @@ -869,7 +894,7 @@ "Copyright (C) 2005-2007 Audacious Development Team\n" msgstr "" "<big><b>Audacious %s</b></big>\n" -"��仍��亳仄亠亟亳亶仆�亶 仗�仂亳亞��于舒�亠仍� 弍�亟��亠亞仂 亟仍� UNIX.\n" +"�仆仂亞仂��仆从�亳仂仆舒仍�仆�亶 仄�仍��亳仄亠亟亳亶仆�亶 仗�仂亳亞��于舒�亠仍� 亟仍� �舒亰仍亳�仆�� 仗仍舒��仂�仄.\n" "\n" "Copyright (C) 2005-2007 �仂仄舒仆亟舒 �舒亰�舒弍仂��亳从仂于 Audacious\n" @@ -914,9 +939,8 @@ msgstr "�仂仍亞舒��从亳亶:" #: src/audacious/ui_credits.c:165 -#, fuzzy msgid "Catalan:" -msgstr "��舒仍��仆�从亳亶:" +msgstr "�舒�舒仍舒仆�从亳亶:" #: src/audacious/ui_credits.c:168 msgid "Croatian:" @@ -1125,9 +1149,8 @@ msgstr "_个亳仍���:" #: src/audacious/ui_jumptotrack.c:594 -#, fuzzy msgid "Close on Jump" -msgstr "�舒从���� 仂从仆仂 仗�亳 ��从���亳亳" +msgstr "�舒从���� 仗仂�仍亠" #: src/audacious/ui_main.c:489 #, c-format @@ -1161,16 +1184,15 @@ #: src/audacious/ui_main.c:1228 msgid "Audacious - visibility warning" -msgstr "" +msgstr "Audacious - 仗�亠亟�仗�亠亢亟亠仆亳亠 于亳亟亳仄仂��亳" #: src/audacious/ui_main.c:1230 -#, fuzzy msgid "Show main player window" -msgstr "��弍仂� ��亳��舒 亟仍� 亞仍舒于仆仂亞仂 仂从仆舒" +msgstr "�仂从舒亰�于舒�� 亞仍舒于仆仂亠 仂从仆仂 仗�仂亳亞��于舒�亠仍�" #: src/audacious/ui_main.c:1231 msgid "Ignore" -msgstr "" +msgstr "�亞仆仂�亳�仂于舒��" #: src/audacious/ui_main.c:1235 msgid "" @@ -1179,71 +1201,70 @@ "otherwise, you'll have to control it remotely via audtool or enabled plugins " "(such as the statusicon plugin)." msgstr "" +"Audacious 弍�仍 亰舒仗��亠仆, 仆仂 于�亠 仂从仆舒 �仗���舒仆�.\n" +"�仍� �仗�舒于仍亠仆亳� Audacious 于舒仄 于仂亰仄仂亢仆仂 仗仂��亠弍�亠��� 仗仂从舒亰舒�� 仂从仆仂 " +"仗�仂亳亞��于舒�亠仍� 于仆仂于�; 于 仗�仂�亳于仆仂仄 �仍��舒亠 于� 仄仂亢亠�亠 �仗�舒于仍��� " +"亳仄 �亟舒仍�仆仆仂 �亠�亠亰 audtool 亳仍亳 亟仂仗仂仍仆亳�亠仍�仆�亶 仄仂亟�仍� (�舒从仂亶 从舒从 statusicon). " #: src/audacious/ui_main.c:1241 msgid "Always ignore, show/hide is controlled remotely" -msgstr "" +msgstr "��亠亞亟舒 亳亞仆仂�亳�仂于舒��, 仗仂从舒亰�于舒��/仗���舒�� �仗�舒于仍�亠��� �亟舒仍�仆仆仂" #: src/audacious/ui_main.c:1259 msgid "Enter location to play:" msgstr "�于亠亟亳�亠 舒亟�亠� 亟仍� 于仂�仗�仂亳亰于亠亟亠仆亳�:" #: src/audacious/ui_main.c:1504 -#, fuzzy, c-format +#, c-format msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)" -msgstr "������乂����: %d:%-2.2d/%d:%-2.2d (%d%%)" +msgstr "�亠�亠仄亠�亠仆亳亠: %d:%-2.2d/%d:%-2.2d (%d%%)" #: src/audacious/ui_main.c:1536 #, c-format msgid "Volume: %d%%" -msgstr "" +msgstr "��仂仄从仂���: %d%%" #: src/audacious/ui_main.c:1566 #, c-format msgid "Balance: %d%% left" -msgstr "" +msgstr "�舒仍舒仆�: %d%% 于仍亠于仂" #: src/audacious/ui_main.c:1570 msgid "Balance: center" -msgstr "" +msgstr "�舒仍舒仆�: �亠仆��" #: src/audacious/ui_main.c:1574 #, c-format msgid "Balance: %d%% right" -msgstr "" +msgstr "�舒仍舒仆�: %d%% 于仗�舒于仂" #: src/audacious/ui_main.c:1916 msgid "Options Menu" -msgstr "" +msgstr "�亠仆� 仗舒�舒仄亠��仂于" #: src/audacious/ui_main.c:1920 -#, fuzzy msgid "Disable 'Always On Top'" -msgstr "�仂亟仆��� 仆舒 仗亠�亠亟仆亳亶 仗仍舒仆" +msgstr "��从仍��亳�� \"��亠亞亟舒 仆舒 仗亠�亠亟仆亠仄 仗仍舒仆亠\"" #: src/audacious/ui_main.c:1922 -#, fuzzy msgid "Enable 'Always On Top'" -msgstr "�仂亟仆��� 仆舒 仗亠�亠亟仆亳亶 仗仍舒仆" +msgstr "�从仍��亳�� \"��亠亞亟舒 仆舒 仗亠�亠亟仆亠仄 仗仍舒仆亠\"" #: src/audacious/ui_main.c:1925 msgid "File Info Box" -msgstr "" +msgstr "�从仆仂 亳仆�仂�仄舒�亳亳 仂 �舒亶仍亠" #: src/audacious/ui_main.c:1929 -#, fuzzy msgid "Disable 'Doublesize'" -msgstr "�于仂亶仆仂亶 �舒亰仄亠�" +msgstr "��从仍��亳�� \"�于仂亶仆仂亶 �舒亰仄亠�\"" #: src/audacious/ui_main.c:1931 -#, fuzzy msgid "Enable 'Doublesize'" -msgstr "�于仂亶仆仂亶 �舒亰仄亠�" +msgstr "�从仍��亳�� \"�于仂亶仆仂亶 �舒亰仄亠�\"" #: src/audacious/ui_main.c:1934 -#, fuzzy msgid "Visualization Menu" -msgstr "�亠亢亳仄 于亳亰�舒仍亳亰舒�亳亳" +msgstr "�亠仆� 于亳亰�舒仍亳亰舒�亳亳" #: src/audacious/ui_main.c:1982 msgid "" @@ -1436,7 +1457,7 @@ #: src/audacious/ui_manager.c:172 src/audacious/ui_manager.c:173 msgid "Play" -msgstr "�仂�仗�仂亳亰于亠亟亠仆亳亠" +msgstr "�仂�仗�仂亳亰于亠��亳" #: src/audacious/ui_manager.c:175 src/audacious/ui_manager.c:176 msgid "Pause" @@ -1742,18 +1763,16 @@ msgstr "弌仂��亳�仂于舒�� 于�弍�舒仆仆�亠" #: src/audacious/ui_manager.c:380 -#, fuzzy msgid "File" -msgstr "�仍舒仄�" +msgstr "个舒亶仍" #: src/audacious/ui_manager.c:381 msgid "Help" -msgstr "" +msgstr "弌仗�舒于从舒" #: src/audacious/ui_manager.c:383 -#, fuzzy msgid "Plugin Services" -msgstr "�仂亟�仍亳" +msgstr "��仗仂仄仂亞舒�亠仍�仆�亠 仄仂亟�仍亳" #: src/audacious/ui_manager.c:385 src/audacious/ui_manager.c:388 msgid "View Track Details" @@ -1780,9 +1799,8 @@ msgstr "�仂�仗�仂亳亰于亠��亳 亰舒仗亳�� � �从舒亰舒仆仆仂亞仂 舒亟�亠�舒" #: src/audacious/ui_manager.c:400 -#, fuzzy msgid "Plugin services" -msgstr "�仂亟�仍亳" +msgstr "��仗仂仄仂亞舒�亠仍�仆�亠 仄仂亟�仍亳" #: src/audacious/ui_manager.c:402 msgid "Preferences" @@ -1802,7 +1820,7 @@ #: src/audacious/ui_manager.c:408 src/audacious/ui_manager.c:409 msgid "Set A-B" -msgstr "�仂��舒于亳�� 仄亠�从� A-B" +msgstr "�仂��舒于亳�� 仄亠�从亳 A-B" #: src/audacious/ui_manager.c:411 src/audacious/ui_manager.c:412 msgid "Clear A-B" @@ -1951,14 +1969,12 @@ "�舒��� �仂亞仂, ��仂 于� 亳�亠�亠." #: src/audacious/ui_playlist.c:493 -#, fuzzy msgid "Title: " -msgstr "�舒亰于舒仆亳亠" +msgstr "�舒亰于舒仆亳亠: " #: src/audacious/ui_playlist.c:500 -#, fuzzy msgid "Album: " -msgstr "�仍�弍仂仄" +msgstr "�仍�弍仂仄: " #: src/audacious/ui_playlist.c:507 msgid "Artist: " @@ -2002,13 +2018,12 @@ "�亠亳亰于亠��仆�亶 �仂�仄舒� �舒亶仍舒 '%s'.\n" #: src/audacious/ui_playlist.c:911 -#, fuzzy msgid "Save as Static Playlist" -msgstr "弌仂��舒仆亠仆亳亠 �仗亳�从舒 于仂�仗�仂亳亰于亠亟亠仆亳�" +msgstr "弌仂��舒仆亳�� ��舒�亳�亠�从亳亶 �仗亳�仂从 于仂�仗�仂亳亰于亠亟亠仆亳�" #: src/audacious/ui_playlist.c:918 msgid "Use Relative Path" -msgstr "" +msgstr "��仗仂仍�亰仂于舒�� 仂�仆仂�亳�亠仍�仆�亶 仗���" #: src/audacious/ui_playlist.c:940 msgid "Load Playlist" @@ -2060,12 +2075,11 @@ #: src/audacious/ui_preferences.c:133 msgid "Codec" -msgstr "" +msgstr "�仂亟亠从" #: src/audacious/ui_preferences.c:134 -#, fuzzy msgid "Quality" -msgstr "_���仂亟" +msgstr "�舒�亠��于仂" #: src/audacious/ui_preferences.c:155 msgid "localhost" @@ -2142,178 +2156,3 @@ #: src/audacious/ui_urlopener.c:88 msgid "Add/Open URL Dialog" msgstr "�仂弍舒于亳��/��从���� URL" - -#~ msgid "Show window manager decorations" -#~ msgstr "�仂从舒亰�于舒�� 亰舒亞仂仍仂于从亳 仄亠仆亠亟亢亠�舒 仂从仂仆" - -#, fuzzy -#~ msgid "<b>Artist:</b> %s" -#~ msgstr "<b>��亠亟���舒仆仂于从亳</b>" - -#, fuzzy -#~ msgid "<b>Title:</b> %s" -#~ msgstr "<b>�舒亰于舒仆亳亠 �舒亶仍舒</b>" - -#, fuzzy -#~ msgid "<b>Album:</b> %s" -#~ msgstr "�仍�弍仂仄" - -#, fuzzy -#~ msgid "Audacious last.fm radio tuner" -#~ msgstr "弌仗亳�仂从 于仂�仗�仂亳亰于亠亟亠仆亳� Audacious" - -#, fuzzy -#~ msgid "Station:" -#~ msgstr "��舒仍��仆�从亳亶:" - -#, fuzzy -#~ msgid "<b>Artist:</b>" -#~ msgstr "<b>��亠亟���舒仆仂于从亳</b>" - -#, fuzzy -#~ msgid "<b>Title:</b>" -#~ msgstr "<b>�舒亰于舒仆亳亠 �舒亶仍舒</b>" - -#, fuzzy -#~ msgid "<b>Album:</b>" -#~ msgstr "<b>�舒亰于舒仆亳亠 �舒亶仍舒</b>" - -#~ msgid "VOLUME: %d%%" -#~ msgstr "������弌丐亂: %d%%" - -#~ msgid "BALANCE: %d%% LEFT" -#~ msgstr "�����弌: %d%% �����" - -#~ msgid "BALANCE: CENTER" -#~ msgstr "�����弌: 丶��丐�" - -#~ msgid "BALANCE: %d%% RIGHT" -#~ msgstr "�����弌: %d%% ������" - -#, fuzzy -#~ msgid "Last.fm radio" -#~ msgstr "��从���� 舒亟�亠�" - -#, fuzzy -#~ msgid "Play Last.fm radio" -#~ msgstr "��从���� 舒亟�亠�" - -#~ 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>�亠 仆舒亶亟亠仆仂 于仂�仗�仂亳亰于仂亟亳仄仂亞仂 CD.</big></b>\n" -#~ "\n" -#~ "�仂仄仗舒从�-亟亳�从 仂������于�亠� 亳仍亳 仆亠 �仂亟亠�亢亳� 舒�亟亳仂-亟仂�仂亢亠从.\n" - -#~ msgid "Add CD..." -#~ msgstr "�仂弍舒于亳�� CD..." - -#~ msgid "Adds a CD to the playlist." -#~ msgstr "�仂弍舒于仍�亠� 亰舒仗亳�亳 � 从仂仄仗舒从�-亟亳�从舒 于 �仗亳�仂从 于仂�仗�仂亳亰于亠亟亠仆亳�." - -#~ msgid "Play CD" -#~ msgstr "�仂�仗�仂亳亰于亠��亳 CD" - -#~ msgid "Performer/Artist" -#~ msgstr "��仗仂仍仆亳�亠仍�" - -#~ msgid "File name" -#~ msgstr "�仄� �舒亶仍舒" - -#~ msgid "File path" -#~ msgstr "���� 从 �舒亶仍�" - -#~ msgid "File extension" -#~ msgstr "�舒��亳�亠仆亳亠 �舒亶仍舒" - -#~ msgid "Track name" -#~ msgstr "�舒亰于舒仆亳亠" - -#~ msgid "Track number" -#~ msgstr "�仂仄亠� 亟仂�仂亢从亳" - -#~ msgid "%{n:...%}: Display \"...\" only if element %n is present" -#~ msgstr "%{n:...%}: ��仂弍�舒亢舒�� \"...\", 从仂亞亟舒 �仍亠仄亠仆� %n 仗�亳�����于�亠�" - -#~ msgid "" -#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n" -#~ "Please use GTK+ %s or newer.\n" -#~ msgstr "" -#~ "��仂��亳�亠, 于舒�舒 于亠��亳� GTK+ (%d.%d.%d) 仆亠 弍�亟亠� �舒弍仂�舒�� � Audacious.\n" -#~ "�仂亢舒仍�亶��舒, 亳�仗仂仍�亰�亶�亠 GTK+ %s 亳仍亳 仆仂于亠亠.\n" - -#~ msgid "OPTIONS MENU" -#~ msgstr "���豫 ��弌丐����" - -#~ msgid "DISABLE ALWAYS ON TOP" -#~ msgstr "�丐��豫丼�丐亂 �弌���� �����丱丕" - -#~ msgid "ENABLE ALWAYS ON TOP" -#~ msgstr "���豫丼�丐亂 �弌���� �����丱丕" - -#~ msgid "FILE INFO BOX" -#~ msgstr "���� ��个����丶�� � 个����" - -#~ msgid "DISABLE DOUBLESIZE" -#~ msgstr "�丐��豫丼�丐亂 ������� ������" - -#~ msgid "ENABLE DOUBLESIZE" -#~ msgstr "���豫丼�丐亂 ������� ������" - -#~ msgid "VISUALIZATION MENU" -#~ msgstr "���豫 ���丕�����丶��" - -#~ msgid "Track name: " -#~ msgstr "�舒亰于舒仆亳亠: " - -#~ msgid "Album name: " -#~ msgstr "�仍�弍仂仄: " - -#~ msgid "" -#~ "<b><big>Unable to play files.</big></b>\n" -#~ "\n" -#~ "The following files could not be played. Please check that:\n" -#~ "1. they are accessible.\n" -#~ "2. you have enabled the media plugins required." -#~ msgstr "" -#~ "<b><big>�亠于仂亰仄仂亢仆仂 于仂�仗�仂亳亰于亠��亳 �舒亶仍�.</big></b>\n" -#~ "\n" -#~ "�亠从仂�仂��亠 �舒亶仍� 仆亠 仄仂亞�� 弍��� 于仂�仗�仂亳亰于亠亟亠仆�. �仂亢舒仍�亶��舒, 仗�仂于亠���亠 " -#~ "�仍亠亟���亠亠:\n" -#~ "1. �仂���仗仆仂��� ��亳� �舒亶仍仂于.\n" -#~ "2. �从仍��亠仆� 仆亠仂弍�仂亟亳仄�亠 舒�亟亳仂-仄仂亟�仍亳." - -#~ msgid "Don't show this warning anymore" -#~ msgstr "�仂仍��亠 仆亠 仗仂从舒亰�于舒�� ��仂 仗�亠亟�仗�亠亢亟亠仆亳亠" - -#~ msgid "Show more _details" -#~ msgstr "_�仂亟�仂弍仆亠亠" - -#~ msgid "" -#~ "\n" -#~ "Received SIGSEGV\n" -#~ "\n" -#~ "This could be a bug in Audacious. If you don't know why this happened, " -#~ "file a bug at http://bugs-meta.atheme.org/\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "�仂仍��亠仆 SIGSEGV\n" -#~ "\n" -#~ "�仂亰仄仂亢仆仂 ��仂 仂�亳弍从舒 于 Audacious. ��仍亳 于� 仆亠 亰仆舒亠�亠, 仗仂�亠仄� ��仂 仗�仂亳亰仂�仍仂, " -#~ "�仂 仆舒仗亳�亳�亠 �仂仂弍�亠仆亳亠 仂弍 仂�亳弍从亠 仆舒 http://bugs-meta.atheme.org/\n" -#~ "\n" - -#~ msgid "" -#~ "Enables playlist transparency. This is not recommended for slower " -#~ "machines as it requires some CPU time to create and cache the pixmaps " -#~ "used for the transparency." -#~ msgstr "" -#~ "�从仍��舒亠� 仗�仂亰�舒�仆仂��� �仗亳�从舒 于仂�仗�仂亳亰于亠亟亠仆亳�. �亠 �亠从仂仄亠仆亟�亠��� 亟仍� " -#~ "仄亠亟仍亠仆仆�� 仄舒�亳仆 仗仂�仂仄� ��仂 ��仂 ��亠弍�亠� 亟仂仗仂仍仆亳�亠仍�仆仂亠 仗�仂�亠��仂�仆仂亠 于�亠仄� " -#~ "亟仍� �仂亰亟舒仆亳� 亳 从��亳�仂于舒仆亳� 亳亰仂弍�舒亢亠仆亳亶 仆亠仂弍�仂亟亳仄�� 亟仍� 仗�仂亰�舒�仆仂��亳." - -#~ msgid "Enable playlist transparency" -#~ msgstr "��仂亰�舒�仆�亶 �仗亳�仂从 于仂�仗�仂亳亰于亠亟亠仆亳�"
--- a/src/audacious/skin.c Tue Nov 06 12:38:53 2007 -0600 +++ b/src/audacious/skin.c Tue Nov 06 12:39:15 2007 -0600 @@ -48,6 +48,8 @@ #include "vfs.h" #include "ui_skinned_window.h" +#include "ui_skinned_number.h" +#include "ui_skinned_playstatus.h" #define EXTENSION_TARGETS 7 @@ -1581,6 +1583,14 @@ g_free(command); } +static SkinPixmap * +skin_get_pixmap(Skin * skin, SkinPixmapId map_id) +{ + g_return_val_if_fail(skin != NULL, NULL); + g_return_val_if_fail(map_id < SKIN_PIXMAP_COUNT, NULL); + + return &skin->pixmaps[map_id]; +} gboolean skin_load(Skin * skin, const gchar * path) @@ -1595,7 +1605,25 @@ skin_lock(skin); error = skin_load_nolock(skin, path, FALSE); skin_unlock(skin); - + + SkinPixmap *pixmap = NULL; + pixmap = skin_get_pixmap(skin, SKIN_NUMBERS); + if (pixmap) { + ui_skinned_number_set_size(mainwin_minus_num, 9, pixmap->height); + ui_skinned_number_set_size(mainwin_10min_num, 9, pixmap->height); + ui_skinned_number_set_size(mainwin_min_num, 9, pixmap->height); + ui_skinned_number_set_size(mainwin_10sec_num, 9, pixmap->height); + ui_skinned_number_set_size(mainwin_sec_num, 9, pixmap->height); + } + + pixmap = skin_get_pixmap(skin, SKIN_MAIN); + if (pixmap && skin->properties.mainwin_height > pixmap->height) + skin->properties.mainwin_height = pixmap->height; + + pixmap = skin_get_pixmap(skin, SKIN_PLAYPAUSE); + if (pixmap) + ui_skinned_playstatus_set_size(mainwin_playstatus, 11, pixmap->height); + return error; } @@ -1618,16 +1646,6 @@ skin_load_nolock(skin, skin->path, TRUE); } - -static SkinPixmap * -skin_get_pixmap(Skin * skin, SkinPixmapId map_id) -{ - g_return_val_if_fail(skin != NULL, NULL); - g_return_val_if_fail(map_id < SKIN_PIXMAP_COUNT, NULL); - - return &skin->pixmaps[map_id]; -} - GdkBitmap * skin_get_mask(Skin * skin, SkinMaskId mi) { @@ -1702,10 +1720,11 @@ g_return_if_fail(pixmap != NULL); g_return_if_fail(pixmap->pixmap != NULL); + /* FIXME: instead of copying stuff from SKIN_MAIN, we should use transparency or resize widget */ if (xsrc+width > pixmap->width || ysrc+height > pixmap->height) { - if (pixmap_id == SKIN_NUMBERS) + if (pixmap_id == SKIN_NUMBERS) { xsrc = 90; - else if (pixmap_id == SKIN_VOLUME) { + } else if (pixmap_id == SKIN_VOLUME) { /* some winamp skins have too strait SKIN_VOLUME, so let's copy what's remain from SKIN_MAIN */ gdk_draw_drawable(drawable, gc, skin_get_pixmap(bmp_active_skin, SKIN_MAIN)->pixmap, skin->properties.mainwin_volume_x, skin->properties.mainwin_volume_y, @@ -1716,6 +1735,15 @@ gdk_draw_drawable(drawable, gc, skin_get_pixmap(bmp_active_skin, SKIN_MAIN)->pixmap, 212 + xdest, 41, xdest, ydest, width, height); height = pixmap->height/2; + } else if (pixmap_id == SKIN_PLAYPAUSE) { + /* it's better to hide mainwin_playstatus than display mess */ + if (pixmap->width != 42) + gtk_widget_hide(mainwin_playstatus); + } else if (pixmap_id == SKIN_SHUFREP) { + /* some winamp skins have too strait SKIN_SHUFREP, so let's copy what's remain from SKIN_MAIN */ + gdk_draw_drawable(drawable, gc, skin_get_pixmap(bmp_active_skin, SKIN_MAIN)->pixmap, + 164 + xdest, 89, xdest, ydest, width, height); + width = pixmap->width - xsrc; } else return; }
--- a/src/audacious/ui_fileinfopopup.c Tue Nov 06 12:38:53 2007 -0600 +++ b/src/audacious/ui_fileinfopopup.c Tue Nov 06 12:39:15 2007 -0600 @@ -220,6 +220,8 @@ GtkWidget *filepopup_progress; filepopup_win = gtk_window_new(GTK_WINDOW_POPUP); + gtk_window_set_type_hint(GTK_WINDOW(filepopup_win), + GDK_WINDOW_TYPE_HINT_TOOLTIP); gtk_window_set_decorated(GTK_WINDOW(filepopup_win), FALSE); gtk_container_set_border_width(GTK_CONTAINER(filepopup_win), 6); gtk_window_set_transient_for(GTK_WINDOW(filepopup_win),
--- a/src/audacious/ui_skinned_number.c Tue Nov 06 12:38:53 2007 -0600 +++ b/src/audacious/ui_skinned_number.c Tue Nov 06 12:39:15 2007 -0600 @@ -227,6 +227,7 @@ } void ui_skinned_number_set_number(GtkWidget *widget, gint num) { + g_return_if_fail(UI_SKINNED_IS_NUMBER(widget)); UiSkinnedNumber *number = UI_SKINNED_NUMBER (widget); if (number->num == num) @@ -235,3 +236,13 @@ number->num = num; gtk_widget_queue_draw(GTK_WIDGET(number)); } + +void ui_skinned_number_set_size(GtkWidget *widget, gint width, gint height) { + g_return_if_fail(UI_SKINNED_IS_NUMBER(widget)); + UiSkinnedNumber *number = UI_SKINNED_NUMBER (widget); + + number->width = width; + number->height = height; + + gtk_widget_set_size_request(widget, width*(1+number->double_size), height*(1+number->double_size)); +}
--- a/src/audacious/ui_skinned_number.h Tue Nov 06 12:38:53 2007 -0600 +++ b/src/audacious/ui_skinned_number.h Tue Nov 06 12:39:15 2007 -0600 @@ -53,6 +53,7 @@ GtkWidget* ui_skinned_number_new (GtkWidget *fixed, gint x, gint y, SkinPixmapId si); GtkType ui_skinned_number_get_type(void); void ui_skinned_number_set_number(GtkWidget *widget, gint num); +void ui_skinned_number_set_size(GtkWidget *widget, gint width, gint height); #ifdef __cplusplus }
--- a/src/audacious/ui_skinned_playstatus.c Tue Nov 06 12:38:53 2007 -0600 +++ b/src/audacious/ui_skinned_playstatus.c Tue Nov 06 12:39:15 2007 -0600 @@ -250,3 +250,13 @@ playstatus->buffering = status; gtk_widget_queue_draw(widget); } + +void ui_skinned_playstatus_set_size(GtkWidget *widget, gint width, gint height) { + g_return_if_fail (UI_SKINNED_IS_PLAYSTATUS (widget)); + UiSkinnedPlaystatus *playstatus = UI_SKINNED_PLAYSTATUS (widget); + + playstatus->width = width; + playstatus->height = height; + + gtk_widget_set_size_request(widget, width*(1+playstatus->double_size), height*(1+playstatus->double_size)); +}
--- a/src/audacious/ui_skinned_playstatus.h Tue Nov 06 12:38:53 2007 -0600 +++ b/src/audacious/ui_skinned_playstatus.h Tue Nov 06 12:39:15 2007 -0600 @@ -63,6 +63,7 @@ GtkType ui_skinned_playstatus_get_type(void); void ui_skinned_playstatus_set_status(GtkWidget *widget, PStatus status); void ui_skinned_playstatus_set_buffering(GtkWidget *widget, gboolean status); +void ui_skinned_playstatus_set_size(GtkWidget *widget, gint width, gint height); #ifdef __cplusplus }