Merge branch 'devel' into translations/german

sailfishos-applications · Mar 24, 2024 · 767cac0 · 767cac0
2 parents e67f9a0 + 1198881
commit 767cac0
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 23 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -3,14 +3,14 @@ The MIT License (MIT)
 Source Code:
 Copyright (c) 2015-2019 Damien Tardy-Panis <damien@tardypad.me>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=tardypad
-Copyright (c) 2016,2019 Haucke Schade <cnlpete@users.noreply.github.com>,
+Copyright (c) 2016,2019,2024 Hauke Schade <cnlpete@users.noreply.github.com>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete
 Copyright (c) 2018-2020 Oleg Linkin <maledictusdemagog@gmail.com>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=Maledictus
 and some commits just as "Oleg Linkin"
 Copyright (c) 2020 Mirian Margiani <ichthyosaurus@users.noreply.github.com>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus
-Copyright (c) 2023 olf <Olf0@users.noreply.github.com>,
+Copyright (c) 2023,2024 olf <Olf0@users.noreply.github.com>,
 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 <cnlpete@users.noreply.github.com>, see
+  Copyright (c) 2016,2019 Hauke Schade <cnlpete@users.noreply.github.com>, see
   https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete
   Copyright (c) 2020 Mirian Margiani <ichthyosaurus@users.noreply.github.com>, see
   https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ 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](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))
@@ -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](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/plugins/donaldduck/cover.jpg b/plugins/donaldduck/cover.jpg
diff --git a/plugins/donaldduck/cover_big.jpg b/plugins/donaldduck/cover_big.jpg
diff --git a/plugins/donaldduck/example.jpg b/plugins/donaldduck/example.jpg
diff --git a/plugins/donaldduck/extract.js b/plugins/donaldduck/extract.js
diff --git a/plugins/donaldduck/info.json b/plugins/donaldduck/info.json
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2015-2019 Damien Tardy-Panis <damien@tardypad.me>
- * Copyright (c) 2016 Haucke Schade <cnlpete@users.noreply.github.com>
+ * Copyright (c) 2016 Hauke Schade <cnlpete@users.noreply.github.com>
  * Copyright (c) 2019 Oleg Linkin <maledictusdemagog@gmail.com>
  * Copyright (c) 2023 olf <Olf0@users.noreply.github.com>
  *

diff --git a/qml/pages/ComicsSettingsPage.qml b/qml/pages/ComicsSettingsPage.qml
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2015 Damien Tardy-Panis <damien@tardypad.me>
+ * Copyright (c) 2024 Hauke Schade <cnlpete@users.noreply.github.com>
  *
  * 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
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2015-2019 Damien Tardy-Panis <damien@tardypad.me>
- * Copyright (c) 2016 Haucke Schade <cnlpete@users.noreply.github.com>
+ * Copyright (c) 2016 Hauke Schade <cnlpete@users.noreply.github.com>
  * Copyright (c) 2019 Oleg Linkin <maledictusdemagog@gmail.com>
  * Copyright (c) 2023 olf <Olf0@users.noreply.github.com>
  *