[banshee/gtk3: 99/99] Merge latest changes in master into gtk3 branch



commit 3dae559be07e6561cc5a0b586593dfb4c8d1f5f4
Merge: eedb03d 3d296ff
Author: AndrÃs G. Aragoneses <knocte gmail com>
Date:   Sun Sep 4 13:44:27 2011 +0100

    Merge latest changes in master into gtk3 branch

 AUTHORS                                            |   14 +
 NEWS                                               |  117 +-
 banshee.doap                                       |    8 +-
 build/windows/Installer.wixproj                    |    2 +-
 build/windows/InstallerDefinition.wxs              |    4 +-
 configure.ac                                       |    5 +-
 help/Makefile.am                                   |    2 +-
 help/hu/hu.po                                      |   21 +-
 help/zh_CN/zh_CN.po                                | 1716 +++++
 libbanshee/banshee-player.c                        |    3 +-
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    5 +
 po/cs.po                                           |  516 +-
 po/de.po                                           |  624 +-
 po/es.po                                           |  735 ++-
 po/fr.po                                           |  580 +-
 po/gl.po                                           |  706 ++-
 po/he.po                                           |  614 +-
 po/nb.po                                           | 2165 +++---
 po/nl.po                                           |  634 +-
 po/pt.po                                           |  863 ++--
 po/sk.po                                           | 7085 ++++++++++++++++++++
 po/sl.po                                           |  752 ++-
 po/sr.po                                           | 4537 ++++++++-----
 po/sr latin po                                     | 4521 ++++++++-----
 po/sv.po                                           |  953 ++--
 po/zh_HK.po                                        |  710 ++-
 po/zh_TW.po                                        |  714 ++-
 .../Banshee.GStreamerSharp.addin.xml               |   15 +-
 .../Banshee.GStreamerSharp.csproj                  |    6 +
 .../Banshee.GStreamerSharp.dll.config              |    5 +
 .../Banshee.GStreamerSharp/AudioCdRipper.cs        |  434 ++
 .../Banshee.GStreamerSharp/BpmDetector.cs          |  223 +
 .../Banshee.GStreamerSharp/CddaManager.cs          |  178 +
 .../Banshee.GStreamerSharp/PlayerEngine.cs         |  606 ++-
 .../Banshee.GStreamerSharp/Transcoder.cs           |  314 +
 .../Banshee.GStreamerSharp/VideoManager.cs         |  301 +
 .../Banshee.GStreamerSharp/Visualization.cs        |  336 +
 src/Backends/Banshee.GStreamerSharp/Makefile.am    |   12 +-
 src/Backends/Banshee.Windows/Makefile.am           |   19 +
 src/Backends/Makefile.am                           |    3 +-
 src/Clients/Booter/Booter/Entry.cs                 |    1 +
 .../Banshee.Core/Banshee.Collection/AlbumInfo.cs   |    5 +-
 src/Core/Banshee.Core/Resources/COPYING            |    4 +-
 src/Core/Banshee.Core/Resources/contributors.xml   |   14 +
 src/Core/Banshee.Core/Resources/translators.xml    |   14 +-
 .../DatabaseAlbumInfo.cs                           |   13 +
 .../DatabaseTrackListModel.cs                      |    4 +-
 .../Banshee.Database/BansheeDbFormatMigrator.cs    |   17 +-
 .../Banshee.Equalizer/EqualizerManager.cs          |    3 +
 .../Banshee.Equalizer/EqualizerSetting.cs          |    1 +
 .../Banshee.Library/MusicLibrarySource.cs          |    2 +-
 .../Banshee.MediaEngine/IBpmDetector.cs            |    1 -
 .../Banshee.MediaEngine/PlayerEngineService.cs     |   26 +-
 .../Banshee.MediaEngine/TranscoderService.cs       |    1 +
 .../Banshee.Playlists.Formats/PlaylistParser.cs    |    4 +
 .../Banshee.ServiceStack/DBusConnection.cs         |    4 +-
 .../Banshee.SmartPlaylist/SmartPlaylistSource.cs   |    6 +-
 .../Banshee.Services/Banshee.Sources/Source.cs     |   10 +-
 .../Banshee.Sources/SourceManager.cs               |   54 +-
 src/Core/Banshee.Services/Banshee.Sources/Tests.cs |    7 +-
 .../Banshee.Gui.TrackEditor/TrackEditorDialog.cs   |    1 +
 .../Banshee.Widgets/Banshee.Widgets/SearchEntry.cs |    2 +
 .../Banshee.Dap.AppleDevice/AppleDeviceSource.cs   |    7 +-
 .../Banshee.Dap.MassStorage.addin.xml              |   11 +-
 .../Banshee.Dap.MassStorage.csproj                 |    1 +
 .../Banshee.Dap.MassStorage/KeyValueParser.cs      |    8 +-
 .../Banshee.Dap.MassStorage/MassStorageSource.cs   |    3 +-
 .../Banshee.Dap.MassStorage/NookDevice.cs          |  124 +
 src/Dap/Banshee.Dap.MassStorage/Makefile.am        |    1 +
 .../ThemeIcons/128x128/devices/phone-nook.png      |  Bin 0 -> 17312 bytes
 .../ThemeIcons/16x16/devices/phone-nook.png        |  Bin 0 -> 631 bytes
 .../ThemeIcons/22x22/devices/phone-nook.png        |  Bin 0 -> 724 bytes
 .../ThemeIcons/24x24/devices/phone-nook.png        |  Bin 0 -> 739 bytes
 .../ThemeIcons/256x256/devices/phone-nook.png      |  Bin 0 -> 63044 bytes
 .../ThemeIcons/32x32/devices/phone-nook.png        |  Bin 0 -> 878 bytes
 .../ThemeIcons/48x48/devices/phone-nook.png        |  Bin 0 -> 3325 bytes
 .../Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs   |    2 +-
 src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs      |   21 +-
 .../Banshee.AudioCd/AudioCdService.cs              |    6 +-
 .../Banshee.AudioCd/AudioCdSource.cs               |    6 +-
 src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml   |    1 -
 src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs |   21 +-
 .../Banshee.InternetRadio/InternetRadioSource.cs   |    3 +-
 .../Banshee.InternetRadio/StationEditor.cs         |    2 +-
 .../Banshee.InternetRadio/XspfMigrator.cs          |   29 +-
 .../AudioscrobblerService.cs                       |    4 +-
 .../Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs     |    6 +-
 .../Resources/NotificationAreaMenu.xml             |    2 +
 src/Hyena                                          |    2 +-
 .../Mono.Media/Media.Playlists.Xspf/W3CDateTime.cs |    3 +-
 91 files changed, 22395 insertions(+), 9121 deletions(-)
---
diff --cc src/Hyena
index 5e72d9c,0f052ac..761cf0c
--- a/src/Hyena
+++ b/src/Hyena
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 5e72d9c36a81845d19ba9b4f2b99bc4dbcdce876
 -Subproject commit 0f052ac93a76e7a93697aed81d66be5c2a7da51d
++Subproject commit 761cf0cd9e127e1dba85c2fccf00c4b50ac6d430



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]