Translations: Use the standard way

CarBudget.cpp

@@ -53,10 +53,11 @@ int main(int argc, char *argv[])
     QQuickView *view = SailfishApp::createView();
 
     QTranslator translator;
-    if(translator.load((QLocale::system().name() != "C")?(QLocale::system().name()):("en_GB"), ":/i18n"))
+    if(translator.load((QLocale::system().name() != "C")?(QLocale::system().name()):("en_GB"), "/usr/share/harbour-carbudget/translations/"))
     {
         QGuiApplication::installTranslator(&translator);
     }
+
     app->setApplicationVersion(QString(APP_VERSION));
 
     qmlRegisterType<Tank>(      "harbour.carbudget",1,0,"Tank");

Ressources.qrc

@@ -5,10 +5,4 @@
         <file alias="Wrench.png">picture/Wrench.png</file>
         <file alias="Dollar.png">picture/Dollar.png</file>
     </qresource>
-    <qresource prefix="/i18n">
-        <file alias="fr_FR.qm">i18n/fr_FR.qm</file>
-        <file alias="it_IT.qm">i18n/it_IT.qm</file>
-        <file alias="de_DE.qm">i18n/de_DE.qm</file>
-        <file alias="ru_RU.qm">i18n/ru_RU.qm</file>
-    </qresource>
 </RCC>

harbour-carbudget.pro

@@ -32,6 +32,15 @@ lupdate_only{
 }
 
 
+CONFIG += sailfishapp_i18n
+
+TRANSLATIONS = translations/de_DE.ts \
+               translations/fr_FR.ts \
+               translations/it_IT.ts \
+               translations/ru_RU.ts \
+               translations/sv_SE.ts
+
+
 DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
 
 OTHER_FILES += qml/cover/CoverPage.qml \
@@ -53,13 +62,10 @@ OTHER_FILES += qml/cover/CoverPage.qml \
     qml/pages/TireMount.qml \
     qml/pages/About.qml \
     qml/pages/CarCreate.qml \
-    i18n/FR_fr.ts \
-    i18n/RU_ru.ts \
     qml/pages/BudgetView.qml \
     qml/pages/Settings.qml \
     qml/pages/CosttypeEntry.qml \
     qml/pages/CosttypeView.qml \
-    i18n/de_DE.ts \
     qml/pages/SelectImportFile.qml \
     qml/pages/MycarImport.qml \
     qml/pages/FuelpadImport.qml \
@@ -84,10 +90,6 @@ HEADERS += \
     statfileinfo.h \
     globals.h
 
-TRANSLATIONS = i18n/de_DE.ts \
-               i18n/fr_FR.ts \
-               i18n/it_IT.ts \
-               i18n/ru_RU.ts
 
 RESOURCES += \
     Ressources.qrc

rpm/CarBudget.yaml

@@ -1,6 +1,6 @@
 Name: harbour-carbudget
 Summary: Car expenses calculation
-Version: 0.12
+Version: 0.13
 Release: 0
 Group: Qt/Qt
 License: GPL
@@ -22,6 +22,7 @@ Requires:
 Files:
 - '%{_bindir}'
 - '%{_datadir}/%{name}/qml'
+- '%{_datadir}/%{name}/translations'
 - '%{_datadir}/applications/%{name}.desktop'
 - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
 - '%{_datadir}/applications'

i18n/de_DE.ts → translations/de_DE.ts

@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>About</name>
     <message>
-        <location filename="../qml/pages/About.qml" line="61"/>
+        <location filename="../qml/pages/About.qml" line="39"/>
+        <source>Simulation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="63"/>
         <source>License: GPLv3</source>
         <translation>Lizenz: GPLv3</translation>
     </message>
     <message>
-        <location filename="../qml/pages/About.qml" line="66"/>
+        <location filename="../qml/pages/About.qml" line="68"/>
         <source>Created by condo4 (Fabien Proriol)</source>
         <translation>Erstellt von condo4 (Fabien Proriol) </translation>
     </message>
     <message>
-        <location filename="../qml/pages/About.qml" line="72"/>
+        <location filename="../qml/pages/About.qml" line="74"/>
         <source>Credits to:&lt;br&gt;- Lorenzo Facca (Italian translation)&lt;br&gt;- Alois Spitzbart (German translation)&lt;br&gt;- Michal Hrusecky (Many improvments)&lt;br&gt;- Denis Fedoseev (Russion translation)&lt;br &gt;- Thomas Michel (Many improvments)</source>
         <translation>Dank an:&lt;br&gt;- Lorenzo Facca (Italienisch Übersetzung)&lt;br&gt;- Alois Spitzbart (Deutsche Übersetzung)&lt;br&gt;- Michal Hrusecky (Viele Verbesserungen)&lt;br&gt;- Denis Fedoseev (Russische Übersetzung)&lt;br &gt;- Thomas Michel (Viele Verbesserungen)</translation>
     </message>

i18n/fr_FR.ts → translations/fr_FR.ts

@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>About</name>
     <message>
+        <location filename="../qml/pages/About.qml" line="39"/>
         <source>Simulation</source>
-        <translation type="obsolete">Simulation</translation>
+        <translation type="unfinished">Simulation</translation>
     </message>
     <message>
         <source>Distance: %L1 km</source>
         <translation type="obsolete">Distance: %L1 km</translation>
     </message>
     <message>
-        <location filename="../qml/pages/About.qml" line="61"/>
+        <location filename="../qml/pages/About.qml" line="63"/>
         <source>License: GPLv3</source>
         <translation>Licence : GPLv3</translation>
     </message>
     <message>
-        <location filename="../qml/pages/About.qml" line="66"/>
+        <location filename="../qml/pages/About.qml" line="68"/>
         <source>Created by condo4 (Fabien Proriol)</source>
         <translation>Créé par condo4 (Fabien Proriol)</translation>
     </message>
     <message>
-        <location filename="../qml/pages/About.qml" line="72"/>
+        <location filename="../qml/pages/About.qml" line="74"/>
         <source>Credits to:&lt;br&gt;- Lorenzo Facca (Italian translation)&lt;br&gt;- Alois Spitzbart (German translation)&lt;br&gt;- Michal Hrusecky (Many improvments)&lt;br&gt;- Denis Fedoseev (Russion translation)&lt;br &gt;- Thomas Michel (Many improvments)</source>
         <translation>Remerciments :&lt;br&gt;- Lorenzo Facca (Italien)&lt;br&gt;- Alois Spitzbart (Allemand)&lt;br&gt;- Denis Fedoseev (Russe)&lt;br&gt;- Michal Hrusecky (divers améliorations)&lt;br &gt;- Thomas Michel (divers améliorations)</translation>
     </message>