xbmc / repo-skins

Official source repository for Kodi skin add-ons
65 stars 49 forks source link

[skin.confluence] v4.8.0 #429

Closed Hitcher closed 6 months ago

Hitcher commented 6 months ago

Add-on details:

Description of changes:

https://github.com/xbmc/skin.confluence/pull/229

Checklist:

Additional information :

ronie commented 6 months ago

hey @Hitcher could you please remove the backslash at the end of this line: https://github.com/xbmc/skin.confluence/blob/7fc4cdb9aa32062e2312633b4b55ffb553fd33cf/language/resource.language.en_gb/strings.po#L426

Hitcher commented 6 months ago

@ronie done, thanks.

bossanova808 commented 6 months ago

Master branch of Confluence has a bunch of other changes (Nexus related, colour picker etc) - is the intention to merge those in still? The Nexus branch had rather got left behind really..

And/or I guess merge this branch back into Master there?

Hitcher commented 6 months ago

There shouldn't be anything Nexus related in master that isn't in here - colour picker is definitely here. The only skin change that I can see isn't is the disabled slider control change but that's for v21 anyway.

ronie commented 6 months ago

@Hitcher your latest update to the language files brought back the backslash, mind removing it again? :-)

Hitcher commented 6 months ago

Sorry, not having great morning. Should be ok now. Thanks.

ronie commented 6 months ago

added to the nexus repo, thx! https://github.com/xbmc/repo-skins/commit/54787c00a8be32ab8ea5acb7c3907e933f51c05c

bossanova808 commented 6 months ago

Ok no worries, sorry for the noise

(I find git very confusing at times - this history here https://github.com/xbmc/skin.confluence/commits/Nexus/ seems to imply nothing was committed to the Nexus branch from March 2023 till now but you're right, those things are there, so ignore me and carry on with your excellent work!)

Hitcher commented 6 months ago

I find git very confusing at time

You're not the only one. ;)

Hitcher commented 6 months ago

added to the nexus repo, thx!

Cheers ronie.