Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: poetaster/tidings
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.4.1
Choose a base ref
...
head repository: poetaster/tidings
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 10 commits
  • 17 files changed
  • 3 contributors

Commits on Feb 23, 2023

  1. Update harbour-tidings-sv.ts

    Update Swedish translation
    eson57 authored Feb 23, 2023
    Copy the full SHA
    f0efb50 View commit details

Commits on Feb 25, 2023

  1. Merge pull request #106 from eson57/patch-1

    Update harbour-tidings-sv.ts
    poetaster authored Feb 25, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    3eaddfa View commit details
  2. lang: automated

    poetaster committed Feb 25, 2023
    Copy the full SHA
    5aa850e View commit details

Commits on Mar 9, 2023

  1. Create FUNDING.yml

    poetaster authored Mar 9, 2023
    Copy the full SHA
    20aa27d View commit details

Commits on Mar 19, 2023

  1. Add Greek translation

    cquence committed Mar 19, 2023
    Copy the full SHA
    181e275 View commit details

Commits on Apr 27, 2023

  1. Merge pull request #107 from cquence/Add_Greek_translation

    Add Greek translation
    poetaster authored Apr 27, 2023
    Copy the full SHA
    acd202a View commit details
  2. Build: add a workflow

    poetaster committed Apr 27, 2023
    Copy the full SHA
    61f9165 View commit details
  3. Copy the full SHA
    877a303 View commit details
  4. Fix: correct release tag

    poetaster committed Apr 27, 2023
    Copy the full SHA
    eba3228 View commit details
  5. Copy the full SHA
    ca9c41f View commit details
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

liberapay: poetaster
76 changes: 76 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Build RPMs

on:
push:
tags:
- "1.4.*"

env:
OS_VERSION: 4.4.0.68

jobs:
build:
runs-on: ubuntu-latest
name: Build App
strategy:
matrix:
arch: ['armv7hl', 'aarch64', 'i486']

steps:
- uses: actions/checkout@v2

- name: Prepare
run: docker pull coderus/sailfishos-platform-sdk:$OS_VERSION && mkdir output

- name: Build ${{ matrix.arch }}
run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$OS_VERSION /bin/bash -c "
mkdir -p build ;
cd build ;
cp -r /share/* . ;
mb2 -t SailfishOS-$OS_VERSION-${{ matrix.arch }} build ;
sudo cp -r RPMS/*.rpm /share/output"

- name: Upload RPM (${{ matrix.arch }})
uses: actions/upload-artifact@v2
with:
name: rpm-${{ matrix.arch }}
path: output
release:
name: Release
if: startsWith(github.ref, 'refs/tags/1.4')
needs:
- build
runs-on: ubuntu-latest
steps:
- name: Download armv7hl
uses: actions/download-artifact@v2
with:
name: rpm-armv7hl
continue-on-error: true
- name: Download aarch64
uses: actions/download-artifact@v2
with:
name: rpm-aarch64
continue-on-error: true
- name: Download i486
uses: actions/download-artifact@v2
with:
name: rpm-i486
continue-on-error: true
- name: Extract Version Name
id: extract_name
uses: actions/github-script@v4
with:
result-encoding: string
script: |
return context.payload.ref.replace(/refs\/tags\//, '');
- name: Create a Release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
name: ${{ steps.extract_name.outputs.result }}
draft: false
prerelease: false
body: This release was autogenerated.
files: '*.rpm'
1 change: 1 addition & 0 deletions harbour-tidings.pro
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@ TRANSLATIONS += translations/harbour-tidings-sv.ts
TRANSLATIONS += translations/harbour-tidings-pt_BR.ts
TRANSLATIONS += translations/harbour-tidings-es.ts
TRANSLATIONS += translations/harbour-tidings-fi_FI.ts
TRANSLATIONS += translations/harbour-tidings-gr_GR.ts

CONFIG += sailfishapp_i18n_unfinished

2 changes: 1 addition & 1 deletion qml/pages/AboutPage.qml
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ Page {
font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.secondaryColor
text: qsTr("Copyright © 2013 - 2020 Martin Grimme ")
+ qsTr(" © 2021 Mark Washeim")
+ qsTr(" © 2021 - 2023 Mark Washeim")
}

Item {
2 changes: 1 addition & 1 deletion rpm/harbour-tidings.spec
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ Name: harbour-tidings
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: RSS / Atom / Podcasts / Feed Reader
Version: 1.4.1
Version: 1.4.2
Release: 1
Group: Qt/Qt
License: GPLv2
2 changes: 1 addition & 1 deletion src/appversion.h
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

namespace
{
const QString appVersion("1.4.1");
const QString appVersion("1.4.2");
}

#endif // APPVERSION_H
20 changes: 10 additions & 10 deletions translations/harbour-tidings-cs.ts
Original file line number Diff line number Diff line change
@@ -492,44 +492,44 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="328"/>
<location filename="../qml/pages/SourcesPage.qml" line="329"/>
<source>About Tidings</source>
<translation type="unfinished">O Tidings</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="335"/>
<location filename="../qml/pages/SourcesPage.qml" line="336"/>
<source>Settings</source>
<translation type="unfinished">Nastavení</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="341"/>
<location filename="../qml/pages/SourcesPage.qml" line="342"/>
<source>Import OPML</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="348"/>
<location filename="../qml/pages/SourcesPage.qml" line="351"/>
<location filename="../qml/pages/SourcesPage.qml" line="349"/>
<location filename="../qml/pages/SourcesPage.qml" line="352"/>
<source>All read</source>
<translation type="unfinished">Vše přečteno</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="360"/>
<location filename="../qml/pages/SourcesPage.qml" line="375"/>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<source>Abort refreshing</source>
<translation type="unfinished">Zrušit aktualizaci</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="362"/>
<source>Refresh all</source>
<translation type="unfinished">Aktualizovat vše</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<location filename="../qml/pages/SourcesPage.qml" line="377"/>
<source>All read &amp; Refresh all</source>
<translation type="unfinished">Vše přečteno &amp; Aktualizovat vše</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="392"/>
<location filename="../qml/pages/SourcesPage.qml" line="393"/>
<source>Stop Audio</source>
<translation type="unfinished">Zastavit audio</translation>
</message>
20 changes: 10 additions & 10 deletions translations/harbour-tidings-cs_CZ.ts
Original file line number Diff line number Diff line change
@@ -492,44 +492,44 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="328"/>
<location filename="../qml/pages/SourcesPage.qml" line="329"/>
<source>About Tidings</source>
<translation type="unfinished">O Tidings</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="335"/>
<location filename="../qml/pages/SourcesPage.qml" line="336"/>
<source>Settings</source>
<translation type="unfinished">Nastavení</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="341"/>
<location filename="../qml/pages/SourcesPage.qml" line="342"/>
<source>Import OPML</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="348"/>
<location filename="../qml/pages/SourcesPage.qml" line="351"/>
<location filename="../qml/pages/SourcesPage.qml" line="349"/>
<location filename="../qml/pages/SourcesPage.qml" line="352"/>
<source>All read</source>
<translation type="unfinished">Vše přečteno</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="360"/>
<location filename="../qml/pages/SourcesPage.qml" line="375"/>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<source>Abort refreshing</source>
<translation type="unfinished">Zrušit aktualizaci</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="362"/>
<source>Refresh all</source>
<translation type="unfinished">Aktualizovat vše</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<location filename="../qml/pages/SourcesPage.qml" line="377"/>
<source>All read &amp; Refresh all</source>
<translation type="unfinished">Vše přečteno &amp; Aktualizovat vše</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="392"/>
<location filename="../qml/pages/SourcesPage.qml" line="393"/>
<source>Stop Audio</source>
<translation type="unfinished">Zastavit audio</translation>
</message>
20 changes: 10 additions & 10 deletions translations/harbour-tidings-de_DE.ts
Original file line number Diff line number Diff line change
@@ -492,44 +492,44 @@
<translation type="unfinished">OPML Datei auswählen</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="328"/>
<location filename="../qml/pages/SourcesPage.qml" line="329"/>
<source>About Tidings</source>
<translation>Über Tidings</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="335"/>
<location filename="../qml/pages/SourcesPage.qml" line="336"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="341"/>
<location filename="../qml/pages/SourcesPage.qml" line="342"/>
<source>Import OPML</source>
<translation type="unfinished">OPML importieren</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="348"/>
<location filename="../qml/pages/SourcesPage.qml" line="351"/>
<location filename="../qml/pages/SourcesPage.qml" line="349"/>
<location filename="../qml/pages/SourcesPage.qml" line="352"/>
<source>All read</source>
<translation>Alle gelesen</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="360"/>
<location filename="../qml/pages/SourcesPage.qml" line="375"/>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<source>Abort refreshing</source>
<translation>Aktualisierung abbrechen</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="362"/>
<source>Refresh all</source>
<translation>Alle aktualisieren</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<location filename="../qml/pages/SourcesPage.qml" line="377"/>
<source>All read &amp; Refresh all</source>
<translation type="unfinished">Alles gelesen &amp; Alle aktualisieren</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="392"/>
<location filename="../qml/pages/SourcesPage.qml" line="393"/>
<source>Stop Audio</source>
<translation>Audio stoppen</translation>
</message>
20 changes: 10 additions & 10 deletions translations/harbour-tidings-es.ts
Original file line number Diff line number Diff line change
@@ -492,44 +492,44 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="328"/>
<location filename="../qml/pages/SourcesPage.qml" line="329"/>
<source>About Tidings</source>
<translation>Tidings</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="335"/>
<location filename="../qml/pages/SourcesPage.qml" line="336"/>
<source>Settings</source>
<translation>Ajustes</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="341"/>
<location filename="../qml/pages/SourcesPage.qml" line="342"/>
<source>Import OPML</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="348"/>
<location filename="../qml/pages/SourcesPage.qml" line="351"/>
<location filename="../qml/pages/SourcesPage.qml" line="349"/>
<location filename="../qml/pages/SourcesPage.qml" line="352"/>
<source>All read</source>
<translation>Leer todo</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="360"/>
<location filename="../qml/pages/SourcesPage.qml" line="375"/>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<source>Abort refreshing</source>
<translation>Abortar actualización</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="362"/>
<source>Refresh all</source>
<translation>Actualizar todo</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<location filename="../qml/pages/SourcesPage.qml" line="377"/>
<source>All read &amp; Refresh all</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="392"/>
<location filename="../qml/pages/SourcesPage.qml" line="393"/>
<source>Stop Audio</source>
<translation>Detener el audio</translation>
</message>
20 changes: 10 additions & 10 deletions translations/harbour-tidings-fi_FI.ts
Original file line number Diff line number Diff line change
@@ -492,44 +492,44 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="328"/>
<location filename="../qml/pages/SourcesPage.qml" line="329"/>
<source>About Tidings</source>
<translation>Tietoja</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="335"/>
<location filename="../qml/pages/SourcesPage.qml" line="336"/>
<source>Settings</source>
<translation>Asetukset</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="341"/>
<location filename="../qml/pages/SourcesPage.qml" line="342"/>
<source>Import OPML</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="348"/>
<location filename="../qml/pages/SourcesPage.qml" line="351"/>
<location filename="../qml/pages/SourcesPage.qml" line="349"/>
<location filename="../qml/pages/SourcesPage.qml" line="352"/>
<source>All read</source>
<translation>Kaikki luettu</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="360"/>
<location filename="../qml/pages/SourcesPage.qml" line="375"/>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<source>Abort refreshing</source>
<translation>Keskeytä päivitys</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="361"/>
<location filename="../qml/pages/SourcesPage.qml" line="362"/>
<source>Refresh all</source>
<translation>Päivitä kaikki</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="376"/>
<location filename="../qml/pages/SourcesPage.qml" line="377"/>
<source>All read &amp; Refresh all</source>
<translation>Kaikki luettu &amp; Päivitä kaikki</translation>
</message>
<message>
<location filename="../qml/pages/SourcesPage.qml" line="392"/>
<location filename="../qml/pages/SourcesPage.qml" line="393"/>
<source>Stop Audio</source>
<translation>Pysäytä ääni</translation>
</message>
Loading