Skip to content

Commit

Permalink
Merge branch 'xbmc:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
heitbaum authored May 2, 2024
2 parents 1886103 + a9076fe commit 4b7c39d
Show file tree
Hide file tree
Showing 2,186 changed files with 36,031 additions and 70,898 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
d1e6fff19c1cf2a266f0429c8d0ddea3195ddcce
0b34dc7e6f61424c8cce7249cdcd6060b8eada9e
71a2c6b734420f540b0d06f6e3334ffe5a9e8225

# formatting JSON-RPC schemas
537d5e552f68e5cb851ad97b15ec785f73adae60
3 changes: 0 additions & 3 deletions .github/workflows/sync-addon-metadata-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ on:
paths:
- '**skin.estuary**addon.xml'
- '**skin.estuary**resource.language.**strings.po'
- '**skin.estouchy**addon.xml'
- '**skin.estouchy**resource.language.**strings.po'
- '**audioencoder.kodi.builtin.aac**addon.xml'
- '**audioencoder.kodi.builtin.aac**resource.language.**strings.po'
- '**audioencoder.kodi.builtin.wma**addon.xml'
Expand Down Expand Up @@ -60,7 +58,6 @@ jobs:
- name: Run sync-addon-metadata-translations
run: |
sync-addon-metadata-translations --path ./skin.estuary/
sync-addon-metadata-translations --path ./skin.estouchy/
sync-addon-metadata-translations --path ./audioencoder.kodi.builtin.aac/
sync-addon-metadata-translations --path ./audioencoder.kodi.builtin.wma/
sync-addon-metadata-translations --path ./repository.xbmc.org/
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ cmake_install.cmake
/addons/packages
/addons/skin.estuary/media/Makefile
/addons/skin.estuary/media/*.xbt
/addons/skin.estouchy/media/Makefile
/addons/skin.estouchy/media/Textures.xbt
/addons/skin.pm3-hd/media/Textures.xbt
/addons/audioencoder.*
/addons/pvr.*
Expand Down
17 changes: 8 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,23 +226,23 @@ set(required_deps ASS>=0.15.0
${PLATFORM_REQUIRED_DEPS})

# Optional dependencies. Keep in alphabetical order please
set(optional_deps Alsa
set(optional_deps Alsa>=1.0.27
Avahi
Bluetooth
Bluray
Bluray>=0.9.3
CAP
CEC>=4.0.0
Dav1d
DBus
Iso9660pp
LCMS2
Iso9660pp>=2.1.0
LCMS2>=2.10
LircClient
MDNS
MicroHttpd
NFS
MicroHttpd>=0.9.40
NFS>=3.0.0
Pipewire>=0.3.50
Plist
PulseAudio
PulseAudio>=11.0.0
Python
SmbClient
Sndio
Expand Down Expand Up @@ -358,7 +358,6 @@ copy_files_from_filelist_to_buildtree(${CMAKE_SOURCE_DIR}/cmake/installdata/comm
${CMAKE_SOURCE_DIR}/cmake/installdata/${CORE_SYSTEM_NAME}/*.txt)

list(APPEND SKINS "${CMAKE_SOURCE_DIR}/addons/skin.estuary\;${CMAKE_SOURCE_DIR}")
list(APPEND SKINS "${CMAKE_SOURCE_DIR}/addons/skin.estouchy\;${CMAKE_SOURCE_DIR}")

if(NOT ${CORE_SYSTEM_NAME} MATCHES "windows")
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/system/players/VideoPlayer)
Expand Down Expand Up @@ -523,7 +522,7 @@ endif()

# testing
if(HOST_CAN_EXECUTE_TARGET AND ENABLE_TESTING)
find_package(Gtest)
find_package(Gtest 1.10.0 REQUIRED)

copy_files_from_filelist_to_buildtree(${CMAKE_SOURCE_DIR}/cmake/installdata/test-reference-data.txt NO_INSTALL)
add_executable(${APP_NAME_LC}-test EXCLUDE_FROM_ALL ${CMAKE_SOURCE_DIR}/xbmc/test/xbmc-test.cpp ${test_sources})
Expand Down
3 changes: 2 additions & 1 deletion LICENSES/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ Since most source files in Kodi are `GPL-2.0-or-later` licensed, the typical cop
*/
```

**NOTE:** Kodi is developed and maintained by Kodi Team members and the open-source community. We thank all of our **[contributors](https://github.com/xbmc/xbmc/graphs/contributors)**! **For the detailed history of contributions** of a given file, use `git blame <filename>` to see line-by-line credits or `git log --follow <filename>` to see the changelog across renames, rewrites and code shuffle.
> [!NOTE]
> Kodi is developed and maintained by Kodi Team members and the open-source community. We thank all of our **[contributors](https://github.com/xbmc/xbmc/graphs/contributors)**! **For the detailed history of contributions** of a given file, use `git blame <filename>` to see line-by-line credits or `git log --follow <filename>` to see the changelog across renames, rewrites and code shuffle.
### License Files
All SPDX license identifiers must have a corresponding file in the **LICENSES** subdirectory. This is required to allow tool verification (e.g. **[ScanCode toolkit](https://github.com/nexB/scancode-toolkit)**) and to have the licenses ready to read and extract right from the source, which is recommended by various FOSS organizations, e.g. the **[FSFE REUSE Initiative](https://reuse.software/)**.
Expand Down
2 changes: 2 additions & 0 deletions addons/audioencoder.kodi.builtin.aac/addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<assets>
<icon>icon.png</icon>
</assets>
<summary lang="af_ZA">AAC Oudio Enkodeerder</summary>
<summary lang="be_BY">Кадавальнік AAC Audio</summary>
<summary lang="bs_BA">AAC Audio Enkoder</summary>
<summary lang="ca_ES">Codificador d&apos;àudio AAC</summary>
Expand Down Expand Up @@ -46,6 +47,7 @@
<summary lang="tr_TR">AAC Ses Kodlayıcı</summary>
<summary lang="uk_UA">Кодувальник аудіо AAC</summary>
<summary lang="zh_CN">AAC 音频编码器</summary>
<description lang="af_ZA">AAC is &apos;n stel van codecs ontwerp om beter kompressie te lewer as MP3s, en is verbeterde weergawes van MPEG oudio.</description>
<description lang="be_BY">AAC - набор кодакаў, распрацаваны для забеспячэння сціскання, лепшага за MP3, і ёсць палепшанымі версіямі аўдыё MPEG.</description>
<description lang="bs_BA">AAC je skupina kodeka dizajnirana da pruži bolje sabijanje od MP3-a, te su poboljšane verzije MPEG audia.</description>
<description lang="ca_ES">AAC és un conjunt de còdecs dissenyats per proporcionar una millor compressió que els MP3 i són versions millorades de l&apos;àudio MPEG.</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ msgstr ""
"Project-Id-Version: KODI Main\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2021-08-21 08:20+0000\n"
"PO-Revision-Date: 2024-02-12 00:31+0000\n"
"Last-Translator: Christian Gade <[email protected]>\n"
"Language-Team: Afrikaans (South Africa) <https://kodi.weblate.cloud/projects/kodi-core/audioencoder-kodi-builtin-aac/af_za/>\n"
"Language: af_za\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.7.2\n"
"X-Generator: Weblate 5.3\n"

msgctxt "Addon Summary"
msgid "AAC Audio Encoder"
msgstr ""
msgstr "AAC Oudio Enkodeerder"

msgctxt "Addon Description"
msgid "AAC is a set of codecs designed to provide better compression than MP3s, and are improved versions of MPEG audio."
msgstr ""
msgstr "AAC is 'n stel van codecs ontwerp om beter kompressie te lewer as MP3s, en is verbeterde weergawes van MPEG oudio."

#. Bitrate to use on for compression
#: resources/settings.xml
Expand All @@ -35,7 +35,7 @@ msgstr "Bistempo"
#: resources/settings.xml
msgctxt "#30001"
msgid "Select which bitrate to use for the AAC audio encoder for audio compression."
msgstr ""
msgstr "Kies watter bis tempo om te gebruik vir die AAC oudio enkodeerder vir oudio kompressie."

#. Value format for with bitrate edited field
#: resources/settings.xml
Expand Down
4 changes: 3 additions & 1 deletion addons/audioencoder.kodi.builtin.wma/addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<assets>
<icon>icon.png</icon>
</assets>
<summary lang="af_ZA">WMA Oudio Enkodeerder</summary>
<summary lang="be_BY">Кадавальнік WMA Audio</summary>
<summary lang="bs_BA">WMA Audio Enkoder</summary>
<summary lang="ca_ES">Codificador d&apos;àudio WMA</summary>
Expand Down Expand Up @@ -45,11 +46,12 @@
<summary lang="tr_TR">WMA Ses Kodlayıcı</summary>
<summary lang="uk_UA">Аудіокодер WMA</summary>
<summary lang="zh_CN">WMA 音频编码器</summary>
<description lang="af_ZA">Windows Media Audio, Microsoft se oudio verlieserige formaat.</description>
<description lang="be_BY">Windows Media Audio, гукавы фармат ад Microsoft.</description>
<description lang="bs_BA">Windows Media Audio (WMA), Microsoftov format zvuka sa gubitkom.</description>
<description lang="ca_ES">Windows Media Audio, el format d&apos;àudio amb pèrdua de Microsoft.</description>
<description lang="cs_CZ">Windows Media Audio, ztrátový formát zvuku společnosti Microsoft.</description>
<description lang="da_DK">Windows Media Audio, Microsofts kvalitetstabende lydformat.</description>
<description lang="da_DK">Windows Media Audio, Microsofts lydformat med ikke-tabsfri komprimering.</description>
<description lang="de_DE">Windows Media Audio, Microsofts verlustbehaftetes Audioformat.</description>
<description lang="en_AU">Windows Media Audio, Microsoft’s lossy audio format.</description>
<description lang="en_GB">Windows Media Audio, Microsoft’s lossy audio format.</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ msgstr ""
"Project-Id-Version: KODI Main\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2021-08-21 08:21+0000\n"
"PO-Revision-Date: 2024-02-12 00:31+0000\n"
"Last-Translator: Christian Gade <[email protected]>\n"
"Language-Team: Afrikaans (South Africa) <https://kodi.weblate.cloud/projects/kodi-core/audioencoder-kodi-builtin-wma/af_za/>\n"
"Language: af_za\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.7.2\n"
"X-Generator: Weblate 5.3\n"

msgctxt "Addon Summary"
msgid "WMA Audio Encoder"
msgstr ""
msgstr "WMA Oudio Enkodeerder"

msgctxt "Addon Description"
msgid "Windows Media Audio, Microsoft’s lossy audio format."
msgstr ""
msgstr "Windows Media Audio, Microsoft se oudio verlieserige formaat."

#. Bitrate to use on for compression
#: resources/settings.xml
Expand All @@ -35,7 +35,7 @@ msgstr "Bistempo"
#: resources/settings.xml
msgctxt "#30001"
msgid "Select which bitrate to use for the WMA audio encoder for audio compression."
msgstr ""
msgstr "Kies watter bis tempo om te gebruik vir die WMA oudio enkodeerder vir oudio kompressie."

#. Value format for with bitrate edited field
#: resources/settings.xml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ msgstr ""
"Project-Id-Version: KODI Main\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2021-08-21 08:21+0000\n"
"PO-Revision-Date: 2024-02-12 00:31+0000\n"
"Last-Translator: Christian Gade <[email protected]>\n"
"Language-Team: Danish <https://kodi.weblate.cloud/projects/kodi-core/audioencoder-kodi-builtin-wma/da_dk/>\n"
"Language: da_dk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.7.2\n"
"X-Generator: Weblate 5.3\n"

msgctxt "Addon Summary"
msgid "WMA Audio Encoder"
msgstr "WMA Lydindkoder"

msgctxt "Addon Description"
msgid "Windows Media Audio, Microsoft’s lossy audio format."
msgstr "Windows Media Audio, Microsofts kvalitetstabende lydformat."
msgstr "Windows Media Audio, Microsofts lydformat med ikke-tabsfri komprimering."

#. Bitrate to use on for compression
#: resources/settings.xml
Expand Down
5 changes: 4 additions & 1 deletion addons/game.controller.default/addon.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="game.controller.default"
name="Default Controller"
version="1.0.41"
version="1.0.42"
provider-name="Team Kodi">
<extension point="kodi.game.controller" library="resources/layout.xml"/>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
<assets>
<icon>resources/icon.png</icon>
</assets>
<summary lang="af_ZA">Verstek Beheerder</summary>
<summary lang="be_BY">Прадвызначаны кантролер</summary>
<summary lang="bs_BA">Zadani Džojstik</summary>
<summary lang="ca_ES">Comandament per defecte</summary>
Expand Down Expand Up @@ -41,6 +42,7 @@
<summary lang="tr_TR">Varsayılan Oyun Kumandası</summary>
<summary lang="zh_CN">默认控制器</summary>
<summary lang="zh_TW">預設控制器</summary>
<description lang="af_ZA">Die bestek media sentrum beheerder is gebaseer op die Xbox 360 beheerder.</description>
<description lang="be_BY">Прадвызначаны кантролер на аснове кантролера Xbox 360.</description>
<description lang="bs_BA">Zadani džojstik za medijski centar je baziran na Xbox 360 džojstik.</description>
<description lang="ca_ES">El comandament predeterminat del centre multimèdia es basa en el comandament d&apos;Xbox 360.</description>
Expand Down Expand Up @@ -70,6 +72,7 @@
<description lang="tr_TR">Varsayılan ortam merkezi denetleyicisi, Xbox 360 oyun kumandasını temel alır.</description>
<description lang="zh_CN">默认媒体中心控制器基于 Xbox 360 控制器。</description>
<description lang="zh_TW">預設的媒體中心控制器佈局是以Xbox 360控制器為基礎。</description>
<disclaimer lang="af_ZA">Beeld krediet: Wikipedia (wikipedia.org)</disclaimer>
<disclaimer lang="be_BY">Крыніца выяў: Wikipedia (wikipedia.org)</disclaimer>
<disclaimer lang="bs_BA">Zasluga za sliku: Wikipedia (wikipedia.org)</disclaimer>
<disclaimer lang="ca_ES">Crèdit de la imatge: Wikipedia (wikipedia.org)</disclaimer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,49 @@
msgid ""
msgstr ""
"Project-Id-Version: KODI Main\n"
"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2014-05-30 17:00+8\n"
"PO-Revision-Date: 2021-05-20 16:49+0000\n"
"Last-Translator: Christian Gade <[email protected]>\n"
"PO-Revision-Date: 2024-01-15 01:17+0000\n"
"Last-Translator: Heiko Berner <[email protected]>\n"
"Language-Team: Afrikaans (South Africa) <https://kodi.weblate.cloud/projects/kodi-core/game-controller-default/af_za/>\n"
"Language: af_za\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.6.2\n"
"X-Generator: Weblate 5.3\n"

msgctxt "Addon Summary"
msgid "Default Controller"
msgstr ""
msgstr "Verstek Beheerder"

msgctxt "Addon Description"
msgid "The default media center controller is based on the Xbox 360 controller."
msgstr ""
msgstr "Die bestek media sentrum beheerder is gebaseer op die Xbox 360 beheerder."

msgctxt "Addon Disclaimer"
msgid "Image credit: Wikipedia (wikipedia.org)"
msgstr ""
msgstr "Beeld krediet: Wikipedia (wikipedia.org)"

msgctxt "#30000"
msgid "Kodi"
msgstr ""
msgstr "Kodi"

msgctxt "#30001"
msgid "A"
msgstr ""
msgstr "A"

msgctxt "#30002"
msgid "B"
msgstr ""
msgstr "B"

msgctxt "#30003"
msgid "X"
msgstr ""
msgstr "X"

msgctxt "#30004"
msgid "Y"
msgstr ""
msgstr "Y"

msgctxt "#30005"
msgid "Start"
Expand All @@ -63,40 +63,40 @@ msgstr "Gids"

msgctxt "#30008"
msgid "Left Stick"
msgstr ""
msgstr "Linker Stok"

msgctxt "#30009"
msgid "Right Stick"
msgstr ""
msgstr "Regter Stok"

msgctxt "#30010"
msgid "Up"
msgstr ""
msgstr "Op"

msgctxt "#30011"
msgid "Down"
msgstr ""
msgstr "Af"

msgctxt "#30012"
msgid "Right"
msgstr ""
msgstr "Regs"

msgctxt "#30013"
msgid "Left"
msgstr ""
msgstr "Links"

msgctxt "#30014"
msgid "Left Shoulder"
msgstr ""
msgstr "Linker Skouer"

msgctxt "#30015"
msgid "Right Shoulder"
msgstr ""
msgstr "Regter Skouer"

msgctxt "#30016"
msgid "Left Trigger"
msgstr ""
msgstr "Linker Sneller"

msgctxt "#30017"
msgid "Right Trigger"
msgstr ""
msgstr "Regter Sneller"
2 changes: 1 addition & 1 deletion addons/game.controller.keyboard/addon.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="game.controller.keyboard"
name="IBM Model M Keyboard"
version="1.1.33"
version="1.1.40"
provider-name="Team Kodi">
<extension point="kodi.game.controller" library="resources/layout.xml"/>
<extension point="xbmc.addon.metadata">
Expand Down
Loading

0 comments on commit 4b7c39d

Please sign in to comment.