diff -Nru kodi-pvr-filmon-6.1.1/debian/changelog kodi-pvr-filmon-6.1.2/debian/changelog --- kodi-pvr-filmon-6.1.1/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-pvr-filmon-6.1.2/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-filmon (6.1.1-1~focal) focal; urgency=low +kodi-pvr-filmon (6.1.2-1~focal) focal; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-pvr-filmon-6.1.1/.github/workflows/changelog-and-release.yml kodi-pvr-filmon-6.1.2/.github/workflows/changelog-and-release.yml --- kodi-pvr-filmon-6.1.1/.github/workflows/changelog-and-release.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-filmon-6.1.2/.github/workflows/changelog-and-release.yml 2021-07-14 20:00:22.000000000 +0000 @@ -0,0 +1,100 @@ +name: Changelog and Release + +on: + workflow_dispatch: + inputs: + version_type: + description: 'Create a ''minor'' or ''micro'' release?' + required: true + default: 'minor' + changelog_text: + description: 'Input the changes you''d like to add to the changelogs. Your text should be encapsulated in "''s with line feeds represented by literal \n''s. ie. "This is the first change\nThis is the second change"' + required: true + default: '' + update_news: + description: 'Update news in addon.xml.in? [true|false]' + required: true + default: 'true' + +jobs: + default: + runs-on: ubuntu-latest + name: Changelog and Release + + steps: + + - name: Checkout Repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + path: ${{ github.event.repository.name }} + + - name: Checkout Scripts + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: kodi-pvr/pvr-scripts + path: scripts + + - name: Install dependencies + run: | + sudo apt-get install libxml2-utils xmlstarlet + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.9' + + - name: Increment version and update changelogs + run: | + if [[ ${{ github.event.inputs.update_news }} == true ]] ; + then + python3 ../scripts/changelog_and_release.py ${{ github.event.inputs.version_type }} ${{ github.event.inputs.changelog_text }} --update-news + elif [[ ${{ github.event.inputs.update_news }} == false ]] ; + then + python3 ../scripts/changelog_and_release.py ${{ github.event.inputs.version_type }} ${{ github.event.inputs.changelog_text }} + else + exit 1 + fi + working-directory: ${{ github.event.repository.name }} + + - name: Get required variables + id: required-variables + run: | + changes=$(cat "$(find . -name changelog.txt)" | awk -v RS= 'NR==1') + changes="${changes//'%'/'%25'}" + changes="${changes//$'\n'/'%0A'}" + changes="${changes//$'\r'/'%0D'}" + changes="${changes//$'\\n'/'%0A'}" + changes="${changes//$'\\r'/'%0D'}" + echo ::set-output name=changes::$changes + version=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/@version)') + echo ::set-output name=version::$version + branch=$(echo ${GITHUB_REF#refs/heads/}) + echo ::set-output name=branch::$branch + working-directory: ${{ github.event.repository.name }} + + - name: Commit changes + run: | + git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" + git commit -m "v${{ steps.required-variables.outputs.version }}" -a + working-directory: ${{ github.event.repository.name }} + + - name: Push changes + uses: ad-m/github-push-action@master + with: + branch: ${{ github.ref }} + directory: ${{ github.event.repository.name }} + + - name: Create Release + id: create-release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.required-variables.outputs.version }}-${{ steps.required-variables.outputs.branch }} + release_name: ${{ steps.required-variables.outputs.version }}-${{ steps.required-variables.outputs.branch }} + body: ${{ steps.required-variables.outputs.changes }} + draft: false + prerelease: false diff -Nru kodi-pvr-filmon-6.1.1/.github/workflows/increment-version.yml kodi-pvr-filmon-6.1.2/.github/workflows/increment-version.yml --- kodi-pvr-filmon-6.1.1/.github/workflows/increment-version.yml 2021-07-03 19:19:01.000000000 +0000 +++ kodi-pvr-filmon-6.1.2/.github/workflows/increment-version.yml 2021-07-14 20:00:22.000000000 +0000 @@ -37,7 +37,7 @@ - name: Increment add-on version run: | - python3 ../scripts/binary/increment_version.py $HOME/files.json + python3 ../scripts/binary/increment_version.py $HOME/files.json -c -n working-directory: ${{ github.event.repository.name }} - name: Create PR for incrementing add-on versions diff -Nru kodi-pvr-filmon-6.1.1/pvr.filmon/addon.xml.in kodi-pvr-filmon-6.1.2/pvr.filmon/addon.xml.in --- kodi-pvr-filmon-6.1.1/pvr.filmon/addon.xml.in 2021-07-03 19:19:01.000000000 +0000 +++ kodi-pvr-filmon-6.1.2/pvr.filmon/addon.xml.in 2021-07-14 20:00:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -123,9 +123,5 @@ icon.png - -v6.1.1 -- Language update from Weblate - diff -Nru kodi-pvr-filmon-6.1.1/pvr.filmon/changelog.txt kodi-pvr-filmon-6.1.2/pvr.filmon/changelog.txt --- kodi-pvr-filmon-6.1.1/pvr.filmon/changelog.txt 2021-07-03 19:19:01.000000000 +0000 +++ kodi-pvr-filmon-6.1.2/pvr.filmon/changelog.txt 2021-07-14 20:00:22.000000000 +0000 @@ -1,3 +1,7 @@ +v6.1.2 +- Translations updates from Weblate + - pl_pl + v6.1.1 - Language update from Weblate diff -Nru kodi-pvr-filmon-6.1.1/pvr.filmon/resources/language/resource.language.pl_pl/strings.po kodi-pvr-filmon-6.1.2/pvr.filmon/resources/language/resource.language.pl_pl/strings.po --- kodi-pvr-filmon-6.1.1/pvr.filmon/resources/language/resource.language.pl_pl/strings.po 2021-07-03 19:19:01.000000000 +0000 +++ kodi-pvr-filmon-6.1.2/pvr.filmon/resources/language/resource.language.pl_pl/strings.po 2021-07-14 20:00:22.000000000 +0000 @@ -5,16 +5,17 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\n" +"Report-Msgid-Bugs-To: translations@kodi.tv\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Kodi Translation Team\n" -"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kodi-main/language/pl_PL/)\n" -"Language: pl_PL\n" +"PO-Revision-Date: 2021-07-14 18:24+0000\n" +"Last-Translator: Marek Adamski \n" +"Language-Team: Polish \n" +"Language: pl_pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.7.1\n" msgctxt "#30000" msgid "Username" @@ -30,4 +31,4 @@ msgctxt "#30003" msgid "Only load favourite channels" -msgstr "" +msgstr "Wczytuj tylko ulubione kanaƂy"