diff --git a/.github/workflows/build-on-pull_req.yml b/.github/workflows/build-on-pull_req.yml index cde3fa05..2ef9a9ca 100644 --- a/.github/workflows/build-on-pull_req.yml +++ b/.github/workflows/build-on-pull_req.yml @@ -1,7 +1,7 @@ -name: CI on PRs with SDK for 2.2.0 (i486) +name: CI on PRs with SDK for 3.0.2 (i486) env: - RELEASE: 2.2.0.29 + RELEASE: 3.0.2.8 ARCH: i486 # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 3 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1 diff --git a/.github/workflows/build-on-tags.yml b/.github/workflows/build-on-tags.yml index d2febb89..59ed0ea7 100644 --- a/.github/workflows/build-on-tags.yml +++ b/.github/workflows/build-on-tags.yml @@ -66,11 +66,54 @@ jobs: path: RPMS/ - SDK-310: + SDK-302: runs-on: ubuntu-22.04 env: # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk - RELEASE: 3.1.0.12 + RELEASE: 3.0.2.8 + # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes. + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 + steps: + + - name: Checkout + uses: actions/checkout@v3 + + # Caching Docker images is not ready yet, see + # https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md + #- name: Cache Docker images of the Sailfish-SDK + # id: cache-sdk + # uses: actions/cache@v3 + # with: + # path: $GITHUB_WORKSPACE/… + # key: cache + + - name: Prepare + run: mkdir RPMS + + - name: Build armv7hl on ${{ env.RELEASE }} + uses: coderus/github-sfos-build@old-stable + with: + release: ${{ env.RELEASE }} + arch: armv7hl + + - name: Build i486 on ${{ env.RELEASE }} + uses: coderus/github-sfos-build@old-stable + with: + release: ${{ env.RELEASE }} + arch: i486 + + - name: Upload build results + uses: actions/upload-artifact@v3 + with: + name: RPM-build-results_SFOS${{ env.RELEASE }}+ + path: RPMS/ + + + SDK-320: + runs-on: ubuntu-22.04 + env: + # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk + RELEASE: 3.2.0.12 # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 steps: @@ -158,11 +201,11 @@ jobs: path: RPMS/ - SDK-440: + SDK-430: runs-on: ubuntu-22.04 env: # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk - RELEASE: 4.4.0.68 + RELEASE: 4.3.0.12 # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 steps: diff --git a/.logo/logo.108x108.png b/.logo/logo.108x108.png new file mode 120000 index 00000000..7ffff107 --- /dev/null +++ b/.logo/logo.108x108.png @@ -0,0 +1 @@ +../icons/108x108/harbour-dailycomics.png \ No newline at end of file diff --git a/.logo/logo.128x128.png b/.logo/logo.128x128.png new file mode 120000 index 00000000..999deb81 --- /dev/null +++ b/.logo/logo.128x128.png @@ -0,0 +1 @@ +../icons/128x128/harbour-dailycomics.png \ No newline at end of file diff --git a/.logo/logo.172x172.png b/.logo/logo.172x172.png new file mode 120000 index 00000000..70296817 --- /dev/null +++ b/.logo/logo.172x172.png @@ -0,0 +1 @@ +../icons/172x172/harbour-dailycomics.png \ No newline at end of file diff --git a/.logo/logo.256x256.png b/.logo/logo.256x256.png new file mode 100644 index 00000000..510d0129 Binary files /dev/null and b/.logo/logo.256x256.png differ diff --git a/.logo/logo.480x480.png b/.logo/logo.480x480.png new file mode 100644 index 00000000..2502b747 Binary files /dev/null and b/.logo/logo.480x480.png differ diff --git a/.logo/logo.560x560.png b/.logo/logo.560x560.png new file mode 100644 index 00000000..6e34f6e8 Binary files /dev/null and b/.logo/logo.560x560.png differ diff --git a/.logo/logo.86x86.png b/.logo/logo.86x86.png new file mode 120000 index 00000000..b4fe9e41 --- /dev/null +++ b/.logo/logo.86x86.png @@ -0,0 +1 @@ +../icons/86x86/harbour-dailycomics.png \ No newline at end of file diff --git a/.logo/logo.svg b/.logo/logo.svg new file mode 120000 index 00000000..c1b87f55 --- /dev/null +++ b/.logo/logo.svg @@ -0,0 +1 @@ +../resources/logo.svg \ No newline at end of file diff --git a/.logo/social-media/logo.1280x640.png b/.logo/social-media/logo.1280x640.png new file mode 100644 index 00000000..1e3a7073 Binary files /dev/null and b/.logo/social-media/logo.1280x640.png differ diff --git a/.logo/social-media/logo.1500x500.png b/.logo/social-media/logo.1500x500.png new file mode 100644 index 00000000..f7892496 Binary files /dev/null and b/.logo/social-media/logo.1500x500.png differ diff --git a/.logo/social-media/logo.792x792.png b/.logo/social-media/logo.792x792.png new file mode 100644 index 00000000..27eaa578 Binary files /dev/null and b/.logo/social-media/logo.792x792.png differ diff --git a/LICENSE.txt b/LICENSE.txt index 315049c7..d352fbe2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -3,14 +3,14 @@ The MIT License (MIT) Source Code: Copyright (c) 2015-2019 Damien Tardy-Panis , see https://github.com/sailfishos-applications/daily-comics/commits?author=tardypad -Copyright (c) 2016,2019 Haucke Schade , +Copyright (c) 2016,2019,2024 Hauke Schade , see https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete Copyright (c) 2018-2020 Oleg Linkin , see https://github.com/sailfishos-applications/daily-comics/commits?author=Maledictus and some commits just as "Oleg Linkin" Copyright (c) 2020 Mirian Margiani , see https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus -Copyright (c) 2023 olf , +Copyright (c) 2023,2024 olf , see https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0 Plugins: @@ -36,7 +36,7 @@ see https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0 Translations - [de]: - Copyright (c) 2016,2019 Haucke Schade , see + Copyright (c) 2016,2019,2024 Hauke Schade , see https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete Copyright (c) 2020 Mirian Margiani , see https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus diff --git a/README.md b/README.md index 3875dd05..ac50923b 100644 --- a/README.md +++ b/README.md @@ -53,10 +53,10 @@ If you want to translate Daily Comics to a language it does not support yet or i ## Contributors ### Source Code - [2015-2019](https://github.com/sailfishos-applications/daily-comics/commits?author=tardypad) Damien Tardy-Panis ([tardypad](https://github.com/tardypad)) -- [2016,2019](https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete) Haucke Schade ([cnlpete](https://github.com/cnlpete)) +- [2016,2019,2024](https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete) Hauke Schade ([cnlpete](https://github.com/cnlpete)) - [2018-2020](https://github.com/sailfishos-applications/daily-comics/commits?author=Maledictus) Oleg Linkin ([Maledictus](https://github.com/Maledictus)) - [2020](https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus) Mirian Margiani ([ichthyosaurus](https://github.com/ichthyosaurus)) -- [2023](https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0) olf ([Olf0](https://github.com/Olf0)) +- [2023,2024](https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0) olf ([Olf0](https://github.com/Olf0)) ### Plugins - [2015-2019](https://github.com/sailfishos-applications/daily-comics/commits?author=tardypad) Damien Tardy-Panis ([tardypad](https://github.com/tardypad)) @@ -71,7 +71,7 @@ If you want to translate Daily Comics to a language it does not support yet or i ### Translations - [`de`](https://app.transifex.com/olf/daily-comics/language/de/) - - [2016,2019](https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete) Haucke Schade ([cnlpete](https://github.com/cnlpete)) + - [2016,2019,2024](https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete) Hauke Schade ([cnlpete](https://github.com/cnlpete)) - [2020](https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus) Mirian Margiani ([ichthyosaurus](https://github.com/ichthyosaurus)) - [2023](https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0) olf ([Olf0](https://github.com/Olf0)) - [`fr`](https://app.transifex.com/olf/daily-comics/language/fr/) diff --git a/git/hooks/pre-commit b/git/hooks/pre-commit index 2f185105..5029d15a 100755 --- a/git/hooks/pre-commit +++ b/git/hooks/pre-commit @@ -1,10 +1,10 @@ #!/bin/sh -duplicates=$(grep -h color plugins/*/info.json | cut -d: -f2 | sed -r 's/.*"(.*)".*/\1/' | sort | uniq -d) +duplicates="$(grep -Fh color plugins/*/info.json | cut -d: -f2 | sed -E '^[^"]*"(.*)".*$/\1/' | sort | uniq -d)" if [ -n "$duplicates" ] then - echo "There are multiple comics with the same color:" + echo "There are multiple comics with the same color(s):" echo "$duplicates" exit 1 fi diff --git a/icons/256x256/harbour-dailycomics.png b/icons/256x256/harbour-dailycomics.png new file mode 100644 index 00000000..17eba594 Binary files /dev/null and b/icons/256x256/harbour-dailycomics.png differ diff --git a/plugins/donaldduck/cover.jpg b/plugins/donaldduck/cover.jpg deleted file mode 100644 index 129d1ec2..00000000 Binary files a/plugins/donaldduck/cover.jpg and /dev/null differ diff --git a/plugins/donaldduck/cover_big.jpg b/plugins/donaldduck/cover_big.jpg deleted file mode 100644 index 5cebf409..00000000 Binary files a/plugins/donaldduck/cover_big.jpg and /dev/null differ diff --git a/plugins/donaldduck/example.jpg b/plugins/donaldduck/example.jpg deleted file mode 100644 index 0dc431bb..00000000 Binary files a/plugins/donaldduck/example.jpg and /dev/null differ diff --git a/plugins/donaldduck/extract.js b/plugins/donaldduck/extract.js deleted file mode 100644 index a8a5f5c5..00000000 --- a/plugins/donaldduck/extract.js +++ /dev/null @@ -1,5 +0,0 @@ -function(page) { - var regex = / - * Copyright (c) 2016 Haucke Schade + * Copyright (c) 2016 Hauke Schade * Copyright (c) 2019 Oleg Linkin * Copyright (c) 2023 olf * diff --git a/qml/pages/ComicsSettingsPage.qml b/qml/pages/ComicsSettingsPage.qml index 038db327..777407e4 100644 --- a/qml/pages/ComicsSettingsPage.qml +++ b/qml/pages/ComicsSettingsPage.qml @@ -1,5 +1,6 @@ /** * Copyright (c) 2015 Damien Tardy-Panis + * Copyright (c) 2024 Hauke Schade * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -62,7 +63,7 @@ Dialog { } } - footer: RequestContactDevRectangle { + footer: ReportNewComicRectangle { flickable: gridView } diff --git a/qml/pages/FavoritesPage.qml b/qml/pages/FavoritesPage.qml index 3ee5df14..eafe2cd2 100644 --- a/qml/pages/FavoritesPage.qml +++ b/qml/pages/FavoritesPage.qml @@ -1,6 +1,6 @@ /** * Copyright (c) 2015-2019 Damien Tardy-Panis - * Copyright (c) 2016 Haucke Schade + * Copyright (c) 2016 Hauke Schade * Copyright (c) 2019 Oleg Linkin * Copyright (c) 2023 olf * diff --git a/rpm/harbour-dailycomics.spec b/rpm/harbour-dailycomics.spec index aa161bfc..fd70a573 100644 --- a/rpm/harbour-dailycomics.spec +++ b/rpm/harbour-dailycomics.spec @@ -9,12 +9,12 @@ Name: harbour-dailycomics Summary: Daily comic strips reader # The tag must adhere to semantic versioning: Among multiple other -# reasons due to its use for `qmake5` in line 107. See https://semver.org/ +# reasons due to its use for `qmake5` in line 90. See https://semver.org/ Version: 1.9.95 -# The tag comprisees one of {alpha,beta,rc,release} postfixed with a -# natural number greater or equal to 1 (e.g., "beta3") and may additionally be +# The tag comprises one of {alpha,beta,rc,release} postfixed with a +# natural number greater or equal to 1 (e.g. "beta3") and may additionally be # postfixed with a plus character ("+"), the name of the packager and a release -# number chosen by her (e.g., "rc2+jane4"). `{alpha|beta|rc|release}` +# number chosen by her (e.g. "rc2+jane4"). `{alpha|beta|rc|release}` # indicates the expected status of the software. No other identifiers shall be # used for any published version, but for the purpose of testing infrastructure # other nonsensual identifiers as `adud` may be used, which do *not* trigger a diff --git a/translations/README.md b/translations/README.md index f8179604..a042a17d 100644 --- a/translations/README.md +++ b/translations/README.md @@ -2,7 +2,7 @@ You can help localising Daily Comics to your language using [Transifex](https://app.transifex.com/olf/daily-comics) or [Qt Linguist](https://doc.qt.io/qt-5/qtlinguist-index.html). -Note that for Daily Comics principally translations designated with a country code only (e.g., `pt`) shall be created and maintained. Only if a complete and well maintained translation for the sole country code exists, a country specific variant with a locale will be accepted (e.g., `nl_BE`). +Note that for Daily Comics principally translations designated with a country code only (e.g. `pt`) shall be created and maintained. Only if a complete and well maintained translation for the sole country code exists, a country specific variant with a locale will be accepted (e.g. `nl_BE`). [Transifex](https://app.transifex.com/olf/daily-comics) is the preferred way of submitting translations. Please do not send pull requests (PRs) with translations directly to GitHub, if you have a Transifex account. @@ -14,9 +14,9 @@ To compile a translation file for testing, use the `lrelease` command to convert ``` lrelease harbour-dailycomics.ts ``` -If you want to test your translation before publishing, you should compile it and copy the resulting `qm` file(s) to (requires root privileges) +If you want to test your translation before publishing, you should compile it and copy the resulting `.qm` file(s) to (requires root privileges): ``` - /usr/share/harbour-dailycomics/translations +/usr/share/harbour-dailycomics/translations/ ``` Daily Comics tries to automatically load a translation file according to your system locale setting. You can also run the application with a selected locale from the terminal. For example, for the Swedish language the command is: ``` @@ -25,5 +25,5 @@ export LANG=sv; harbour-dailycomics ### Updating the source `.ts` file with source strings from source code -Developers and release managers can use the `lupdate` process, either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html) (mind to [include all files with translatable strings](https://github.com/storeman-developers/harbour-storeman/pull/431#issuecomment-1659024529), e.g., by `lupdate qml/ src/ *.desktop -ts translations/harbour-dailycomics.ts`), or tediously perform this manually, which hence is only suitable for small changes. +Developers and release managers can use the `lupdate` process, either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html) (mind to [include all files with translatable strings](https://github.com/storeman-developers/harbour-storeman/pull/431#issuecomment-1659024529), e.g. by `lupdate qml/ src/ *.desktop -ts translations/harbour-dailycomics.ts`), or tediously perform this manually, which hence is only suitable for small changes. diff --git a/translations/harbour-dailycomics-de.ts b/translations/harbour-dailycomics-de.ts index b217d6a9..84f0fdef 100644 --- a/translations/harbour-dailycomics-de.ts +++ b/translations/harbour-dailycomics-de.ts @@ -1,70 +1,53 @@ - + + + AboutPage - + Your daily fix of your favorite comic strips Die tägliche Dosis Comics - - version %1 + + Version %1 Version %1 - - created by %1 - von %1 + + <a href="%1">Source code repository</a> + <a href="%1">Quellcode Repository</a> - - maintained by %1 - gepflegt durch %1 + + License: %1 + Lizenz: %1 - - The source code is available at - <a href="%1">%2</a><br /> - You can contact me for any remarks, - bugs, feature requests, ideas,...<br /> - <br /> - Below are few resources to find new comics.<br /> - Let me know as well which additional comics - you would like to be included in the app. - Der Quellcode ist hier verfügbar: - <a href="%1">%2</a><br /> - Sie können mich bei Fragen, Fehlern - Feature-Requests, Ideen usw. gerne kontaktieren.<br /> - <br /> - Unten finden Sie einige Quellen für neue Comics.<br /> - Lassen Sie mich wissen, wenn Sie sich neue Comics - in der App wünschen. - - - - Enjoy! - Viel Spass! + + <a href="%1">Issue tracker for bug reports, feature suggestions and help requests</a> + <a href="%1">Issue tracker für Fehlermeldungen, Featurewünsche und Hilfegesuche</a> ComicInfoPage - + Comic info Comic-Info - + Authors Autoren - + Author Autor - + Language Sprache @@ -72,22 +55,22 @@ ComicInfoPanel - + Authors Autoren - + Author Autor - + Language Sprache - + Go to homepage Webseite aufrufen @@ -101,28 +84,28 @@ - Can't display comic + Cannot display comic Comic kann nicht angezeigt werden - Can't download comic + Cannot download comic Comic kann nicht geladen werden - Can't extract comic - Comic konnte nicht gefunden werden + Cannot extract comic + Kann Comic nicht finden - Can't save comic - Comic konnte nicht gespeichert werden + Cannot save comic + Kann Comic nicht speichern - - Please contact me if the problem persists. - Bitte kontaktieren Sie mich, wenn das Problem weiter besteht. + + Please report if this issue persists. + Bitte melden, sollte das Problem weiter bestehen. @@ -153,37 +136,30 @@ %n new comic(s) - %n neues Comic%n neue Comics + + %n neues Comic + %n neue Comics + EndPanel - + That's all for now! Das war alles! - - If you like the app, please consider supporting your favorite comic artists + + If you like this app, please consider to support your favorite comic artists Wenn Ihnen die App gefällt, unterstützen Sie Ihre liebsten Comic-Autoren - + Return to favorites Zurück zu den Favoriten - - ErrorContactDevRectangle - - - Please contact me -if the problem persists. - Bitte kontaktieren Sie mich, -wenn das Problem weiter besteht. - - FavoritesPage @@ -241,57 +217,40 @@ wenn das Problem weiter besteht. - Comic strip url copied to clipboard + Comic strip URL copied to clipboard Comic-URL kopiert - Unable to copy comic strip url to clipboard + Unable to copy comic strip URL to clipboard Die Comic-URL konnte nicht kopiert werden - - LoadingIndicator - - - An error occured - Ein Fehler ist aufgetreten - - - - Network error - Netzwerkfehler - - - - Parsing error - Lesefehler - - - - Saving error - Fehler beim Speichern - - ProgressInfoBar %n New - %n neu%n neue + + %n neu + %n neue + %n Error(s) - %n Fehler%n Fehler + + %n Fehler + %n Fehler + - RequestContactDevRectangle + ReportNewComicRectangle - - Let me know if you're missing some of your favorite comics in this list - Lassen Sie mich wissen, wenn Ihnen Comics in der Liste fehlen + + Please report if you like to see some additional comic(s) + Bitte melden, wenn Sie neue Comics in der App wünschen. @@ -311,7 +270,7 @@ wenn das Problem weiter besteht. - No sharing accounts available. You can add accounts in settings + No sharing accounts available. You can add accounts in the SailfishOS settings. Es sind keine Konten für das Teilen eingerichtet. Sie können welche in den globalen Einstellungen hinzufügen. @@ -323,17 +282,40 @@ wenn das Problem weiter besteht. Wischen, um das nächste Comic anzuzeigen + + StatusOverlay + + + An error occured + Ein Fehler ist aufgetreten + + + + Network error + Netzwerkfehler + + + + Parsing error + Lesefehler + + + + Saving error + Fehler beim Speichern + + ZoomableImage - + Image error Bildfehler - - Can't display strip + + Cannot display strip Comic kann nicht angezeigt werden - \ No newline at end of file +