Merge pull request #345 from storeman-developers/master

Push extra commits from master→sfos3.3 for v0.3.1-2

README.md

@@ -39,7 +39,7 @@ The Storeman Installer for installing Storeman proper is available at [OpenRepos
 * Before software can be built for a SailfishOS release at the SailfishOS-OBS, Jolla must create a corresponding "download on demand (DoD)" OBS-repository. It often takes some time after a new "general availability (GA)" SailfishOS release is published before the corresponding "DoD" repository is being made available, during which installing or updating Storeman by the Storeman Installer or Storeman's self-updating on a device with the new SailfishOS release already installed will fail; consequently this is always the case during the "closed beta (cBeta)" and "early access (EA)" phases of a new SailfishOS release. Hence one has to either manually set the last prior SailfishOS GA release in the SailfishOS:Chum GUI application or manually download and install or update Storeman built for the last prior SailfishOS GA release, then.
 * **Disclaimer:** Storeman and Storeman Installer may still have flaws, kill your kittens or break your SailfishOS installation! Although this is very unlikely after years of testing by many users, new flaws may be introduced in any release (as for any software). Mind, that the license you implicitly accept by using Storeman excludes any liability.
 
-## Translating Storeman ("l10n" / "i18n")
+## Translating Storeman (l10n / i18n)
 
 If you want to translate Storeman to a language it does not support yet or enhance an existing translation, please [read the translations-README](translations/README.md).
 
@@ -50,7 +50,7 @@ If you want to translate Storeman to a language it does not support yet or enhan
 | ![RecentAppsPage](https:/storeman-developers/harbour-storeman/blob/devel/.xdata/screenshots/screenshot-screenshot-storeman-01.png) | ![AppPage](https:/storeman-developers/harbour-storeman/blob/devel/.xdata/screenshots/screenshot-screenshot-storeman-02.png) | ![CommentsPage](https:/storeman-developers/harbour-storeman/blob/devel/.xdata/screenshots/screenshot-screenshot-storeman-03.png) | ![Commenting](https:/storeman-developers/harbour-storeman/blob/devel/.xdata/screenshots/screenshot-screenshot-storeman-04.png) |
 | ![RepositoriesPage](https:/storeman-developers/harbour-storeman/blob/devel/.xdata/screenshots/screenshot-screenshot-storeman-06.png) | ![InstalledAppsPage](https:/storeman-developers/harbour-storeman/blob/devel/.xdata/screenshots/screenshot-screenshot-storeman-07.png) | ![BookmarksPage](https:/storeman-developers/harbour-storeman/blob/devel/.xdata/screenshots/screenshot-screenshot-storeman-08.png) | ![RepositoryPage](https:/storeman-developers/harbour-storeman/blob/devel/.xdata/screenshots/screenshot-screenshot-storeman-09.png) |
 
-## Contributors to Storeman
+## Credits
 
 - [Petr Tsymbarovich (mentaljam / osetr)](https:/mentaljam)
 - [olf (Olf0)](https:/Olf0)

qml/models/DevelopersModel.qml

@@ -52,7 +52,7 @@ ListModel {
  }
 
  ListElement {
- //% "Application Icon"
+ //% "Application icon"
  role: qsTrId("orn-appicon")
  participants: [
  ListElement {

qml/pages/AboutPage.qml

@@ -49,9 +49,9 @@ Page {
  font.pixelSize: Theme.fontSizeSmall
  wrapMode: Text.WordWrap
  horizontalAlignment: Qt.AlignHCenter
- //% "<p>A native OpenRepos.net client app for SailfishOS</p>"
- //% "<p>Storeman is Free Software (FLOSS), distributed under the terms of the <a href='%1'>MIT&nbsp;License</a>.</p>"
- //% "<p>Issues can be reported preferably at GitHub or alternatively at OpenRepos.net (e.g., by using the buttons below).</p>"
+ //% "<p>OpenRepos client application for SailfishOS<br />&nbsp;</p>"
+ //% "<p>Storeman is Free Software (FLOSS), distributed under the terms of the <a href='%1'>MIT&nbsp;license</a>.</p>"
+ //% "<p>Issues shall be reported preferably at GitHub or alternatively at OpenRepos (use the buttons below).</p>"
  text: qsTrId("orn-app-description-full").arg("https:/storeman-developers/harbour-storeman/raw/master/LICENSE")
  onLinkActivated: Qt.openUrlExternally(link)
  }
@@ -60,7 +60,12 @@ Page {
  width: parent.width
 
  Button {
- text: "OpenRepos.net"
+ text: "@GitHub"
+ onClicked: Qt.openUrlExternally("https:/storeman-developers")
+ }
+
+ Button {
+ text: "@OpenRepos"
  onClicked: {
  pageStack.push(Qt.resolvedUrl("AppPage.qml"), {
  appId: 11621
@@ -69,20 +74,20 @@ Page {
  }
 
  Button {
- text: qsTrId("orn-development")
- onClicked: pageStack.push(Qt.resolvedUrl("DevelopmentPage.qml"))
+ //% "Donation"
+ text: qsTrId("orn-donation")
+ onClicked: Qt.openUrlExternally("https://openrepos.net/donate")
  }
 
  Button {
  text: qsTrId("orn-translations")
  onClicked: pageStack.push(Qt.resolvedUrl("TranslationsPage.qml"))
  }
- 
+
  Button {
- //% "Donations"
- text: qsTrId("orn-donations")
- onClicked: Qt.openUrlExternally("https://openrepos.net/donate")
- }
+ text: qsTrId("orn-development")
+ onClicked: pageStack.push(Qt.resolvedUrl("DevelopmentPage.qml"))
+ } 
  }
  }
  }

qml/pages/DevelopmentPage.qml

@@ -11,7 +11,7 @@ Page {
  model: DevelopersModel { }
 
  header: PageHeader {
- //% "Development & Issues"
+ //% "Credits"
  title: qsTrId("orn-development")
  }
 
@@ -57,9 +57,9 @@ Page {
  PullDownMenu {
 
  MenuItem {
- //% "Source Code & Issue Tracker"
+ //% "Source code & Issue tracker"
  text: qsTrId("orn-sources")
- onClicked: Qt.openUrlExternally("https:/storeman-developers/")
+ onClicked: Qt.openUrlExternally("https:/storeman-developers/harbour-storeman")
  }
 
  MenuStatusLabel { }

qml/pages/TranslationsPage.qml

@@ -65,7 +65,7 @@ Page {
  PullDownMenu {
 
  MenuItem {
- text: "Transifex"
+ text: "Storeman@Transifex"
  onClicked: Qt.openUrlExternally("https://www.transifex.com/mentaljam/harbour-storeman")
  }
 

rpm/harbour-storeman.changes

@@ -1,10 +1,23 @@
-* Sun Mar 20 2022 olf <https:/Olf0> 0.3.0
+* Sun Jul 17 2022 olf <https:/Olf0> 0.3.1
+- Update contributors' copyright notices in license file (#313)
+- Re-introduce donation button (#322)
+- Update changelog for v0.3.0 and v0.3.1 (#329)
+- Shorten a few strings (#327, #332, #333)
+- [AboutPage.qml] Beautify vertical spacing (#340)
+
+* Sat May 14 2022 olf <https:/Olf0> 0.3.0
 - Add 8 screenshots, plus social media icons (#216, #232, #238) 
 - spec file: Add SailfishOS:Chum metadata (#218, #233)
 - Remove donation links (#224) 
 - README: Enhance translations title etc. (#234)
 - Update Hungarian translation
-- Only in sfos4.2 branch: Trivially bail out of SailJail (#250) 
+- Only in sfos4.2 branch: Trivially bail out of SailJail (#250)
+- spec file: Do not try to own /usr/bin
+- Adapt to revised release tag naming scheme (#280)
+- Various enhancements to the spec file
+- Delete git submodule mentaljam-obs
+- Spec file enancements (#291, #298, #299, #302)
+- Switch to a standard Group: (#304)
 
 * Sun Mar 13 2022 olf <https:/Olf0> 0.2.12
 - Cease using a repository entry in SSU's global section (#157) by storeman.spec: Do not assign repo in global section (#172)

rpm/harbour-storeman.spec

@@ -1,7 +1,7 @@
 Name: harbour-storeman
 Summary: OpenRepos client application for SailfishOS
 Version: 0.3.1
-Release: 1
+Release: 2
 Group: Applications/System
 License: MIT
 URL: https:/storeman-developers/harbour-storeman

translations/README.md

@@ -1,19 +1,20 @@
-# Translations
+# Translations (l10n / i18n)
 
-You can help to localize harbour-storeman to your language using [Transifex](https://www.transifex.com/mentaljam/harbour-storeman) or [Qt Linguist](http://doc.qt.io/qt-5/qtlinguist-index.html).
+You can help localising Storeman to your language using [Transifex](https://www.transifex.com/mentaljam/harbour-storeman) or [Qt Linguist](https://doc.qt.io/qt-5/qtlinguist-index.html).
 
-Note that for Storeman primarily 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 Storeman 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://www.transifex.com/mentaljam/harbour-storeman) is the preferred way of pushing your translations. Please don't send PRs with translations directly to GitHub if you have a Transifex account.
+[Transifex](https://www.transifex.com/mentaljam/harbour-storeman) is the preferred way of pushing your translations.
+Please do not send PRs with translations directly to GitHub, if you have a Transifex account.
 
-Note that harbour-storeman translations are **ID based** Qt ts files. So if you want to compile a translation file for testing you should run the lrelease command with the "-idbased" option, for example:
+Note that translations for Storeman are *ID based* Qt `ts` files.  Hence, if you want to compile a translation file for testing, you should run the `lrelease` command with the `-idbased` option, for example:
 
  lrelease -idbased harbour-storeman.ts
 
-If you want to test your translation before publishing you should compile it and place produced qm file to (root access is required)
+If you want to test your translation before publishing, you should compile it and copy the resulting `qm` file to (requires root privileges)
 
  /usr/share/harbour-storeman/translations
 
-The application tries to load translation files automatically basing on your system locale settings. Also you can run application with selected locale from terminal. For example for Russian language the command is
+Storeman 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 Russian language the command is:
 
- LANG=ru harbour-storeman
+ export LANG=ru; harbour-storeman

translations/harbour-storeman-cs.ts

@@ -1016,8 +1016,8 @@
  <source>My repository</source>
  <translation>Můj repozitář</translation>
  </message>
- <message id="orn-donations">
- <source>Donations</source>
+ <message id="orn-donation">
+ <source>Donation</source>
  <translation>Přispět</translation>
  </message>
  <message id="orn-cover-updates-available">
@@ -1029,7 +1029,8 @@
  <translation>Balíček %0 byl úspěšně aktualizován</translation>
  </message>
  <message id="orn-app-description-full">
- <source>&lt;p&gt;A native OpenRepos.net client app for SailfishOS&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;License&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues can be reported preferably at GitHub or alternatively at OpenRepos.net (e.g., by using the buttons below).&lt;/p&gt;</source>
+ <source>&lt;p&gt;OpenRepos client application for SailfishOS&lt;br /&gt;&amp;nbsp;&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;license&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues shall be reported preferably at GitHub or alternatively at OpenRepos (use the buttons below).&lt;/p&gt;</source>
+ <extracomment>Avoid to translate the acronym FLOSS (Free, Libre, Open Source Software).</extracomment>
  <translation type="unfinished"></translation>
  </message>
  <message id="orn-show-details">

translations/harbour-storeman-da.ts

@@ -1011,8 +1011,8 @@
  <source>My repository</source>
  <translation type="unfinished"></translation>
  </message>
- <message id="orn-donations">
- <source>Donations</source>
+ <message id="orn-donation">
+ <source>Donation</source>
  <translation type="unfinished"></translation>
  </message>
  <message id="orn-cover-updates-available">
@@ -1024,7 +1024,8 @@
  <translation type="unfinished"></translation>
  </message>
  <message id="orn-app-description-full">
- <source>&lt;p&gt;A native OpenRepos.net client app for SailfishOS&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;License&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues can be reported preferably at GitHub or alternatively at OpenRepos.net (e.g., by using the buttons below).&lt;/p&gt;</source>
+ <source>&lt;p&gt;OpenRepos client application for SailfishOS&lt;br /&gt;&amp;nbsp;&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;license&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues shall be reported preferably at GitHub or alternatively at OpenRepos (use the buttons below).&lt;/p&gt;</source>
+ <extracomment>Avoid to translate the acronym FLOSS (Free, Libre, Open Source Software).</extracomment>
  <translation type="unfinished"></translation>
  </message>
  <message id="orn-show-details">

translations/harbour-storeman-de.ts

@@ -994,8 +994,8 @@
  <source>My repository</source>
  <translation>Meine Softwarequelle</translation>
  </message>
- <message id="orn-donations">
- <source>Donations</source>
+ <message id="orn-donation">
+ <source>Donation</source>
  <translation>Spenden</translation>
  </message>
  <message id="orn-cover-updates-available">
@@ -1007,8 +1007,9 @@
  <translation>Paket %0 wurde erfolgreich aktualisiert</translation>
  </message>
  <message id="orn-app-description-full">
- <source>&lt;p&gt;A native OpenRepos.net client app for SailfishOS&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;License&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues can be reported preferably at GitHub or alternatively at OpenRepos.net (e.g., by using the buttons below).&lt;/p&gt;</source>
- <translation>&lt;p&gt;Eine native OpenRepos.net-Client App für SailfishOS&lt;/p&gt;&lt;p&gt;Storeman ist Freie Software (FLOSS), die unter den Bedingungen der &lt;a href=&apos;%1&apos;&gt;MIT-Lizenz&lt;/a&gt; verbreitet wird.&lt;/p&gt;&lt;p&gt;Fehler können auf vorzugsweise auf GitHub oder alternativ auf OpenRepos.net gemeldet werden (z.B. unter Verwendung der untenstehenden Schaltflächen).&lt;/p&gt;</translation>
+ <source>&lt;p&gt;OpenRepos client application for SailfishOS&lt;br /&gt;&amp;nbsp;&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;license&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues shall be reported preferably at GitHub or alternatively at OpenRepos (use the buttons below).&lt;/p&gt;</source>
+ <extracomment>Avoid to translate the acronym FLOSS (Free, Libre, Open Source Software).</extracomment>
+ <translation>&lt;p&gt;OpenRepos-Client App für SailfishOS&lt;br /&gt;&amp;nbsp;&lt;/p&gt;&lt;p&gt;Storeman ist Freie Software (FLOSS), die unter den Bedingungen der &lt;a href=&apos;%1&apos;&gt;MIT-Lizenz&lt;/a&gt; verbreitet wird.&lt;/p&gt;&lt;p&gt;Fehler sollen vorzugsweise auf GitHub oder alternativ auf OpenRepos gemeldet werden (verwende dafür die untenstehenden Schaltflächen).&lt;/p&gt;</translation>
  </message>
  <message id="orn-show-details">
  <source>Show details</source>

translations/harbour-storeman-el.ts

@@ -1011,8 +1011,8 @@
  <source>My repository</source>
  <translation type="unfinished"></translation>
  </message>
- <message id="orn-donations">
- <source>Donations</source>
+ <message id="orn-donation">
+ <source>Donation</source>
  <translation type="unfinished"></translation>
  </message>
  <message id="orn-cover-updates-available">
@@ -1024,7 +1024,8 @@
  <translation type="unfinished"></translation>
  </message>
  <message id="orn-app-description-full">
- <source>&lt;p&gt;A native OpenRepos.net client app for SailfishOS&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;License&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues can be reported preferably at GitHub or alternatively at OpenRepos.net (e.g., by using the buttons below).&lt;/p&gt;</source>
+ <source>&lt;p&gt;OpenRepos client application for SailfishOS&lt;br /&gt;&amp;nbsp;&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;license&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues shall be reported preferably at GitHub or alternatively at OpenRepos (use the buttons below).&lt;/p&gt;</source>
+ <extracomment>Avoid to translate the acronym FLOSS (Free, Libre, Open Source Software).</extracomment>
  <translation type="unfinished"></translation>
  </message>
  <message id="orn-show-details">

translations/harbour-storeman-es.ts

@@ -994,8 +994,8 @@
  <source>My repository</source>
  <translation>Mi repositorio</translation>
  </message>
- <message id="orn-donations">
- <source>Donations</source>
+ <message id="orn-donation">
+ <source>Donation</source>
  <translation>Donar</translation>
  </message>
  <message id="orn-cover-updates-available">
@@ -1007,8 +1007,9 @@
  <translation>El paquete %0 se actualizó correctamente</translation>
  </message>
  <message id="orn-app-description-full">
- <source>&lt;p&gt;A native OpenRepos.net client app for SailfishOS&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;License&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues can be reported preferably at GitHub or alternatively at OpenRepos.net (e.g., by using the buttons below).&lt;/p&gt;</source>
- <translation>&lt;p&gt;Cliente nativo de OpenRepos.net para SailfishOS&lt;/p&gt;&lt;p&gt;Este es un programa de código abierto que se distribuye bajo los términos de la &lt;a href=&apos;%1&apos;&gt;Licencia&amp;nbsp;MIT&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Puedes informar de un problema en OpenRepos.net o en GitHub (usa los botones de abajo).&lt;/p&gt;</translation>
+ <source>&lt;p&gt;OpenRepos client application for SailfishOS&lt;br /&gt;&amp;nbsp;&lt;/p&gt;&lt;p&gt;Storeman is Free Software (FLOSS), distributed under the terms of the &lt;a href=&apos;%1&apos;&gt;MIT&amp;nbsp;license&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Issues shall be reported preferably at GitHub or alternatively at OpenRepos (use the buttons below).&lt;/p&gt;</source>
+ <extracomment>Avoid to translate the acronym FLOSS (Free, Libre, Open Source Software).</extracomment>
+ <translation>&lt;p&gt;Cliente de OpenRepos para SailfishOS&lt;br /&gt;&amp;nbsp;&lt;/p&gt;&lt;p&gt;Este es un programa de código abierto que se distribuye bajo los términos de la &lt;a href=&apos;%1&apos;&gt;licencia&amp;nbsp;MIT&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Puedes informar de un problema en GitHub o en OpenRepos (usa los botones de abajo).&lt;/p&gt;</translation>
  </message>
  <message id="orn-show-details">
  <source>Show details</source>