[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, upstream, updated. upstream/2.0.0-1-g536b6d6

Chow Loong Jin hyperair at ubuntu.com
Thu May 5 00:35:30 UTC 2011


The following commit has been merged in the upstream branch:
commit 536b6d63349be7fd80b5d4c07139b3e157a8daf9
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Wed May 4 08:58:04 2011 +0800

    Imported Upstream version 2.0.1

diff --git a/AUTHORS b/AUTHORS
index 5a35f13..178a971 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,7 @@ Other Contributors:
   Chow Loong Jin
   Iain Lane
   Jo Shields
+  Kriss
   Patrick Niklaus
   Patrick van Staveren
   Rodney Dawes
diff --git a/NEWS b/NEWS
index 940415d..e0b6268 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,25 @@
 =================================
+Version 2.0.1 - May 3, 2011
+=================================
+
+Contributors since 2.0.0:
+Bertrand Lorentz, Chow Loong Jin, Frank Ziegler, Kriss, Manish Sinha,
+Olivier Dufour
+
+Notable bugs fixed since 2.0.0:
+* ClutterFlow: Fix NRE crash (bgo#647134)
+* Karaoke: add an gst_init() call to make sure gstreamer is working
+* Karaoke: fix NRE on dispose if audiokaraoke was not found
+* LastfmFingerprint: Don't strdup strings
+* LastfmFingerprint: Fix empty name exception (bgo#648168)
+* Lirc: Drop liblirc_client.so moduleref (lp#773686)
+* LiveRadio: Re-enable ShoutCast with request structure from RadioStationFetcher
+* Lyrics: Always update pane title when track changes (bgo#647108)
+* RadioStationFetcher: Updated the shoutcast plugin to fix the IP address
+* ZeitgeistDataprovider: Register dataprovider in DataSource Registry (lp#691842)
+* ZeitgeistDataprovider: Differenciate between ScheduledActivity and UserActivity (lp#748120)
+
+=================================
 Version 2.0.0 - April 6, 2011
 =================================
 
diff --git a/configure b/configure
index 43e7f28..eeee054 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for banshee-community-extensions 2.0.0.
+# Generated by GNU Autoconf 2.67 for banshee-community-extensions 2.0.1.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions>.
 #
@@ -702,8 +702,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='banshee-community-extensions'
 PACKAGE_TARNAME='banshee-community-extensions'
-PACKAGE_VERSION='2.0.0'
-PACKAGE_STRING='banshee-community-extensions 2.0.0'
+PACKAGE_VERSION='2.0.1'
+PACKAGE_STRING='banshee-community-extensions 2.0.1'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions'
 PACKAGE_URL=''
 
@@ -1688,7 +1688,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures banshee-community-extensions 2.0.0 to adapt to many kinds of systems.
+\`configure' configures banshee-community-extensions 2.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1759,7 +1759,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of banshee-community-extensions 2.0.0:";;
+     short | recursive ) echo "Configuration of banshee-community-extensions 2.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1996,7 +1996,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-banshee-community-extensions configure 2.0.0
+banshee-community-extensions configure 2.0.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2486,7 +2486,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by banshee-community-extensions $as_me 2.0.0, which was
+It was created by banshee-community-extensions $as_me 2.0.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3302,7 +3302,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='banshee-community-extensions'
- VERSION='2.0.0'
+ VERSION='2.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21839,7 +21839,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by banshee-community-extensions $as_me 2.0.0, which was
+This file was extended by banshee-community-extensions $as_me 2.0.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21905,7 +21905,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-banshee-community-extensions config.status 2.0.0
+banshee-community-extensions config.status 2.0.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2a94393..2fd64e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.52)
-AC_INIT([banshee-community-extensions], 2.0.0,
+AC_INIT([banshee-community-extensions], 2.0.1,
 	[http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions])
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip foreign])
diff --git a/po/LINGUAS b/po/LINGUAS
index 1f33fa9..c557444 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -7,3 +7,5 @@ fr
 it
 pt
 ru_RU
+sk
+uk_UA
diff --git a/po/ru_RU.po b/po/sk.po
similarity index 93%
copy from po/ru_RU.po
copy to po/sk.po
index 3136b30..38b33f2 100644
--- a/po/ru_RU.po
+++ b/po/sk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: Banshee Community Extensions\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions\n"
 "POT-Creation-Date: 2011-03-22 23:13+0100\n"
-"PO-Revision-Date: 2011-03-23 00:09+0000\n"
-"Last-Translator: hammer <hammersoft at gmail.com>\n"
+"PO-Revision-Date: 2011-05-01 11:13+0000\n"
+"Last-Translator: pavolzetor <pavol at klacansky.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru_RU\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"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:69
 msgid "Alarm Clock"
@@ -40,7 +40,7 @@ msgstr ""
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:81
 #: ../src/LCD/Banshee.LCD/LCDService.cs:70
 msgid "_Configure..."
-msgstr ""
+msgstr "Nas_taviť..."
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82
 msgid "Configure the Alarm Clock plugin"
@@ -76,11 +76,11 @@ msgstr ""
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:78
 msgid "Duration:"
-msgstr "Продолжительность:"
+msgstr "Dĺžka:"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:79
 msgid " <i>(seconds)</i>"
-msgstr "<i>(секунд)</i>"
+msgstr ""
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:88
 msgid "Fade-In Adjustment"
@@ -88,11 +88,11 @@ msgstr ""
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:93
 msgid "Command:"
-msgstr "Команда:"
+msgstr "Príkaz:"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:97
 msgid "Command To Execute:"
-msgstr "Команда для запуска:"
+msgstr "Príkaz, ktorý vykonať:"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:46
 msgid "Sleep Timer"
@@ -108,30 +108,30 @@ msgstr ""
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:73
 msgid "Connect"
-msgstr "Подключиться"
+msgstr "Pripojiť"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:85
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:92
 msgid "Artist"
-msgstr "Исполнитель"
+msgstr "Interpret"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:87
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:93
 msgid "Album"
-msgstr "Альбом"
+msgstr "Album"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:89
 msgid "Playlist"
-msgstr "Список воспроизведения"
+msgstr "Zoznam skladieb"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:91
 msgid "Title"
-msgstr "Название"
+msgstr "Názov"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:86
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:62
 msgid "Password:"
-msgstr "Пароль:"
+msgstr "Heslo:"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:99
 msgid "Ampache Server Name:"
@@ -139,42 +139,44 @@ msgstr ""
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:110
 msgid "User Name:"
-msgstr "Имя пользователя:"
+msgstr "Používateľské meno:"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:131
 msgid "Save"
-msgstr "Сохранить"
+msgstr "Uložiť"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:142
 msgid "Clear"
-msgstr "Очистить"
+msgstr "Vymazať"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:132
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:169
 msgid "_Close"
-msgstr "_Закрыть"
+msgstr "Za_vrieť"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:133
 msgid "Close"
-msgstr "Закрыть"
+msgstr "Zavrieť"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:139
 msgid "_Show Banshee"
-msgstr ""
+msgstr "_Zobraziť Banshee"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:140
 msgid "Show the Banshee main window"
-msgstr ""
+msgstr "Zobraziť hlavné okno programu Banshee"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:231
 msgid "Still Running"
-msgstr "Оставаться запущеным"
+msgstr "Stále beží"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:233
 msgid ""
 "Banshee was closed to the notification area. Use the <i>Quit</i> option to "
 "end your session."
 msgstr ""
+"Banshee bol zatvorený do oblasti upozornení. Ak chcete ukončiť vašu reláciu "
+"použite <i>Ukončiť</i>."
 
 #. Translators: {0} and {1} are Artist Name and
 #. Album Title, respectively;
@@ -182,29 +184,29 @@ msgstr ""
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:308
 #, csharp-format
 msgid "by '{0}' from '{1}'"
-msgstr "по '{0}' из '{1}'"
+msgstr "od '{0}' z '{1}'"
 
 #. Translators: {0} is for Album Title;
 #. e.g. 'from Killing with a Smile'
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:313
 #, csharp-format
 msgid "from '{0}'"
-msgstr "из '{0}'"
+msgstr "z '{0}'"
 
 #. Translators: {0} is for Artist Name;
 #. e.g. 'by Parkway Drive'
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:318
 #, csharp-format
 msgid "by '{0}'"
-msgstr "по '{0}'"
+msgstr "od '{0}'"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:397
 msgid "Skip this item"
-msgstr "Пропустить этот элемент"
+msgstr "Preskočiť túto položku"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowContents.cs:263
 msgid "Track list"
-msgstr "Список дорожек"
+msgstr "Zoznam skladieb"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:50
 msgid "Sensitivity for album dragging"
@@ -226,7 +228,7 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:64
 msgid "Unfolds the track list"
-msgstr "Развернуть список дорожек"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:65
 msgid "If checked it will display the track list when not in fullscreen mode"
@@ -234,7 +236,7 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:85
 msgid "Immediately apply playback mode changes"
-msgstr "Немедленно применить режим проигрывания"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:86
 msgid ""
@@ -244,7 +246,7 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:92
 msgid "Display album _label"
-msgstr "Показывать _метку альбома"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:93
 msgid "Wether or not the album label needs to be shown above the artwork"
@@ -252,7 +254,7 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:99
 msgid "Display track _title"
-msgstr "Пказывать _название дорожки"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:100
 msgid ""
@@ -262,7 +264,7 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:106
 msgid "Texture size in pixels"
-msgstr "Размер текстуры в пикселах"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:107
 msgid "The in-memory size of the cover textures in pixels"
@@ -270,7 +272,7 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:113
 msgid "Minimal cover size in pixels"
-msgstr "Минимальный размер обложки в пикселах"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:114
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:121
@@ -279,11 +281,11 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:120
 msgid "Maximal cover size in pixels"
-msgstr "Мкасимальный размер обложки в пикселах"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:127
 msgid "Number of visible covers at the side"
-msgstr "Количество отображаемых обложек на стороне"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:128
 msgid ""
@@ -292,7 +294,7 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:134
 msgid "Sort covers by"
-msgstr "Сортировать обложки по"
+msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:135
 msgid "Selects on what basis covers should be sorted"
@@ -312,11 +314,11 @@ msgstr ""
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowService.cs:328
 msgid "General"
-msgstr ""
+msgstr "Všeobecné"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowService.cs:337
 msgid "Dimensions"
-msgstr "Размеры"
+msgstr "Rozmery"
 
 #: ../src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs:62
 msgid "Jamendo Downloads"
@@ -328,16 +330,16 @@ msgstr ""
 
 #: ../src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs:103
 msgid "Importing..."
-msgstr "Идет импорт..."
+msgstr "Importuje sa..."
 
 #: ../src/Jamendo/Banshee.Jamendo/JamendoWebBrowserShell.cs:41
 #, csharp-format
 msgid "Search Jamendo"
-msgstr ""
+msgstr "Hľadať v Jamendo"
 
 #: ../src/Karaoke/Banshee.Karaoke/Gui/ContextPage.cs:45
 msgid "Karaoke"
-msgstr ""
+msgstr "Karaoke"
 
 #: ../src/Karaoke/Banshee.Karaoke/Gui/KaraokePane.cs:131
 msgid ""
@@ -393,12 +395,12 @@ msgstr ""
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:127
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102
 msgid "_Cancel"
-msgstr ""
+msgstr "_Zrušiť"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:129
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104
 msgid "_Save"
-msgstr ""
+msgstr "_Uložiť"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:91
 msgid "_Karaoke"
@@ -408,7 +410,7 @@ msgstr ""
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:106
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:108
 msgid "_Configure"
-msgstr ""
+msgstr "Nas_taviť"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:94
 msgid "Configure the Karaoke extension"
@@ -436,11 +438,11 @@ msgstr ""
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:109
 msgid "Scanning..."
-msgstr ""
+msgstr "Prehľadáva sa..."
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:49
 msgid "Log in to Last.fm"
-msgstr ""
+msgstr "Prihlásiť sa do Last.fm"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:69
 msgid "Last.fm Account Login"
@@ -456,7 +458,7 @@ msgstr ""
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:57
 msgid "Username:"
-msgstr ""
+msgstr "Používateľské meno:"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:101
 msgid "Sign up for Last.fm"
@@ -472,11 +474,11 @@ msgstr ""
 
 #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:54
 msgid "Hostname:"
-msgstr ""
+msgstr "Názov hostiteľa:"
 
 #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:61
 msgid "Port:"
-msgstr ""
+msgstr "Port:"
 
 #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:67
 msgid "LCDProc Daemon:"
@@ -503,7 +505,7 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioConfigDialog.cs:91
 msgid "Enable this plugin"
-msgstr ""
+msgstr "Povoliť tento zásuvný modul"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioFilterView.cs:87
 msgid "Choose By Genre"
@@ -516,7 +518,7 @@ msgstr ""
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:141
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:388
 msgid "Loading..."
-msgstr ""
+msgstr "Načítava sa..."
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioFilterView.cs:95
 msgid "Choose By Query"
@@ -524,19 +526,19 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:581
 msgid "Yes"
-msgstr "Да"
+msgstr "Áno"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:581
 msgid "No"
-msgstr "Нет"
+msgstr "Nie"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:74
 msgid "Proxy URL"
-msgstr "Адрес прокси сервера"
+msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:75
 msgid "Enable using a HTTP proxy server"
-msgstr "Использовать прокси сервер"
+msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:76
 msgid "Use Site Login"
@@ -545,20 +547,20 @@ msgstr ""
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:77
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:58
 msgid "Username"
-msgstr "Имя пользователя"
+msgstr "Používateľské meno"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:78
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:85
 msgid "Password"
-msgstr "Пароль"
+msgstr "Heslo"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:79
 msgid "HTTP timeout in seconds"
-msgstr "HTTP тайм-аут в секундах"
+msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:129
 msgid "Browser on Left"
-msgstr ""
+msgstr "Prehliadač vľavo"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:130
 msgid "Show the artist/album browser to the left of the track list"
@@ -566,7 +568,7 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:133
 msgid "Browser on Top"
-msgstr ""
+msgstr "Prehliadač navrchu"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:134
 msgid "Show the artist/album browser above the track list"
@@ -574,7 +576,7 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:139
 msgid "Show Browser"
-msgstr ""
+msgstr "Zobraziť prehliadač"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:140
 msgid "Show or hide the artist/album browser"
@@ -583,7 +585,7 @@ msgstr ""
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:203
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:251
 msgid "Error... Please Reload"
-msgstr ""
+msgstr "Chyba... Prosím, obnovte"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:423
 msgid ""
@@ -597,7 +599,7 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121
 msgid "Station"
-msgstr ""
+msgstr "Stanica"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:122
 msgid "Creator"
@@ -605,7 +607,7 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:123
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:179
 msgid "Requested Results Returned"
@@ -626,11 +628,11 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:266
 msgid "Plugin"
-msgstr ""
+msgstr "Zásuvný modul"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:267
 msgid "Version"
-msgstr ""
+msgstr "Verzia"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:268
 msgid "Enabled"
@@ -638,11 +640,11 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:279
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:280
 msgid "Origin"
-msgstr ""
+msgstr "Pôvod"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:281
 msgid "Short Info"
@@ -662,22 +664,22 @@ msgstr ""
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:285
 msgid "Updates"
-msgstr ""
+msgstr "Aktualizácie"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:296
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:297
 msgid "Enable Plugin"
-msgstr ""
+msgstr "Povoliť zásuvný modul"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:299
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:300
 msgid "Disable Plugin"
-msgstr ""
+msgstr "Zakázať zásuvný modul"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:302
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:303
 msgid "Configure Plugin"
-msgstr ""
+msgstr "Nastaviť zásuvný modul"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:317
 msgid "Plugin Statistics"
@@ -702,7 +704,7 @@ msgstr ""
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:111
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:112
 msgid "Refresh View"
-msgstr ""
+msgstr "Obnoviť pohľad"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:116
 msgid "Add To Internet Radio"
@@ -714,17 +716,17 @@ msgstr ""
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/ContextPage.cs:45
 msgid "Lyrics"
-msgstr ""
+msgstr "Text piesne"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:66
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:127
 msgid "add"
-msgstr ""
+msgstr "pridať"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:116
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:125
 msgid "No lyrics found."
-msgstr ""
+msgstr "Nenájdený text piesne."
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:128
 msgid "Click here to manually add a new lyric"
@@ -732,11 +734,11 @@ msgstr ""
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:132
 msgid "Suggestions:"
-msgstr ""
+msgstr "Návrhy:"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsWindow.cs:97
 msgid "Copy lyrics to clipboard"
-msgstr ""
+msgstr "Kopírovať text piesne do schránky"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsWindow.cs:144
 msgid "by"
@@ -744,11 +746,11 @@ msgstr ""
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsWindow.cs:147
 msgid "Unknown Artist"
-msgstr ""
+msgstr "Neznámy interpret"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsDownloadJob.cs:17
 msgid "Downloading Lyrics"
-msgstr ""
+msgstr "Sťahuje sa text piesne"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsDownloadJob.cs:61
 #, csharp-format
@@ -757,27 +759,27 @@ msgstr ""
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:171
 msgid "L_yrics"
-msgstr ""
+msgstr "_Text piesne"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:172
 msgid "Manage Lyrics"
-msgstr ""
+msgstr "Spravovať text piesne"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:174
 msgid "_Download Lyrics"
-msgstr ""
+msgstr "_Stiahnuť text piesne"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:175
 msgid "Download lyrics for all tracks"
-msgstr ""
+msgstr "Stiahnuť text piesne pre všetky skladby"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:180
 msgid "Show Lyrics"
-msgstr ""
+msgstr "Zobraziť text piesne"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:181
 msgid "Show Lyrics in a separate window"
-msgstr ""
+msgstr "Zobraziť text piesne v samostatnom okne"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Sources/LyricsWebSource.cs:50
 #, csharp-format
@@ -786,11 +788,11 @@ msgstr ""
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:42
 msgid "Magnatune Configuration"
-msgstr ""
+msgstr "Nastavenie Magnatune"
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:113
 msgid "Membership Type"
-msgstr ""
+msgstr "Typ členského"
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:121
 msgid "None"
@@ -802,7 +804,7 @@ msgstr ""
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:123
 msgid "Download"
-msgstr ""
+msgstr "Stiahnuť"
 
 #: ../src/Mirage/Banshee.Mirage/AnalyzeLibraryJob.cs:20
 msgid "Analyzing Song Similarity"
@@ -910,7 +912,7 @@ msgstr ""
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:127
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:128
 msgid "Get stations"
-msgstr ""
+msgstr "Získať stanice"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:147
 msgid "Query by genre:"
@@ -941,13 +943,13 @@ msgstr ""
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:236
 #, csharp-format
 msgid "ERROR: Network error."
-msgstr ""
+msgstr "CHYBA: Sieťová chyba."
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:218
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:239
 #, csharp-format
 msgid "ERROR"
-msgstr ""
+msgstr "CHYBA"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:224
 #, csharp-format
@@ -968,11 +970,11 @@ msgstr ""
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:76
 msgid "_Xiph"
-msgstr ""
+msgstr "_Xiph"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:77
 msgid "Fetch stations from Xiph"
-msgstr ""
+msgstr "Získať stanice z Xiph"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/Xiph.cs:285
 #, csharp-format
@@ -1018,7 +1020,7 @@ msgstr ""
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:96
 msgid "Output folder:"
-msgstr ""
+msgstr "Vystupný priečinok:"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:97
 msgid "Encoder:"
@@ -1026,7 +1028,7 @@ msgstr ""
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:99
 msgid "_Browse"
-msgstr ""
+msgstr "_Prehliadať"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:106
 msgid "Import files to media library"
@@ -1055,11 +1057,11 @@ msgstr ""
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactContainerSource.cs:58
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/ContactSourceContents.cs:101
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakty"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:80
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:315
 #, csharp-format
@@ -1069,12 +1071,12 @@ msgstr ""
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:318
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/ContactRequestDialog.cs:83
 msgid "Accept"
-msgstr ""
+msgstr "Prijať"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:323
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/ContactRequestDialog.cs:94
 msgid "Reject"
-msgstr ""
+msgstr "Odmietnuť"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:331
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:340
@@ -1091,7 +1093,7 @@ msgstr ""
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:394
 msgid "Loading playlists..."
-msgstr ""
+msgstr "Načítavajú sa zoznamy skladieb..."
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:406
 msgid "A problem occured while downloading this contact's library"
diff --git a/po/de.po b/po/uk_UA.po
similarity index 66%
copy from po/de.po
copy to po/uk_UA.po
index ef4db7a..0b2611e 100644
--- a/po/de.po
+++ b/po/uk_UA.po
@@ -8,175 +8,175 @@ msgstr ""
 "Project-Id-Version: Banshee Community Extensions\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions\n"
 "POT-Creation-Date: 2011-03-22 23:13+0100\n"
-"PO-Revision-Date: 2011-03-23 00:09+0000\n"
-"Last-Translator: bl8 <bertrand.lorentz at gmail.com>\n"
+"PO-Revision-Date: 2011-04-11 21:47+0000\n"
+"Last-Translator: Sergiy_Gavrylov <sergiovana at bigmir.net>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: uk_UA\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/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:69
 msgid "Alarm Clock"
-msgstr "Wecker"
+msgstr "Будильник"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:73
 msgid "Sleep Timer..."
-msgstr "Einschlaf-Funktion"
+msgstr "Таймер..."
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74
 msgid "Set the sleep timer value"
-msgstr "Setze die Einschlafzeit"
+msgstr "Встановлює час вмикання"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:77
 msgid "Alarm..."
-msgstr "Wecker"
+msgstr "Сигнал..."
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78
 msgid "Set the alarm time"
-msgstr "Setze die Weckzeit"
+msgstr "Встановити час сигналу"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:81
 #: ../src/LCD/Banshee.LCD/LCDService.cs:70
 msgid "_Configure..."
-msgstr "_Konfigurieren"
+msgstr "_Налаштування..."
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82
 msgid "Configure the Alarm Clock plugin"
-msgstr "Konfiguriere das Wecker Plugin"
+msgstr "Налаштувати модуль «Будильник»"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmConfigDialog.cs:45
 msgid "Alarm Time"
-msgstr "Weckzeit"
+msgstr "Час сигналу"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmConfigDialog.cs:63
 msgid "Enable Alarm"
-msgstr "Wecker Einschalten"
+msgstr "Увімкнути сигнал"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/AlarmConfigDialog.cs:66
 msgid "Set Time: "
-msgstr "Setze Zeit:"
+msgstr "Встановити час: "
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:47
 msgid "Alarm Clock configuration"
-msgstr "Wecker Konfiguration"
+msgstr "Налаштування «Будильника»"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:63
 msgid "Start"
-msgstr "Start"
+msgstr "Початок"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:67
 msgid "End"
-msgstr "Ende"
+msgstr "Кінець"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:74
 msgid "<b>Volume</b>"
-msgstr "<b> Lautstärke </b>"
+msgstr "<b>Гучність</b>"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:78
 msgid "Duration:"
-msgstr "Dauer:"
+msgstr "Тривалість:"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:79
 msgid " <i>(seconds)</i>"
-msgstr "<i>Sekunden</i>"
+msgstr "<i>(секунд)</i>"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:88
 msgid "Fade-In Adjustment"
-msgstr "Fade-In Anpassung"
+msgstr "Регулювання наростання сигналу"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:93
 msgid "Command:"
-msgstr "Befehl:"
+msgstr "Команда:"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/ConfigurationDialog.cs:97
 msgid "Command To Execute:"
-msgstr "Auszuführender Befehl:"
+msgstr "Команда до виконання:"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:46
 msgid "Sleep Timer"
-msgstr "Einschlaf-Funktion"
+msgstr "Таймер"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:72
 msgid "Sleep Timer :"
-msgstr "Einschlaf-Funktion:"
+msgstr "Час вмикання :"
 
 #: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:83
 msgid "Start Timer"
-msgstr "Starte Timer"
+msgstr "Запустити таймер"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:73
 msgid "Connect"
-msgstr "Verbinden"
+msgstr "З'єднати"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:85
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:92
 msgid "Artist"
-msgstr "Künstler"
+msgstr "Виконавець"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:87
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:93
 msgid "Album"
-msgstr "Album"
+msgstr "Альбом"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:89
 msgid "Playlist"
-msgstr "Wiedergabeliste"
+msgstr "Список відтворення"
 
 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:91
 msgid "Title"
-msgstr "Titel"
+msgstr "Назва"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:86
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:62
 msgid "Password:"
-msgstr "Passwort:"
+msgstr "Пароль:"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:99
 msgid "Ampache Server Name:"
-msgstr "Ampache Servername:"
+msgstr "Назва сервера Ampache:"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:110
 msgid "User Name:"
-msgstr "Benutzername:"
+msgstr "Користувач:"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:131
 msgid "Save"
-msgstr "Speichern"
+msgstr "Зберегти"
 
 #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:142
 msgid "Clear"
-msgstr "Leeren"
+msgstr "Очистити"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:132
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:169
 msgid "_Close"
-msgstr "S_chließen"
+msgstr "_Закрити"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:133
 msgid "Close"
-msgstr "Schließen"
+msgstr "Закрити"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:139
 msgid "_Show Banshee"
-msgstr "Banshee an_zeigen"
+msgstr "_Показати Banshee"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:140
 msgid "Show the Banshee main window"
-msgstr "Zeige das Banshee Hauptfenster"
+msgstr "Показати головне вікно Banshee"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:231
 msgid "Still Running"
-msgstr "läuft noch"
+msgstr "Досі працює"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:233
 msgid ""
 "Banshee was closed to the notification area. Use the <i>Quit</i> option to "
 "end your session."
 msgstr ""
-"Banshee wurde in die Informationsleiste minimiert. Nutze die "
-"<i>Schließen</i>-Funktion um deine Sitzung zu beenden."
+"Banshee згорнутий до області сповіщення. Натисніть пункт <i>Вийти</i>, щоб "
+"закрити його."
 
 #. Translators: {0} and {1} are Artist Name and
 #. Album Title, respectively;
@@ -184,137 +184,135 @@ msgstr ""
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:308
 #, csharp-format
 msgid "by '{0}' from '{1}'"
-msgstr "von '{0}' aus '{1}'S"
+msgstr "виконує '{0}' з альбому '{1}'"
 
 #. Translators: {0} is for Album Title;
 #. e.g. 'from Killing with a Smile'
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:313
 #, csharp-format
 msgid "from '{0}'"
-msgstr "aus '{0}'"
+msgstr "з альбому '{0}'"
 
 #. Translators: {0} is for Artist Name;
 #. e.g. 'by Parkway Drive'
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:318
 #, csharp-format
 msgid "by '{0}'"
-msgstr "von '{0}'"
+msgstr "виконує '{0}'"
 
 #: ../src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs:397
 msgid "Skip this item"
-msgstr "Dieses Element überspringen"
+msgstr "Пропустити цей елемент"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowContents.cs:263
 msgid "Track list"
-msgstr "Trackliste"
+msgstr "Список доріжок"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:50
 msgid "Sensitivity for album dragging"
-msgstr "Empfindlichkeit für Album Dragging"
+msgstr "Чутливість прокручування альбому"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:51
 msgid ""
 "Sets the sensitivity with which albums scroll when dragged, higher values "
 "mean faster scrolling"
 msgstr ""
-"Stellt die Empfindlichkeit für das Album Scrolling mittels Mausdrag ein. "
-"Höhere Werte bedeuten schnelleres Scrolling."
+"Встановлює чутливість прокручування альбому, більше значення означає швидше "
+"прокручування"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:57
 msgid "Enable threaded loading of artwork"
-msgstr "Lade Artworks in eigenen Threads"
+msgstr "Увімкнути потокове завантаження обкладинок"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:58
 msgid "If enabled ClutterFlow will use threading to load it's artwork"
-msgstr "Wenn gesetzt benutzt ClutterFlow eigene Threads um Artworks zu laden"
+msgstr "Якщо увімкнено, ClutterFlow завантажуватиме обкладинки через потік"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:64
 msgid "Unfolds the track list"
-msgstr "Klappt die Trackliste aus"
+msgstr "Розкривати список доріжок"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:65
 msgid "If checked it will display the track list when not in fullscreen mode"
 msgstr ""
-"Wenn gesetzt wird die Trackliste angezeigt wenn kein Vollbild aktiviert ist"
+"Якщо позначено, список доріжок показуватиметься в режимі не на повний екран"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:85
 msgid "Immediately apply playback mode changes"
-msgstr "Wende Playback Mode Änderungen sofort an"
+msgstr "Негайно застосувати змінений режим відтворення"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:86
 msgid ""
 "Starts playing a new song immediately after the playback mode changed (Party"
 " Mode or Album Mode)"
 msgstr ""
-"Startet die Wiedergabe eines neuen Liedes sofort nach Änderung des Playback "
-"Mode (Party Mode oder Album Mode)"
+"Запускає відтворення нового твору негайно після зміни режиму відтворення "
+"(Режими вечірки або альбому)"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:92
 msgid "Display album _label"
-msgstr "Zeige Album _Label"
+msgstr "Показувати категорію а_льбому"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:93
 msgid "Wether or not the album label needs to be shown above the artwork"
-msgstr "Bestimmt, ob das Album Label über dem Artwork gezeigt wird"
+msgstr "Чи потрібно показувати категорію альбому вище обкладинки"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:99
 msgid "Display track _title"
-msgstr "Zeige Track _Titel"
+msgstr "Показувати _назву доріжки"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:100
 msgid ""
 "Wether or not the album title needs to be shown above the artwork in "
 "fullscreen mode"
 msgstr ""
-"Bestimmt, ob der Album Titel im Vollbild Modus über dem Artwork gezeigt wird"
+"Чи потрібно показувати назву альбому вище обкладинки у повноекранному режимі"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:106
 msgid "Texture size in pixels"
-msgstr "Texturgröße in Pixeln"
+msgstr "Розмір текстури в пікселях"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:107
 msgid "The in-memory size of the cover textures in pixels"
-msgstr "Die Größe der Covertextur in Pixeln im Speicher"
+msgstr "Розмір в пам'яті текстури обкладинки в пікселях"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:113
 msgid "Minimal cover size in pixels"
-msgstr "Minimale Covergröße in Pixeln"
+msgstr "Мінімальний розмір обкладинки в пікселях"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:114
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:121
 msgid "The on-stage minimal cover size in pixels"
-msgstr "Minimale On-Stage Covergröße in Pixeln"
+msgstr "Мінімальний розмір обкладинки в пікселях до показу"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:120
 msgid "Maximal cover size in pixels"
-msgstr "Maximale Covergröße in Pixeln"
+msgstr "Максимальний розмір обкладинки в пікселях"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:127
 msgid "Number of visible covers at the side"
-msgstr "Anzahl der sichtbaren Covers an der Seite"
+msgstr "Кількість видимих обкладинок на панелі"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:128
 msgid ""
 "The number of covers that need to be displayed on the stage (at one side)"
-msgstr ""
-"Die Anzahl der Covers welche auf der Bühne angezeigt werden sollen (pro "
-"Seite)"
+msgstr "Кількість видимих обкладинок, які потрібно показувати на панелі"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:134
 msgid "Sort covers by"
-msgstr "Ordne Covers nach"
+msgstr "Сортувати обкладинки за"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:135
 msgid "Selects on what basis covers should be sorted"
-msgstr "Wählt das Kriterium aus, nach dem Covers sortiert werden."
+msgstr "Вибрати спосіб сортування основних обкладинок"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowService.cs:231
 msgid "Show ClutterFlow Browser"
-msgstr "Zeige den ClutterFlow Browser"
+msgstr "Показувати переглядач ClutterFlow"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowService.cs:232
 msgid "Show or hide the ClutterFlow browser"
-msgstr "Zeige oder verstecke den ClutterFlow Browser"
+msgstr "Показати чи приховати переглядач ClutterFlow"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowService.cs:325
 msgid "ClutterFlow"
@@ -322,182 +320,177 @@ msgstr "ClutterFlow"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowService.cs:328
 msgid "General"
-msgstr "Allgemein"
+msgstr "Загальне"
 
 #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowService.cs:337
 msgid "Dimensions"
-msgstr "Ausmaße"
+msgstr "Розміри"
 
 #: ../src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs:62
 msgid "Jamendo Downloads"
-msgstr "Jamendo Downloads"
+msgstr "Завантаження з Jamendo"
 
 #: ../src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs:63
 msgid "Contacting..."
-msgstr "Kontaktieren..."
+msgstr "З'єднання..."
 
 #: ../src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs:103
 msgid "Importing..."
-msgstr "Importieren..."
+msgstr "Імпортування..."
 
 #: ../src/Jamendo/Banshee.Jamendo/JamendoWebBrowserShell.cs:41
 #, csharp-format
 msgid "Search Jamendo"
-msgstr "Suche auf Jamendo"
+msgstr "Пошук в Jamendo"
 
 #: ../src/Karaoke/Banshee.Karaoke/Gui/ContextPage.cs:45
 msgid "Karaoke"
-msgstr ""
+msgstr "Караоке"
 
 #: ../src/Karaoke/Banshee.Karaoke/Gui/KaraokePane.cs:131
 msgid ""
 "You are disconnected from the internet, so karaoke lyrics are not available."
-msgstr ""
+msgstr "Зв'язок з інтернетом втрачений, тому текст караоке недоступний"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:84
 msgid "Karaoke configuration"
-msgstr "Karaoke Konfiguration"
+msgstr "Налаштування «Караоке»"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:88
 msgid ""
 "You can alter the parameters of the karaoke effect here and define custom "
 "filter-band, filter-width and effect level."
 msgstr ""
-"Du kannst die Parameter für den Karaokeeffekt hier ändern und eigene Werte "
-"für Filterband, Filterbreite und Effektlevel setzen."
+"Тут можете змінити параметри ефекту караоке та вказати фільтри смуги і "
+"ширини та рівень ефекту."
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:94
 msgid "Effect Level:"
-msgstr "Effektlevel:"
+msgstr "Рівень ефекту:"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:95
 msgid "Filter Band:"
-msgstr "Filterband:"
+msgstr "Фільтр смуги:"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:96
 msgid "Filter Width:"
-msgstr "Filterbreite:"
+msgstr "Фільтр ширини:"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:101
 msgid ""
 "The effect level defines to what degree the voice frequencies are reduced."
-msgstr ""
-"Der Effektlevel definiert den Grad um den die Stimmfrequenzen reduziert "
-"werden."
+msgstr "Рівень ефекту визначає рівень зменшення частоти голосу."
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:108
 msgid ""
 "The filter band defines position of filter within the frequency spectrum."
-msgstr ""
-"Das Filterband definiert die Position des Filters im Frequenzspektrum."
+msgstr "Фільтр смуги визначає положення фільтра в частотному спектрі."
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:115
 msgid ""
 "The filter width defines how wide the spectrum of the filtered frequencies "
 "is."
-msgstr ""
-"Die Filterbreite definiert wie breit das Spektrum der gefilterten Frequenzen"
-" ist."
+msgstr "Фільтр ширини визначає, наскільки широкий спектр фільтрування частот."
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:121
 msgid "Enable lyrics display in Context Pane"
-msgstr ""
+msgstr "Увімкнути показ тексту пісні в контекстній панелі"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:124
 msgid "Restore _defaults"
-msgstr "_Originalwerte einstellen"
+msgstr "_Відновити типові параметри"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:127
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102
 msgid "_Cancel"
-msgstr "_Abbrechen"
+msgstr "_Скасувати"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:129
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104
 msgid "_Save"
-msgstr "_Speichern"
+msgstr "З_берегти"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:91
 msgid "_Karaoke"
-msgstr "_Karaoke"
+msgstr "_Караоке"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:93
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:106
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:108
 msgid "_Configure"
-msgstr "_Konfigurieren"
+msgstr "Н_алаштувати"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:94
 msgid "Configure the Karaoke extension"
-msgstr "Konfiguriere die Karaoke Erweiterung"
+msgstr "Налаштувати розширення «Караоке»"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:105
 msgid "_Activate Karaoke mode"
-msgstr "_Aktiviere Karaoke Modus"
+msgstr "Ак_тивувати режим «Караоке»"
 
 #: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:106
 msgid "Activate Karaoke mode"
-msgstr "Aktiviere Karaoke Modus"
+msgstr "Активувати режим «Караоке»"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76
 msgid "Get Information From Track Fingerprint"
-msgstr "Hole Informationen über die Track-Signatur"
+msgstr "Отримати дані з «Track Fingerprint»"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:77
 msgid "Get track information from last.fm acoustic fingerprint"
-msgstr "Hole Track Informationen über die akustische last.fm Signatur"
+msgstr "Отримати дані з акустичного відбитку last.fm"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:106
 msgid "Getting sound fingerprint"
-msgstr "Erstelle akustische Signatur"
+msgstr "Отримання акустичного відбитку"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:109
 msgid "Scanning..."
-msgstr "Scanning..."
+msgstr "Сканування..."
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:49
 msgid "Log in to Last.fm"
-msgstr "Bei Last.fm einloggen"
+msgstr "Увійти до Last.fm"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:69
 msgid "Last.fm Account Login"
-msgstr "Last.fm Konto Login"
+msgstr "Обліковий запис на Last.fm"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:71
 msgid "Please enter your Last.fm account credentials."
-msgstr "Bitte gib deine Last.fm Kontodaten ein."
+msgstr "Введіть свої реєстраційні дані на Last.fm."
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:92
 msgid "Log In"
-msgstr "Einloggen"
+msgstr "Увійти"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:57
 msgid "Username:"
-msgstr "Benutzername:"
+msgstr "Користувач:"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:101
 msgid "Sign up for Last.fm"
-msgstr "Bei Last.fm registrieren"
+msgstr "Зареєструватись на Last.fm"
 
 #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:113
 msgid "Authorize for Last.fm"
-msgstr "Für Last.fm authorisieren"
+msgstr "Авторизуватись на Last.fm"
 
 #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:46
 msgid "LCD configuration"
-msgstr "LCD Konfiguration"
+msgstr "Налаштування LCD"
 
 #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:54
 msgid "Hostname:"
-msgstr "Hostname:"
+msgstr "Назва вузла:"
 
 #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:61
 msgid "Port:"
-msgstr "Port:"
+msgstr "Порт:"
 
 #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:67
 msgid "LCDProc Daemon:"
-msgstr "LCDProc Daemon:"
+msgstr "Демон LCDProc:"
 
 #: ../src/LCD/Banshee.LCD/LCDService.cs:67
 msgid "LCD"
@@ -505,7 +498,7 @@ msgstr "LCD"
 
 #: ../src/LCD/Banshee.LCD/LCDService.cs:71
 msgid "Configure the LCD plugin"
-msgstr "Konfiguriere das LCD Plugin"
+msgstr "Налаштування модуля LCD"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioConfigDialog.cs:75
 #, csharp-format
@@ -513,20 +506,20 @@ msgid ""
 "{0}LiveRadio configuration\n"
 "{1}"
 msgstr ""
-"{0}LiveRadio Konfiguration\n"
+"Налаштування {0}LiveRadio\n"
 "{1}"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioConfigDialog.cs:81
 msgid "Please set your preferences for your LiveRadio plugins\n"
-msgstr "Einstellungen für die LiveRadio Plugins\n"
+msgstr "Встановіть параметри для модуля LiveRadio\n"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioConfigDialog.cs:91
 msgid "Enable this plugin"
-msgstr "Plugin aktivieren"
+msgstr "Увімкнути цей модуль"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioFilterView.cs:87
 msgid "Choose By Genre"
-msgstr "Genreauswahl"
+msgstr "Добирати за жанром"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioFilterView.cs:91
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:172
@@ -535,174 +528,174 @@ msgstr "Genreauswahl"
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:141
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:388
 msgid "Loading..."
-msgstr "Lade..."
+msgstr "Завантаження..."
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioFilterView.cs:95
 msgid "Choose By Query"
-msgstr "Freitextsuche"
+msgstr "Вибирати за запитом"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:581
 msgid "Yes"
-msgstr "Ja"
+msgstr "Так"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:581
 msgid "No"
-msgstr "Nein"
+msgstr "Ні"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:74
 msgid "Proxy URL"
-msgstr "Proxy Adresse"
+msgstr "URL проксі"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:75
 msgid "Enable using a HTTP proxy server"
-msgstr "Benutze HTTP Proxy"
+msgstr "Увімкнути через проксі-сервер HTTP"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:76
 msgid "Use Site Login"
-msgstr "Benutze Login der Seite"
+msgstr "Використовувати дані реєстрації"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:77
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:58
 msgid "Username"
-msgstr "Benutzername"
+msgstr "Користувач"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:78
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:85
 msgid "Password"
-msgstr "Passwort"
+msgstr "Пароль"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioPluginConfigurationWidget.cs:79
 msgid "HTTP timeout in seconds"
-msgstr "HTTP Timeout in Sekunden"
+msgstr "Затримка HTTP в секундах "
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:129
 msgid "Browser on Left"
-msgstr "Browser links"
+msgstr "Переглядач ліворуч"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:130
 msgid "Show the artist/album browser to the left of the track list"
-msgstr "Zeige den Artist/Album Browser links von der Trackliste"
+msgstr "Показувати переглядач виконавця/альбому ліворуч списку доріжок"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:133
 msgid "Browser on Top"
-msgstr "Browser oben"
+msgstr "Переглядач у верху"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:134
 msgid "Show the artist/album browser above the track list"
-msgstr "Zeige den Artist/Album browser oberhalb der Trackliste"
+msgstr "Показувати переглядач виконавця/альбому вище списку доріжок"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:139
 msgid "Show Browser"
-msgstr "Zeige Browser"
+msgstr "Показати переглядач"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:140
 msgid "Show or hide the artist/album browser"
-msgstr "Zeige/Verstecke den Artist/Album Browser"
+msgstr "Показати або приховати переглядач виконавця/альбому"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:203
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:251
 msgid "Error... Please Reload"
-msgstr "Fehler... bitte neu laden"
+msgstr "Помилка... Перезавантажте"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs:423
 msgid ""
 "Click a genre to load/refresh entries or type a query. Use the refresh "
 "button to refresh genres."
 msgstr ""
-"Genre klicken zum (Neu)Laden der Liste oder Freitextsuche eingeben. Refresh "
-"zum Neuladen der Genreliste. "
+"Натисніть жанр для завантаження/оновлення запису або введіть запит. "
+"Використовуйте кнопку оновлення, щоб оновити жанри."
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:69
 msgid "LiveRadioPlugin"
-msgstr "LiveRadio Plugin"
+msgstr "Модуль LiveRadio"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121
 msgid "Station"
-msgstr "Sendername"
+msgstr "Станція"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:122
 msgid "Creator"
-msgstr "Urheber"
+msgstr "Автор"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:123
 msgid "Description"
-msgstr "Beschreibung"
+msgstr "Опис"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:179
 msgid "Requested Results Returned"
-msgstr "Anfrageergebnis geliefert"
+msgstr "Запитані результати отримано"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:180
 msgid ""
 "The plugin has returned a list of results for a genre or freetext query"
-msgstr "Das Plugin hat die Ergebnisse einer Anfrage geliefert"
+msgstr "Модуль отримав запитаний список результатів для жанрів"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:199
 msgid "Genre List Retrieved"
-msgstr "Genre Liste geliefert"
+msgstr "Список жанрів отримано"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:200
 msgid "The plugin has returned the list of genres"
-msgstr "Das Plugin hat eine Liste von Genres geliefert"
+msgstr "Модуль повернув список жанрів"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:266
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Модуль"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:267
 msgid "Version"
-msgstr "Version"
+msgstr "Версія"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:268
 msgid "Enabled"
-msgstr "Aktiviert"
+msgstr "Увімкнено"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:279
 msgid "Type"
-msgstr "Typ"
+msgstr "Тип"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:280
 msgid "Origin"
-msgstr "Ursprung"
+msgstr "Джерело"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:281
 msgid "Short Info"
-msgstr "Kurzinfo"
+msgstr "Стислі дані"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:282
 msgid "Long Info"
-msgstr "Details"
+msgstr "Розширені дані"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:283
 msgid "Count"
-msgstr "Anzahl"
+msgstr "Кількість"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:284
 msgid "Average"
-msgstr "Durchschnitt"
+msgstr "Середнє"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:285
 msgid "Updates"
-msgstr "Auftreten"
+msgstr "Оновлення"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:296
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:297
 msgid "Enable Plugin"
-msgstr "Plugin aktivieren"
+msgstr "Увімкнути модуль"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:299
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:300
 msgid "Disable Plugin"
-msgstr "Plugin deaktivieren"
+msgstr "Вимкнути модуль"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:302
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:303
 msgid "Configure Plugin"
-msgstr "Plugin konfigurieren"
+msgstr "Налаштувати модуль"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSourceContents.cs:317
 msgid "Plugin Statistics"
-msgstr "Plugin Statistiken"
+msgstr "Статистика модуля"
 
 #. / <summary>
 #. / Constructor -- creates a new LiveRadio parent source
@@ -718,20 +711,20 @@ msgstr "Live_Radio"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107
 msgid "Configure the LiveRadio plugin"
-msgstr "Konfiguriere das LiveRadio plugin"
+msgstr "Налаштування модуля LiveRadio"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:111
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:112
 msgid "Refresh View"
-msgstr "Anzeige neu laden"
+msgstr "Оновити вигляд"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:116
 msgid "Add To Internet Radio"
-msgstr "Zum Internet Radio hinzufügen"
+msgstr "Додати інтернет-радіостанцію"
 
 #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:117
 msgid "Add stream as Internet Radio Station"
-msgstr "Stream als Internet Radio Sender hinzufügen"
+msgstr "Додати потік як інтернет-радіостанцію"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/ContextPage.cs:45
 msgid "Lyrics"
@@ -740,36 +733,36 @@ msgstr "Lyrics"
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:66
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:127
 msgid "add"
-msgstr "hinzufügen"
+msgstr "додати"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:116
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:125
 msgid "No lyrics found."
-msgstr "Keine Lyrics gefunden."
+msgstr "Текст не знайдено."
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:128
 msgid "Click here to manually add a new lyric"
-msgstr "Klicke hier um Lyrics manuell hinzuzufügen"
+msgstr "Натисніть тут, щоб вручну додати текст"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsBrowser.cs:132
 msgid "Suggestions:"
-msgstr "Vorschläge:"
+msgstr "Варіанти:"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsWindow.cs:97
 msgid "Copy lyrics to clipboard"
-msgstr "Kopiere Songtext in die Zwischenablage"
+msgstr "Копіювати текст до буферу обміну"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsWindow.cs:144
 msgid "by"
-msgstr "von"
+msgstr " "
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsWindow.cs:147
 msgid "Unknown Artist"
-msgstr "Unbekannter Künstler"
+msgstr "Невідомий виконавець"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsDownloadJob.cs:17
 msgid "Downloading Lyrics"
-msgstr "Lyrics herunterladen"
+msgstr "Завантаження текстів"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsDownloadJob.cs:61
 #, csharp-format
@@ -782,109 +775,108 @@ msgstr "L_yrics"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:172
 msgid "Manage Lyrics"
-msgstr "Verwalte Lyrics"
+msgstr "Керування текстами"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:174
 msgid "_Download Lyrics"
-msgstr "Lyrics Herunterla_den"
+msgstr "_Завантаження текстів"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:175
 msgid "Download lyrics for all tracks"
-msgstr "Lade lyrics für alle Tracks"
+msgstr "Завантажити тексти для всіх доріжок"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:180
 msgid "Show Lyrics"
-msgstr "Lyrics anzeigen"
+msgstr "Показати текст пісні"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics/LyricsService.cs:181
 msgid "Show Lyrics in a separate window"
-msgstr "Zeige Lyrics im eigenen Fenster"
+msgstr "Показувати текст в окремому вікні"
 
 #: ../src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Sources/LyricsWebSource.cs:50
 #, csharp-format
 msgid "Powered by {0} ({1})"
-msgstr "Powered by {0} ({1})"
+msgstr "За підтримкою {0} ({1})"
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:42
 msgid "Magnatune Configuration"
-msgstr "Magnatune Konfiguration"
+msgstr "Налаштування Magnatune"
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:113
 msgid "Membership Type"
-msgstr "Art der Mitgliedschaft"
+msgstr "Тип членства"
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:121
 msgid "None"
-msgstr "Keine"
+msgstr "Немає"
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:122
 msgid "Streaming"
-msgstr "Streaming"
+msgstr "Потокове"
 
 #: ../src/Magnatune/Banshee.Magnatune/gtk-gui/Magnatune.Configuration.cs:123
 msgid "Download"
-msgstr "Herunterladen"
+msgstr "Завантаження"
 
 #: ../src/Mirage/Banshee.Mirage/AnalyzeLibraryJob.cs:20
 msgid "Analyzing Song Similarity"
-msgstr "Analysiere Liedähnlichkeit"
+msgstr "Аналіз схожості творів"
 
 #: ../src/Mirage/Banshee.Mirage/AnalyzeLibraryJob.cs:47
 msgid ""
 "Are you sure you want to stop Mirage?\n"
 "Shuffle by Similar will only work for the tracks which are already analyzed. The operation can be resumed at any time from the <i>Tools</i> menu."
 msgstr ""
-"Soll Mirage wirklich angehalten werden?\n"
-"Zufallswiedergabe nach Ähnlichkeit funktioniert nur für bereits analysierte Tracks. Die Analyse kann jederyeit im <i>Tools</i>-Menü fortgesetzt werden."
+"Ви впевнені, що хочете зупинити Mirage?\n"
+"Перемішування за схожими працюватиме лише для вже проаналізованих доріжок. Аналіз можна відновити в будь-який час через меню <i>Інструменти</i>."
 
 #: ../src/Mirage/Banshee.Mirage/DistanceCalculator.cs:48
 msgid ""
 "The Mirage extension is still analyzing your songs.  Until its finished, "
 "shuffle and fill by similar may not perform properly."
 msgstr ""
-"Mirage hat die Liedanalyse noch nicht beendet. Zufallswiedergabe und "
-"Ausfüllen nach Ähnlichkeit funktionieren erst danach vollständig."
+"Розширення Mirage все ще виконує аналіз.  До його завершення, перемішування "
+"та наповнення схожими творами може працювати не коректно."
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:158
 msgid "Mirage Duplicates"
-msgstr "Mirage Duplikate"
+msgstr "Дублікати Mirage"
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:251
 msgid "Mirage Playlist Generator"
-msgstr "Mirage Wiedergabelisten-Generator"
+msgstr "Генератор списків відтворення Mirage"
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:252
 msgid "Manage the Mirage extension"
-msgstr "Verwaltung des Mirage Plugins"
+msgstr "Керування розширенням Mirage"
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:255
 msgid "Rescan the Music Library"
-msgstr "Musiksammlung neu einlesen"
+msgstr "Пересканувати фонотеку"
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:256
 msgid "Rescans the Music Library for new songs"
-msgstr ""
-"Scannt die Musiksammlung nach neuen Liedern und analysiert diese mit Mirage."
+msgstr "Пересканувати фонотеку на нові твори"
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:260
 msgid "Duplicate Search (Experimental)"
-msgstr "Duplikat-Suche (Experimentell)"
+msgstr "Пошук дублікатів (Експерементально)"
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:261
 msgid "Searches your Music Library for possible duplicates"
-msgstr "Durchsuchte deine Musikbibliothek nach möglichen Duplikaten"
+msgstr "Пошук можливих дублікатів у фонотеці"
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:265
 msgid "Reset Mirage"
-msgstr "Mirage zurücksetzen"
+msgstr "Перезавантажити Mirage"
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:266
 msgid ""
 "Resets the Mirage Playlist Generation Plugin. All songs have to be analyzed "
 "again to use Automatic Playlist Generation."
 msgstr ""
-"Setzt Mirage zurück. Alle Lieder müssen nochmals analysiert werden um wieder"
-" automatisch Playlisten mit Mirage generieren zu können."
+"Перезапускає модуль Mirage. Всі твори будуть знову проаналізовані через "
+"генератор автоматичних списків відтворення."
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:279
 msgid ""
@@ -893,38 +885,38 @@ msgid ""
 "· To do so, your music library needs to be analyzed completely from Mirage.\n"
 "· This process will take a long time depending on the size of your library."
 msgstr ""
-"<b>Mirage kann deine Musikbibliothek auf mögliche doppelt vorhandene Musikstücke prüfen.</b>\n"
+"<b>Mirage може виконувати пошук дублікатів у фонотеці</b>\n"
 "\n"
-"· Die Musikbibliothek muss dafür komplett von Mirage analysiert sein.\n"
-"· Dieser Vorgang dauert lange, abhängig von der Größe der Bibliothek."
+"· Для цього потрібно виконати повний аналіз фонотеки за допомогою Mirage.\n"
+"· Ця дія триватиме деякий час залежно від розміру вашої фонотеки."
 
 #: ../src/Mirage/Banshee.Mirage/MiragePlugin.cs:282
 msgid "Scan for Duplicates"
-msgstr "Scanne nach Duplikaten"
+msgstr "Пошук дублікатів"
 
 #: ../src/Mirage/Banshee.Mirage/RandomBySimilar.cs:54
 msgid "Shuffle by Similar"
-msgstr "Zufallswiedergabe nach Ähnlichkeit"
+msgstr "Перемішати за подібними"
 
 #: ../src/Mirage/Banshee.Mirage/RandomBySimilar.cs:55
 msgid "by similar"
-msgstr "nach Ähnlickeit"
+msgstr "за подібними"
 
 #: ../src/Mirage/Banshee.Mirage/RandomBySimilar.cs:56
 msgid "Play songs similar to those already played"
-msgstr "Spiele Lieder ähnlich denen die schon gespielt wurden"
+msgstr "Відтворювати твори подібні до вже відтворених"
 
 #: ../src/OpenVP/Banshee.OpenVP/VisualizationDisplayWidget.cs:68
 msgid "No visualizations installed"
-msgstr "Keine Visualisierungen installiert"
+msgstr "Немає встановлених візуалізацій"
 
 #: ../src/OpenVP/Banshee.OpenVP/VisualizationDisplayWidget.cs:105
 msgid "Select visualization"
-msgstr "Wähle eine Visualisierung"
+msgstr "Вибрати візуалізацію"
 
 #: ../src/OpenVP/Banshee.OpenVP/VisualizationDisplayWidget.cs:111
 msgid "Low resolution"
-msgstr "Geringe Auflösung"
+msgstr "Низька роздільна здатність"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:105
 #, csharp-format
@@ -932,7 +924,7 @@ msgid ""
 "{0}Radiostation fetcher{1}\n"
 "({2})"
 msgstr ""
-"{0}Radiostation fetcher{1}\n"
+"{0}Упорядник радіостанцій{1}\n"
 "({2})"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:114
@@ -940,60 +932,59 @@ msgid ""
 "Choose a genre or enter a text that you wish to be queried, then press the "
 "Get stations button. Found stations will be added to internet-radio source."
 msgstr ""
-"Wähle ein Genre oder gib einen Text ein, der gesucht werden soll, dann "
-"drücke den Hole Stationen Button. Gefundene Stationen werden zum Internet "
-"Radio hinzugefügt."
+"Виберіть жанр або введіть текстовий запит, потім натисніть кнопку «Отримати "
+"станції». Отримані станції будуть додані до джерела інтернет-радіостанцій."
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:127
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:128
 msgid "Get stations"
-msgstr "Hole Stationen"
+msgstr "Отримати станції"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:147
 msgid "Query by genre:"
-msgstr "Suche nach Genre:"
+msgstr "Запит за жанром:"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:151
 msgid "Query by free text:"
-msgstr "Suche nach Freitext:"
+msgstr "Запит за текстом:"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:203
 #, csharp-format
 msgid "Querying genre \"{0}\""
-msgstr "Suche nach Genre \"{0}\""
+msgstr "Запитаний жанр \"{0}\""
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:208
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:229
 #, csharp-format
 msgid "Query done. Fetched {0} stations."
-msgstr "Suche abgeschlossen. {0} Stationen geholt."
+msgstr "Запит виконано. Знайдено {0} станцію(ій)."
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:212
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:233
 #, csharp-format
 msgid "ERROR: Internet-radio extension not available."
-msgstr "FEHLER: Internet-radio Plugin nicht verfügbar."
+msgstr "ПОМИЛКА: Розширення «Інтернет-радіо» недоступне."
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:215
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:236
 #, csharp-format
 msgid "ERROR: Network error."
-msgstr "FEHLER: Netzwerkfehler."
+msgstr "ПОМИЛКА: Помилка мережі."
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:218
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:239
 #, csharp-format
 msgid "ERROR"
-msgstr "FEHLER"
+msgstr "ПОМИЛКА"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:224
 #, csharp-format
 msgid "Querying freetext \"{0}\""
-msgstr "Suche nach Freitext \"{0}\""
+msgstr "Запитані за текстом \"{0}\""
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:69
 msgid "_Radiostation fetcher"
-msgstr "_Radiostation Fetcher"
+msgstr "_Упорядник радіостанцій"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:72
 msgid "_Shoutcast"
@@ -1001,7 +992,7 @@ msgstr "_Shoutcast"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:73
 msgid "Fetch stations from shoutcast"
-msgstr "Hole Stationen von shoutcast"
+msgstr "Виклик радіостанцій від shoutcast"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:76
 msgid "_Xiph"
@@ -1009,36 +1000,36 @@ msgstr "_Xiph"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:77
 msgid "Fetch stations from Xiph"
-msgstr "Hole Stationen von Xiph"
+msgstr "Виклик радіостанцій від Xiph"
 
 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/Xiph.cs:285
 #, csharp-format
 msgid "www.xiph.org {0} stations available."
-msgstr "www.xiph.org {0} Stationen verfügbar."
+msgstr "Доступно {0} www.xiph.org станцій."
 
 #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmSimilarArtists.cs:66
 msgid "Shuffle by similar Artists (via Lastfm)"
-msgstr "Zufallswiedergabe nach ähnlichen Künstlern (nach last.fm)"
+msgstr "Перемішати за подібним виконавцем (через Lastfm)"
 
 #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmSimilarArtists.cs:67
 msgid "by similar artists"
-msgstr "nach ähnlichen Künstlern"
+msgstr "за подібним виконавцем"
 
 #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmSimilarArtists.cs:68
 msgid "Play songs similar to those already played (via Lastfm)"
-msgstr "Spiele Lieder ähnlich denen die schon gespiel wurden (nach last.fm)"
+msgstr "Відтворювати твори подібні до вже відтворених (через Lastfm)"
 
 #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmUserTopArtists.cs:60
 msgid "Shuffle by your Top Artists (via Lastfm)"
-msgstr "Zufallswiedergabe nach Deinen Top Künstlern (nach last.fm)"
+msgstr "Перемішати за вашим рейтингом виконавців (через Lastfm)"
 
 #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmUserTopArtists.cs:61
 msgid "by your top artists"
-msgstr "nach Deinen Top Künstlern"
+msgstr "за вашим рейтингом виконавців"
 
 #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmUserTopArtists.cs:62
 msgid "Play songs from your Top Artists (via Lastfm)"
-msgstr "Spiele Lieder Deiner Top Künstler (nach last.fm)"
+msgstr "Відтворювати твори за вашим рейтингом виконавців (через Lastfm)"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:88
 #, csharp-format
@@ -1046,7 +1037,7 @@ msgid ""
 "{0}Streamrecorder configuration\n"
 "{1}"
 msgstr ""
-"{0}Streamrecorder Konfiguration\n"
+"{0}Налаштування Streamrecorder\n"
 "{1}"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:93
@@ -1054,28 +1045,28 @@ msgid ""
 "Please select output folder for ripped files and if ripped\n"
 "files should be imported to media library.\n"
 msgstr ""
-"Bitte den Dateiordner für die gerippten Dateien auswählen und\n"
-"ob diese in die Medienbibliothek importiert werden sollen.\n"
+"Виберіть вихідну теку для витягнутих файлів, якщо\n"
+"вони будуть імпортовані до медіа-бібліотеки.\n"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:96
 msgid "Output folder:"
-msgstr "Augabepfad:"
+msgstr "Вихідна тека:"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:97
 msgid "Encoder:"
-msgstr "Encoding:"
+msgstr "Кодер:"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:99
 msgid "_Browse"
-msgstr "_Durchsuchen"
+msgstr "_Огляд..."
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:106
 msgid "Import files to media library"
-msgstr "Importiere Dateien in die Medienbibliothek"
+msgstr "Імпорт файлів до фонотеки"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:108
 msgid "Enable automatic files splitting by Metadata"
-msgstr "Aktiviere automatisches Teilen der Dateien nach Metadaten"
+msgstr "Увімкнути автоматичну розбивку файлів за метаданими"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:106
 msgid "_Streamrecorder"
@@ -1083,180 +1074,172 @@ msgstr "_Streamrecorder"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:109
 msgid "Configure the Streamrecorder plugin"
-msgstr "Konfiguriere das Streamrecorder plugin"
+msgstr "Налаштування модуля Streamrecorder"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:112
 msgid "_Activate streamrecorder"
-msgstr "_Aktiviere Streamrecorder"
+msgstr "_Активувати streamrecorder"
 
 #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:113
 msgid "Activate streamrecorder process"
-msgstr "Aktiviere den Streamrecorder Prozess"
+msgstr "Активувати процес streamrecorder"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactContainerSource.cs:58
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/ContactSourceContents.cs:101
 msgid "Contacts"
-msgstr "Kontakte"
+msgstr "Контакти"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:80
 msgid "Contact"
-msgstr "Kontakt"
+msgstr "Контакт"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:315
 #, csharp-format
 msgid "{0} is requesting to browse your library"
-msgstr "{0} möchte in Deiner Bibliothek blättern"
+msgstr "Є {0} звертання на перегляд вашої фонотеки"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:318
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/ContactRequestDialog.cs:83
 msgid "Accept"
-msgstr "Zulassen"
+msgstr "Прийняти"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:323
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/ContactRequestDialog.cs:94
 msgid "Reject"
-msgstr "Ablehnen"
+msgstr "Відхилити"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:331
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:340
 msgid "is requesting to browse your Banshee library"
-msgstr "möchte in Deiner Banshee Bibliothek blättern"
+msgstr "є звертання на перегляд вашої фонотеки Banshee"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:380
 msgid "Waiting for response from contact..."
-msgstr "Warte auf Antwork vom Kontakt..."
+msgstr "Очікування на відгук від контакту..."
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:391
 msgid "All tracks downloaded. Loading..."
-msgstr "Alle Tracks heruntergeladen. Lade..."
+msgstr "Всі доріжки завантажено. Завантаження..."
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:394
 msgid "Loading playlists..."
-msgstr "Lade Wiedergabelisten..."
+msgstr "Завантаження списків відтворення..."
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:406
 msgid "A problem occured while downloading this contact's library"
-msgstr ""
-"Es ist ein Problem beim Herunterladen der Bibliothek dieses Kontakts "
-"aufgetreten"
+msgstr "Виникла проблема під час завантаження фонотеки від контакту"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:409
 msgid "An error occurred while loading data"
-msgstr "Es ist ein Fehler beim Ladens der Daten aufgetreten"
+msgstr "Виникла проблема під час завантаження даних"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:412
 msgid "An error occurred while loading playlists"
-msgstr "Es ist ein Fehler beim Laden der Wiedergabelisten aufgetreten"
+msgstr "Виникла проблема під час завантаження списків відтворення"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:432
 msgid "is no longer sharing their Banshee library with you"
-msgstr "hat seine Bibliothek nicht länger für Dich freigegeben"
+msgstr "більше не хоче ділитись своєю фонотекою Banshee з вами"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:457
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactSource.cs:494
 #, csharp-format
 msgid "Loading {0} of {1}"
-msgstr "Lade {0} von {1}"
+msgstr "Завантаження {0} з {1}"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/TelepathyDownload.cs:106
 #, csharp-format
 msgid "is sending {0} with Banshee"
-msgstr "sendet {0} mit Banshee"
+msgstr "надсилається {0} за допомогою Banshee"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/TelepathyUpload.cs:101
 #, csharp-format
 msgid "is downloading {0} with Banshee"
-msgstr "lädt {0} mit Banshee herunter"
+msgstr "завантажується {0} за допомогою Banshee"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/ContactRequestDialog.cs:42
 msgid "Contact Request"
-msgstr "Kontaktanfrage"
+msgstr "Запит контактів"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/ContactRequestDialog.cs:67
 #, csharp-format
 msgid "{0} would like to browse your music library."
-msgstr "{0} möchte in Deiner Musikbibliothek blättern"
+msgstr "{0} хотіли б переглянути вашу фонотеку."
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/DownloadManagerUi.cs:50
 msgid "Download(s) from Contacts"
-msgstr "Download(s) von Kontakten"
+msgstr "Завантаження від контактів"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/DownloadManagerUi.cs:51
 msgid "Downloads are in progress. Would you like to cancel them?"
-msgstr "Es gibt noch unfertige Downloads. Sollen diese abgebrochen werden?"
+msgstr "Завантаження виконуються. Хочете скасувати їх?"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:63
 msgid "Download Track(s)"
-msgstr "Track(s) herunterladen"
+msgstr "Завантаження доріжки(ок)"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:64
 msgid "Download selected tracks to your computer"
-msgstr "Lade die ausgewählten Tracks auf deinen Computer"
+msgstr "Завантажити вибрані доріжки на свій комп'ютер"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:70
 msgid "Cancel Download(s)"
-msgstr "Herunterladen abbrechen"
+msgstr "Скасувати завантаження"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:71
 msgid "Cancel download of selected tracks to your computer"
-msgstr ""
-"Bricht das herunterladen der ausgewählten Tracks auf deinen Computer ab"
+msgstr "Скасувати завантаження вибраних доріжок на ваш комп'ютер"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:77
 msgid "Cancel Browse Request"
-msgstr "Anfrage zum Blättern abbrechen"
+msgstr "Скасувати перегляд запитів"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:78
 msgid "Cancel pending request to browse a contact's library"
-msgstr ""
-"Zieht die aktuelle Anfrage zum Blättern in der Bibliothek des Kontaktes "
-"zurück"
+msgstr "Скасувати затримку запиту на перегляд фонотеки від контакту"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:84
 msgid "Allow Downloads"
-msgstr "Erlaube Herunterladen"
+msgstr "Дозволити завантаження"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:85
 msgid "Allow file downloads when sharing libraries"
-msgstr ""
-"Erlaube das Herunterladen von Dateien aus der freigegebenen Bibliothek"
+msgstr "Дозволити завантаження файлів зі спільних фонотек"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:91
 msgid "Allow Streaming"
-msgstr "Erlaube Streaming"
+msgstr "Дозволити потокову передачу"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:92
 msgid "Allow streaming when sharing libraries"
-msgstr "Erlaube Streaming von Dateien aus der freigegebenen Bibliothek"
+msgstr "Дозволити потокову передачу зі спільних фонотек"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:98
 msgid "Share Currently Playing"
-msgstr "Aktuelle Wiedergabe freigeben"
+msgstr "Поділитись відтворюваним на цей час"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:99
 msgid "Set Empathy presence message to what you're currently playing"
-msgstr "Zeigt in der Empathy Statusmitteilung deine aktuelle Wiedergabe an"
+msgstr "Показувати в Empathy повідомлення, що на цей час відтворюється"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TelepathyActions.cs:141
 #, csharp-format
 msgid "Currently playing {0} by {1} from {2}"
-msgstr "Spielt gerade {0} von {1} aus {2}"
+msgstr "На цей час відтворюється {0} виконує {1} з фльбому {2}"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TransferManagerUi.cs:50
 msgid "Transfer(s) to Contacts"
-msgstr "An Kontakt übertragen"
+msgstr "Передача(і) до контактів"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TransferManagerUi.cs:57
 msgid "File transfers are in progress. Would you like to cancel them?"
-msgstr ""
-"Einige Dateitransfers sind noch nicht abgeschlossen. Sollen diese "
-"abgebrochen werden?"
+msgstr "Виконується передача файлів. Хочете скасувати її?"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TransferManagerUi.cs:63
 #, csharp-format
 msgid "Transferring {0} of {1}"
-msgstr "Übertrage {0} von {1}"
+msgstr "Передача {0} з {1}"
 
 #: ../src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/TransferManagerUi.cs:131
 msgid "Initializing"
-msgstr "Initialisiere"
+msgstr "Ініціалізація"
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
index c4eddb0..1c54cdd 100644
--- a/src/AssemblyInfo.cs
+++ b/src/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyVersion("2.0.1")]
 
diff --git a/src/ClutterFlow/Banshee.ClutterFlow/AlbumLoader.cs b/src/ClutterFlow/Banshee.ClutterFlow/AlbumLoader.cs
index cae6c92..26af102 100755
--- a/src/ClutterFlow/Banshee.ClutterFlow/AlbumLoader.cs
+++ b/src/ClutterFlow/Banshee.ClutterFlow/AlbumLoader.cs
@@ -256,7 +256,9 @@ namespace Banshee.ClutterFlow
         }
 		
         protected override ClutterFlowBaseActor AddActorToList (AlbumInfo generator, SortedList<AlbumInfo, ClutterFlowBaseActor> list)
-        {	
+        {
+            if (generator == null)
+                generator = new AlbumInfo (AlbumInfo.UnknownAlbumTitle);
             string key = ClutterFlowAlbum.CreateCacheKey(generator);
             ClutterFlowBaseActor actor = Cache.ContainsKey (key) ? Cache[key] : null;
             if (actor==null) {
diff --git a/src/ClutterFlow/ClutterFlow/ClutterHelper.cs b/src/ClutterFlow/ClutterFlow/ClutterHelper.cs
index 4992e46..79243ad 100755
--- a/src/ClutterFlow/ClutterFlow/ClutterHelper.cs
+++ b/src/ClutterFlow/ClutterFlow/ClutterHelper.cs
@@ -52,24 +52,6 @@ namespace ClutterFlow
 		[DllImport ("libclutter-glx-1.0.so.0")]
 		private static extern void clutter_actor_box_from_vertices (ref ActorBox box, IntPtr[] vtx);
 		
-		/*[DllImport("libGL.so", EntryPoint = "glGetString")]
-		private static extern IntPtr glGetString(int s);
-
-		public static string OpenGLGetString (int i)
-		{
-			return Marshal.PtrToStringAnsi (glGetString (i));
-		}
-		public static bool CheckForExtension (string extension)
-		{
-			string extensions = OpenGLGetString(Cogl.GL.GL_EXTENSIONS);
-			if (String.IsNullOrEmpty (extensions)) {
-				return false;
-			}
-            else {
-				return extensions.Contains (extension);
-			}
-		}*/
-		
 		
 		public unsafe static ActorBox GetAbsAllocationBox (Actor actor)
 		{
diff --git a/src/Karaoke/Banshee.Karaoke/KaraokeService.cs b/src/Karaoke/Banshee.Karaoke/KaraokeService.cs
index 50c2841..1b39495 100644
--- a/src/Karaoke/Banshee.Karaoke/KaraokeService.cs
+++ b/src/Karaoke/Banshee.Karaoke/KaraokeService.cs
@@ -50,8 +50,8 @@ namespace Banshee.Karaoke
 
         private Gtk.ActionGroup actions;
         private InterfaceActionService action_service;
-        private uint ui_menu_id;
-        private uint ui_button_id;
+        private uint ui_menu_id = 0;
+        private uint ui_button_id = 0;
 
         private bool karaoke_enabled = true;
         private bool lyrics_enabled = false;
@@ -76,7 +76,7 @@ namespace Banshee.Karaoke
         #region IExtensionService implementation
         void IExtensionService.Initialize ()
         {
-
+            Marshaller.Init ();
             has_karaoke = Marshaller.CheckGstPlugin ("audiokaraoke");
             Hyena.Log.Debug ("[Karaoke] GstPlugin audiokaraoke" + (has_karaoke ? "" : " not") + " found");
             if (!has_karaoke) {
@@ -201,14 +201,20 @@ namespace Banshee.Karaoke
         #region IDisposable implementation
         void IDisposable.Dispose ()
         {
-            if (!playbin.IsNull ())
+            if (has_karaoke && !playbin.IsNull () && !audiokaraoke.IsNull ())
             {
                 audiokaraoke.SetFloatProperty ("level", 0);
                 audiokaraoke.SetFloatProperty ("mono-level", 0);
             }
-            action_service.UIManager.RemoveUi (ui_menu_id);
-            action_service.UIManager.RemoveUi (ui_button_id);
-            action_service.UIManager.RemoveActionGroup (actions);
+
+            if (ui_menu_id > 0)
+                action_service.UIManager.RemoveUi (ui_menu_id);
+
+            if (ui_button_id > 0)
+                action_service.UIManager.RemoveUi (ui_button_id);
+
+            if (actions != null)
+                action_service.UIManager.RemoveActionGroup (actions);
             actions = null;
         }
         #endregion
diff --git a/src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs b/src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs
index 2566111..a09473b 100644
--- a/src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs
+++ b/src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs
@@ -131,6 +131,8 @@ namespace Banshee.LastfmFingerprint
                     foreach (TrackInfo track in ((ITrackModelSource)source).TrackModel.SelectedItems) {
                         if (!active)
                             break;
+                        if (String.IsNullOrEmpty (track.Uri.AbsolutePath))
+                            continue;
                         ad = new AudioDecoder((int)track.Duration.TotalSeconds);
                         //respect last fm term of service :
                         //You will not make more than 5 requests per originating IP address per second, averaged over a 5 minute period
diff --git a/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp b/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp
index 8de3f0b..ded8ea1 100644
--- a/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp
+++ b/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp
@@ -261,7 +261,7 @@ Lastfmfp_initgstreamer(LastfmfpAudio *ma, const gchar *file)
     // Gstreamer decoder setup
     ma->pipeline = gst_pipeline_new("pipeline");
     
-    filename = std::string(g_strdup(file));
+    filename = file;
     
     // decoder
     src = gst_element_factory_make("filesrc", "source");
diff --git a/src/Lirc/Banshee.Lirc/Banshee.Lirc.dll.config b/src/Lirc/Banshee.Lirc/Banshee.Lirc.dll.config
index 0605d77..55916c1 100644
--- a/src/Lirc/Banshee.Lirc/Banshee.Lirc.dll.config
+++ b/src/Lirc/Banshee.Lirc/Banshee.Lirc.dll.config
@@ -1,4 +1,3 @@
 <configuration>
     <dllmap dll="liblircglue" target="liblircglue.so" />
-    <dllmap dll="lirc_client" target="liblirc_client.so" />
 </configuration>
diff --git a/src/Lirc/Banshee.Lirc/LircClient.cs b/src/Lirc/Banshee.Lirc/LircClient.cs
index ac8b1de..b01a0a4 100644
--- a/src/Lirc/Banshee.Lirc/LircClient.cs
+++ b/src/Lirc/Banshee.Lirc/LircClient.cs
@@ -69,7 +69,7 @@ namespace Lirc
         public string NextCode ()
         {
             string code;
-            if (lirc_nextcode (out code) == 0)
+            if (lirc_glue_nextcode (out code) == 0)
                 return (code);
             else
                 return (null);
@@ -91,8 +91,8 @@ namespace Lirc
 
         public bool Connect() {
             if(!is_connected) {
-                if (lirc_init (program_name, 1) == -1) {
-                    Log.Warning ("lirc-sharp: lirc_init() failed");
+                if (lirc_glue_init (program_name, 1) == -1) {
+                    Log.Warning ("lirc-sharp: lirc_glue_init() failed");
                     this.ErrorValue = -2;
                     return(false);
                 }
@@ -112,7 +112,7 @@ namespace Lirc
             if(is_connected) {
                 Log.Debug ("lirc-sharp: Disconnecting LIRC connection...");
                 lirc_glue_freeconfig ();
-                lirc_deinit ();
+                lirc_glue_deinit ();
                 ErrorValue = -3;
                 Log.Debug ("LIRC connection disconnected");
                 is_connected = false;
@@ -150,23 +150,23 @@ namespace Lirc
 
     /* .......................lirc_client bindings.................................................*/
 
-    [DllImport("lirc_client")]
-    private extern static int lirc_init(string prog, int verbose);
+    [DllImport("liblircglue")]
+    private extern static int lirc_glue_init(string prog, int verbose);
 
-    [DllImport("lirc_client")]
-    private extern static int lirc_deinit();
+    [DllImport("liblircglue")]
+    private extern static int lirc_glue_deinit();
 
-    [DllImport("lirc_client")]
-    private extern static int lirc_nextcode(out string code);
+    [DllImport("liblircglue")]
+    private extern static int lirc_glue_nextcode(out string code);
 
-    /*[DllImport("lirc_client")]
-    private extern static int lirc_readconfig(string file, out Config config, string check);
+    /*[DllImport("liblircglue")]
+    private extern static int lirc_glue_readconfig(string file, out Config config, string check);
 
-    [DllImport("lirc_client")]
-    private extern static int lirc_freeconfig(out Config config);
+    [DllImport("liblircglue")]
+    private extern static int lirc_glue_freeconfig(out Config config);
 
-    [DllImport("lirc_client")]
-    private extern static int lirc_code2char(out Config config, string code, out string str);*/
+    [DllImport("liblircglue")]
+    private extern static int lirc_glue_code2char(out Config config, string code, out string str);*/
 
 
     /* someone write bindings for client daemon functions?  check out lirc_client.h */
diff --git a/src/Lirc/lirc-glue/lirc-glue.c b/src/Lirc/lirc-glue/lirc-glue.c
index 793836c..75fdc1b 100644
--- a/src/Lirc/lirc-glue/lirc-glue.c
+++ b/src/Lirc/lirc-glue/lirc-glue.c
@@ -66,3 +66,13 @@ void lirc_glue_freeconfig ()
 {
     lirc_freeconfig (config);
 }
+
+/* lirc_client direct wrappers */
+int lirc_glue_init (char *prog, int verbose)
+{ return lirc_init (prog, verbose); }
+
+int lirc_glue_deinit (void)
+{ return lirc_deinit (); }
+
+int lirc_glue_nextcode (char **code)
+{ return lirc_nextcode (code); }
diff --git a/src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/ShoutCastPlugin.cs b/src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/ShoutCastPlugin.cs
index 1a3960b..775c4ab 100644
--- a/src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/ShoutCastPlugin.cs
+++ b/src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/ShoutCastPlugin.cs
@@ -46,13 +46,10 @@ namespace Banshee.LiveRadio.Plugins
     public class ShoutCastPlugin : LiveRadioBasePlugin
     {
 
-        private const string base_url = "http://api.shoutcast.com";
-        private const string play_url = "http://yp.shoutcast.com";
-        private const string request_url = "/legacy/";
+        private const string base_url = "http://207.200.98.1";
+        private const string play_url = "http://207.200.98.1";
+        private const string request_url = "/sbin/newxml.phtml?";
         private const string genre_list_request = "genrelist";
-        private const string key = "?k=[DevKeyHere]"; //replace with Developer Key for Shoutcast API 2.0
-        private const string genre_url = "genresearch";
-        private const string freetext_url = "stationsearch";
         private const string genre_request = "&genre=";
         private const string freetext_request = "&search=";
 
@@ -60,7 +57,7 @@ namespace Banshee.LiveRadio.Plugins
         /// Shoutcast plugin disabled for legal issues, no developer key available
         /// </summary>
         public override bool Active {
-            get { return false; }
+            get { return true; }
         }
 
         /// <summary>
@@ -81,7 +78,7 @@ namespace Banshee.LiveRadio.Plugins
         /// </summary>
         protected override void RetrieveGenres ()
         {
-            ParseGenres(RetrieveXml(base_url + request_url +  genre_list_request + key));
+            ParseGenres(RetrieveXml(base_url + request_url + genre_list_request));
         }
 
         /// <summary>
@@ -97,9 +94,9 @@ namespace Banshee.LiveRadio.Plugins
         {
             string request;
             if (request_type == LiveRadioRequestType.ByGenre) {
-                request = base_url + request_url + genre_url + key + genre_request + query;
+                request = base_url + request_url + genre_request + query;
             } else {
-                request = base_url + request_url + freetext_url + key + freetext_request + query;
+                request = base_url + request_url + freetext_request + query;
             }
             XmlDocument document = RetrieveXml(request);
             if (document != null) ParseXmlResponse(document, request_type, query);
diff --git a/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/ContextPage.cs b/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/ContextPage.cs
index a7bca14..9621bc5 100644
--- a/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/ContextPage.cs
+++ b/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/ContextPage.cs
@@ -53,7 +53,7 @@ namespace Banshee.Lyrics.Gui
 
         public override void SetTrack (Banshee.Collection.TrackInfo track)
         {
-            lyrics_pane.Track = track;
+            lyrics_pane.UpdateLabel (track.DisplayTrackTitle);
         }
 
         public override Widget Widget {
diff --git a/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsPane.cs b/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsPane.cs
index 0c68c94..533de44 100644
--- a/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsPane.cs
+++ b/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Gui/LyricsPane.cs
@@ -49,8 +49,6 @@ namespace Banshee.Lyrics.Gui
             InitComponents ();
         }
 
-        public TrackInfo Track { get; set; }
-
         public void InitComponents ()
         {
             this.browser = new LyricsBrowser ();
@@ -86,17 +84,13 @@ namespace Banshee.Lyrics.Gui
         {
             this.browser.LoadString (o, args);
 
-            UpdateLabel ();
-
             context_page.SetState (Banshee.ContextPane.ContextState.Loaded);
         }
 
-        private void UpdateLabel ()
+        public void UpdateLabel (string track_title)
         {
-            if (Track != null) {
-                label.Text = String.Format ("<b>{0}</b>", Track.DisplayTrackTitle);
-                label.UseMarkup = true;
-            }
+            label.Markup = String.Format ("<b>{0}</b>", GLib.Markup.EscapeText (track_title));
+            
             this.ShowAll ();
         }
     }
diff --git a/src/RadioStationFetcher/Banshee.RadioStationFetcher/Shoutcast.cs b/src/RadioStationFetcher/Banshee.RadioStationFetcher/Shoutcast.cs
index 1943053..d41054b 100644
--- a/src/RadioStationFetcher/Banshee.RadioStationFetcher/Shoutcast.cs
+++ b/src/RadioStationFetcher/Banshee.RadioStationFetcher/Shoutcast.cs
@@ -184,7 +184,7 @@ namespace Banshee.RadioStationFetcher
             Log.Debug ("[Shoutcast] <FetchStationsByGenre> Start");
 
             HttpWebRequest request = (HttpWebRequest)HttpWebRequest.
-                Create ("http://207.200.98.25/sbin/newxml.phtml?genre="+genre);
+                Create ("http://207.200.98.1/sbin/newxml.phtml?genre="+genre);
             request.Method = "GET";
             request.ContentType = "HTTP/1.0";
             request.Timeout = 10 * 1000; // 10 seconds
@@ -213,7 +213,7 @@ namespace Banshee.RadioStationFetcher
             Log.Debug ("[Shoutcast] <FetchStationsByFreetext> Start");
 
             HttpWebRequest request = (HttpWebRequest) HttpWebRequest.
-                Create ("http://207.200.98.25/sbin/newxml.phtml?search="+text);
+                Create ("http://207.200.98.1/sbin/newxml.phtml?search="+text);
             request.Method = "GET";
             request.ContentType = "HTTP/1.0";
             request.Timeout = 10 * 1000; // 10 seconds
@@ -269,7 +269,7 @@ namespace Banshee.RadioStationFetcher
 
                     DatabaseTrackInfo new_station = new DatabaseTrackInfo ();
 
-                    new_station.Uri = new SafeUri ("http://207.200.98.25/sbin/tunein-station.pls?id="+id);
+                    new_station.Uri = new SafeUri ("http://207.200.98.1/sbin/tunein-station.pls?id="+id);
                     new_station.ArtistName = "www.shoutcast.com";
                     new_station.Genre = genre;
                     new_station.TrackTitle = name;
diff --git a/src/StreamRecorder/Banshee.Streamrecorder/Gst/Marshaller.cs b/src/StreamRecorder/Banshee.Streamrecorder/Gst/Marshaller.cs
index f30a7b0..978b789 100644
--- a/src/StreamRecorder/Banshee.Streamrecorder/Gst/Marshaller.cs
+++ b/src/StreamRecorder/Banshee.Streamrecorder/Gst/Marshaller.cs
@@ -45,6 +45,7 @@ namespace Banshee.Streamrecorder.Gst
          */
         public static bool Initialize ()
         {
+            Init ();
             try {
                 gst_version = VersionString ();
                 DebugSetActive (false);
@@ -91,6 +92,11 @@ namespace Banshee.Streamrecorder.Gst
             return gst_event_new_eos ();
         }
 
+        public static void Init ()
+        {
+            gst_init (IntPtr.Zero, IntPtr.Zero);
+        }
+
         /* Helper Imports*/
         [DllImport("libgstreamer-0.10.so.0")]
         private static extern string gst_version_string ();
@@ -113,6 +119,9 @@ namespace Banshee.Streamrecorder.Gst
         [DllImport("libgstreamer-0.10.so.0")]
         unsafe public static extern IntPtr gst_event_new_eos ();
 
+        [DllImport("libgstreamer-0.10.so.0")]
+        unsafe public static extern void gst_init (IntPtr argc, IntPtr argv);
+
     }
 
 }
diff --git a/src/ZeitgeistDataprovider/Banshee.ZeitgeistDataprovider/ZeitgeistDataprovider.cs b/src/ZeitgeistDataprovider/Banshee.ZeitgeistDataprovider/ZeitgeistDataprovider.cs
index cdb11f4..6b3ee8c 100644
--- a/src/ZeitgeistDataprovider/Banshee.ZeitgeistDataprovider/ZeitgeistDataprovider.cs
+++ b/src/ZeitgeistDataprovider/Banshee.ZeitgeistDataprovider/ZeitgeistDataprovider.cs
@@ -45,6 +45,14 @@ namespace Banshee.Zeitgeist
     {
         private LogClient client;
         private TrackInfo current_track;
+        private bool hasTrackFinished = false;
+        private DataSourceClient dsReg;
+        private string actorAppName ="application://banshee.desktop";
+
+        // Used by DataSourceRegistry
+        private const string bansheeDataSourceId = "org.bansheeproject.Banshee,dataprovider";
+        private const string bansheeDataSourceName = "Banshee Datasource";
+        private const string bansheeDataSourceDesc = "This datasource pushes 2 events for banshee - Track Start and Track Stop";
 
         string IService.ServiceName {
             get { return "ZeitgeistService"; }
@@ -60,9 +68,26 @@ namespace Banshee.Zeitgeist
                 if (client != null) {
                     Log.Debug("Zeitgeist client created");
 
-                    ServiceManager.PlaybackController.Stopped += HandleServiceManagerPlaybackControllerStopped;
+                    // Try to register the datasource in DataSource registry
+                    dsReg = new DataSourceClient();
+
+                    try {
+                        // Register the datasource/dataprovider
+                        dsReg.RegisterDataSources(bansheeDataSourceId,
+                                                    bansheeDataSourceName,
+                                                    bansheeDataSourceDesc ,
+                                                    PopulateAllDataSourceTemplates()
+                                                  );
+                    }
+                    catch(Exception exp) {
+                        // Nazi exception handler
+                        // Can be fixed when zeitgeist-sharp is migrated from ndesk-dbus to dbus-sharp
+                        Log.Exception(exp);
+                    }
 
-                    ServiceManager.PlayerEngine.ConnectEvent(playerEvent_Handler, PlayerEvent.StartOfStream);
+                    // Handle the events
+                    ServiceManager.PlaybackController.Stopped += HandleServiceManagerPlaybackControllerStopped;
+                    ServiceManager.PlayerEngine.ConnectEvent(playerEvent_Handler, PlayerEvent.StartOfStream | PlayerEvent.EndOfStream);
 
                 } else {
                     Log.Warning ("Could not create Zeitgeist client");
@@ -72,10 +97,65 @@ namespace Banshee.Zeitgeist
             }
         }
 
+        private List<Event> PopulateAllDataSourceTemplates()
+        {
+            List<Event> eventList = new List<Event>(4);
+
+            // A new track is started. The user selected the track
+            Event ev1 = new Event();
+            ev1.Actor = this.actorAppName;
+            ev1.Interpretation = Interpretation.Instance.EventInterpretation.AccessEvent;
+            ev1.Manifestation = Manifestation.Instance.EventManifestation.UserActivity;
+            Subject sub1 = new Subject();
+            sub1.Interpretation = Interpretation.Instance.Media.Audio;
+            sub1.Manifestation = Manifestation.Instance.FileDataObject.FileDataObject;
+            ev1.Subjects.Add(sub1);
+            eventList.Add(ev1);
+
+            // A new track is started. The track gets selected because it was scheduled in a queue
+            Event ev2 = new Event();
+            ev2.Actor = this.actorAppName;
+            ev2.Interpretation = Interpretation.Instance.EventInterpretation.AccessEvent;
+            ev2.Manifestation = Manifestation.Instance.EventManifestation.ScheduledActivity;
+            Subject sub2 = new Subject();
+            sub2.Interpretation = Interpretation.Instance.Media.Audio;
+            sub2.Manifestation = Manifestation.Instance.FileDataObject.FileDataObject;
+            ev2.Subjects.Add(sub2);
+            eventList.Add(ev2);
+
+            // A track ended. The track ended because a new track in the queue has to be started
+            Event ev3 = new Event();
+            ev3.Actor = this.actorAppName;
+            ev3.Interpretation = Interpretation.Instance.EventInterpretation.LeaveEvent;
+            ev3.Manifestation = Manifestation.Instance.EventManifestation.ScheduledActivity;
+            Subject sub3 = new Subject();
+            sub3.Interpretation = Interpretation.Instance.Media.Audio;
+            sub3.Manifestation = Manifestation.Instance.FileDataObject.FileDataObject;
+            ev3.Subjects.Add(sub3);
+            eventList.Add(ev3);
+
+            // A track ended. The track ended because the user selected a new track to play
+            Event ev4 = new Event();
+            ev4.Actor = this.actorAppName;
+            ev4.Interpretation = Interpretation.Instance.EventInterpretation.LeaveEvent;
+            ev4.Manifestation = Manifestation.Instance.EventManifestation.ScheduledActivity;
+            Subject sub4 = new Subject();
+            sub4.Interpretation = Interpretation.Instance.Media.Audio;
+            sub4.Manifestation = Manifestation.Instance.FileDataObject.FileDataObject;
+            ev4.Subjects.Add(sub4);
+            eventList.Add(ev4);
+
+            return eventList;
+        }
+
         void playerEvent_Handler(PlayerEventArgs e)
         {
-            if(e.Event == PlayerEvent.StartOfStream && current_track != ServiceManager.PlaybackController.CurrentTrack)
-            {
+            if(e.Event == PlayerEvent.EndOfStream) {
+                Log.Debug("EndOfStream for : "+ServiceManager.PlaybackController.CurrentTrack.TrackTitle);
+                hasTrackFinished = true;
+            }
+
+            if(e.Event == PlayerEvent.StartOfStream && current_track != ServiceManager.PlaybackController.CurrentTrack) {
                 try {
                     if (current_track != null) {
                         StopTrack (current_track);
@@ -86,6 +166,10 @@ namespace Banshee.Zeitgeist
                     client.InsertEvents (new List<Event> () {ev});
 
                     current_track = ServiceManager.PlaybackController.CurrentTrack;
+
+                    // Set this as false only after the previous track finished and new track start event has been logged
+                    hasTrackFinished = false;
+
                 } catch (Exception ex) {
                     Log.Exception (ex);
                 }
@@ -119,9 +203,19 @@ namespace Banshee.Zeitgeist
 
             Event ev = new Event ();
 
-            ev.Actor = "application://banshee.desktop";
+            ev.Actor = actorAppName;
             ev.Timestamp = DateTime.Now;
-            ev.Manifestation = Manifestation.Instance.EventManifestation.UserActivity;
+
+            // If the track has finished then Event Manifestation is ScheduledActivity else UserActivity
+            if(hasTrackFinished)
+            {
+                ev.Manifestation = Manifestation.Instance.EventManifestation.ScheduledActivity;
+            }
+            else
+            {
+                ev.Manifestation = Manifestation.Instance.EventManifestation.UserActivity;
+            }
+
             ev.Interpretation = event_type;
 
             Subject sub = new Subject ();

-- 
banshee-community-extensions



More information about the Pkg-cli-apps-commits mailing list