replace several addon icons
Merge pull request #1810 from ronie/translate-cancel

use british english spelling: cancelled / cancelling
Merge pull request #1811 from ronie/addon-icons

replace several addon icons
Window now has the same locking that it had prior to the codegeneration.
don't try and use an empty art type for folders
ensure optical media files check for older-style art (folder.jpg|movie.tbn). fixes #13553
remove useless comparison in CMusicInfoTag::operator!=
ignore 'thumb' types when updating art in the video library (Eden->Frodo)
wrap GetStreamDetails in try/catch
[cosmetic] indenting after try/catch in GetStreamDetails
allow key-only URL options and add CUrlOptions::RemoveOption()
[test] add unit tests for CUrlOptions
mysql: don't remove "BEGIN" and "END" from CREATE TRIGGER queries (thanks koying)
videodb: add triggers on deletion of movies/tvshows/musicvideos to delete any related records in the taglinks table (fixes #13544)
show music smartplaylists for "playlist" rule for artist smartplaylists (fixes #13572)
[osx/ios] - use the same sqlite_prepare_v2 function on darwin as on all other platforms. Its not a 1:1 replacement and might even be resulting strange behaviour on broken db's. Since that workaround was introduced 4 years ago because of missing symbols and the symbol is there now - we just use the same code now for osx aswell - use the same sqlite_prepare_v2 function on darwin as on all other platforms. Its not a 1:1 replacement and might even be resulting strange behaviour on broken db's. Since that workaround was introduced 4 years ago because of missing symbols and the symbol is there now - we just use the same code now for osx aswell..
jsonrpc: add missing properties "tag" and "art" to List.Fields.Files
Merge pull request #1802 from Montellese/urloptions_fix

allow key-only URL options and add CUrlOptions::RemoveOption()
fixed compiler warning
[osx] - fix vfs wrapper (10.6.sdk added 2 new symbols for stat and fstat). This fixes playback of dvd folders when started from the library