Commits for v0.4.3 (#51)

* [build-on-tags.yml] Adapt job name to commit b69fad8 * Update README.md with License link * Use current user's homedir as `Phone memory` path (#46) This should return the current user's home directory instead using a hard-coded default from the config file. Drawback: The `PhoneMemory` path is now fixed to the homedir. (not actually tested) * Updates for file translations/filecase.ts in sv (#47) * Translate translations/filecase.ts in sv 100% translated source file: 'translations/filecase.ts' on 'sv'. Co-authored-by: @eson57 via transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> * [config.cpp] Document last change and put original line in comment * [filecase.qml] Add documenting comment * [filecase.qml] Fix typo in comment * Towards v0.4.3 (#50) * [ilecase.changes] Add entries for v0.4.2 * [filecase.spec] Pre-release version increase * [filecase.changes] Fix typo * [filecase.spec] Fix typo in comment --------- Co-authored-by: Simon Schmeisser <s.schmeisser@gmx.net> Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
sailfishos-applications · Nov 17, 2023 · 15ccfd9 · 15ccfd9
2 parents d47f244 + 00b6c4b
commit 15ccfd9
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 43 deletions.
diff --git a/.github/workflows/build-on-tags.yml b/.github/workflows/build-on-tags.yml
@@ -158,7 +158,7 @@ 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

diff --git a/README.md b/README.md
@@ -52,4 +52,7 @@ In 2022 and 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure
 #### Contributors
 - [David Llewellyn-Jones (flypig)](https://github.com/llewelld)
 - [olf (Olf0)](https://github.com/Olf0)
+<br />
+
+### License: [MPL 2.0](https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html)
 
diff --git a/qml/filecase.qml b/qml/filecase.qml
@@ -28,6 +28,7 @@ ApplicationWindow
 
 
     CoverPage { id: coverPage }
+    // Why was the following line commented out when adapted in commit 7369833 of PR #1 ?
     //MainPage { id: mainPage; startFolder: "/"; nextFolder: config.readConfig("StartupFolder", config.getHome()) }
     Config { id: config }
     //Browser { id: browser }

diff --git a/rpm/filecase.changes b/rpm/filecase.changes
@@ -1,5 +1,7 @@
-* Mon Sep 18 2023 olf <Olf0@users.noreply.github.com> - 0.4.2
-- 
+* Thu Nov 16 2023 olf <Olf0@users.noreply.github.com> - 0.4.2
+- Update Swedish translation (PR #47) by @eson57
+- Introduce a quick & dirty workaround for issue #11 (PR #46) by @simonschmeisser
+- Minor documentation improvements by @Olf0
 
 * Sun Mar 06 2022 olf <Olf0@users.noreply.github.com> - 0.4.1
 - Add checks for recent SD card paths: `/run/media/nemo` and `/run/media/defaultuser`

diff --git a/rpm/filecase.spec b/rpm/filecase.spec
@@ -10,8 +10,8 @@ Name:       filecase
 Summary:    An advanced file-manager for SailfishOS
 # The <version> tag must adhere to semantic versioning: Among multiple other
 # reasons due to its use for `qmake5` in line 107.  See https://semver.org/
-Version:    0.4.2
-# The <release> tag comprisees one of {alpha,beta,rc,release} postfixed with a
+Version:    0.4.3
+# The <release> 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}`
@@ -21,7 +21,7 @@ Version:    0.4.2
 # build at GitHub and OBS, when configured accordingly; mind the sorting
 # (`adud` < `alpha`).  For details and reasons, see
 # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format
-Release:    rc1
+Release:    rc2
 # The Group tag should comprise one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group:      Applications/File

diff --git a/src/config.cpp b/src/config.cpp
@@ -1,6 +1,7 @@
 #include "config.h"
 
 #include <QSettings>
+#include <QStandardPaths>
 
 QSettings sets("cepiperez", "fileboxplus");
 
@@ -29,5 +30,7 @@ void Config::removeConfig(QString data1)
 
 QString Config::getHome()
 {
-    return readConfig("PhoneMemoryFolder", "/home/defaultuser");
+    //return readConfig("PhoneMemoryFolder", "/home/defaultuser");
+    // Quick & dirty workaround, see issue #15 and PR #46:
+    return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first();
 }
diff --git a/translations/sv.ts b/translations/sv.ts
@@ -1,42 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="sv">
+<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="sv">
 <context>
     <name>AboutPage</name>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="27"/>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>Om</translation>
     </message>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="60"/>
-        <source>Main Developer:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/AboutPage.qml" line="66"/>
-        <source>(C) 2015 Matias Perez (CepiPerez).</source>
-        <translation type="unfinished"></translation>
+        <source>Original author:</source>
+        <translation>Ursprunglig utvecklare:</translation>
     </message>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="77"/>
-        <source>Contributeurs:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/AboutPage.qml" line="83"/>
-        <source>David Llewellyn-Jones (llewelld), </source>
-        <translation type="unfinished"></translation>
+        <source>Contributors:</source>
+        <translation>Bidragsgivare:</translation>
     </message>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="94"/>
-        <source>If your language is not available you can contribute here:</source>
-        <translation type="unfinished"></translation>
+        <source>If you want to create a new translation or improve an extant one:</source>
+        <translation>Om du vill skapa en ny översättning eller förbättra en befintlig:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="110"/>
-        <source>You can contribute to keep this project alive making a small donation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qml/pages/AboutPage.qml" line="109"/>
+        <source>You can support the original author of FileCase by donating:</source>
+        <translation>Du kan stödja den ursprungliga utvecklaren av FileCase genom att donera:</translation>
     </message>
 </context>
 <context>
@@ -254,7 +242,7 @@
     <message>
         <location filename="../qml/pages/Compressed.qml" line="99"/>
         <source>You need to install unrar to use this function</source>
-        <translation>Du måste installera &apos;unrar&apos; för att använda den här funktionen</translation>
+        <translation>Du måste installera &quot;unrar&quot; för att använda den här funktionen</translation>
     </message>
 </context>
 <context>
@@ -455,7 +443,7 @@
     <message>
         <location filename="../qml/pages/FileInfo.qml" line="65"/>
         <source>Error getting info. Try again later</source>
-        <translation type="unfinished"></translation>
+        <translation>Fel vid inhämtning av info. Försök igen, senare.</translation>
     </message>
     <message>
         <location filename="../qml/pages/FileInfo.qml" line="79"/>
@@ -470,7 +458,7 @@
     <message>
         <location filename="../qml/pages/FileInfo.qml" line="99"/>
         <source>View package files</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa paketfiler</translation>
     </message>
     <message>
         <location filename="../qml/pages/FileInfo.qml" line="109"/>
@@ -480,7 +468,7 @@
     <message>
         <location filename="../qml/pages/FileInfo.qml" line="109"/>
         <source>Install</source>
-        <translation type="unfinished"></translation>
+        <translation>Installera</translation>
     </message>
     <message>
         <location filename="../qml/pages/FileInfo.qml" line="115"/>
@@ -764,7 +752,7 @@
     <message>
         <location filename="../src/search.cpp" line="293"/>
         <source>You can&apos;t share files outside home folder</source>
-        <translation>Du kan inte dela filer utanför nemo-mappen</translation>
+        <translation>Du kan inte dela filer utanför hemkatalogen</translation>
     </message>
     <message>
         <location filename="../src/search.cpp" line="413"/>
@@ -792,7 +780,7 @@
     <message>
         <location filename="../qml/pages/SearchPage.qml" line="105"/>
         <source>No files found</source>
-        <translation>Inga filer hittade</translation>
+        <translation>Inga filer hittades</translation>
     </message>
     <message>
         <location filename="../qml/pages/SearchPage.qml" line="105"/>
@@ -851,7 +839,7 @@
     <message>
         <location filename="../qml/pages/Settings.qml" line="47"/>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>Om</translation>
     </message>
     <message>
         <location filename="../qml/pages/Settings.qml" line="61"/>
@@ -901,7 +889,7 @@
     <message>
         <location filename="../qml/pages/Settings.qml" line="141"/>
         <source>Startup folder</source>
-        <translation>Startmapp</translation>
+        <translation>Startkatalog</translation>
     </message>
     <message>
         <location filename="../qml/pages/Settings.qml" line="149"/>
@@ -1107,7 +1095,7 @@
     <message>
         <location filename="../qml/pages/TransfersPage.qml" line="20"/>
         <source>Clean completed transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta bort slutförda överföringar</translation>
     </message>
     <message>
         <location filename="../qml/pages/TransfersPage.qml" line="29"/>
@@ -1170,7 +1158,7 @@
     <message>
         <location filename="../qml/pages/UploadFiles.qml" line="183"/>
         <source>Last modified</source>
-        <translation>Senast ändrad</translation>
+        <translation>Ändrad</translation>
     </message>
 </context>
 <context>
@@ -1333,13 +1321,13 @@
         <location filename="../qml/filecase.qml" line="140"/>
         <location filename="../qml/filecase.qml" line="149"/>
         <source>Queued</source>
-        <translation type="unfinished"></translation>
+        <translation>Köad</translation>
     </message>
     <message>
         <location filename="../qml/filecase.qml" line="140"/>
         <location filename="../qml/filecase.qml" line="149"/>
         <source>Completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Slutförd</translation>
     </message>
 </context>
-</TS>
+</TS>