Updated translations and sailfish icon

diff --git a/application/application.pro b/application/application.pro
index b417b10..12e9d70 100755 (executable)
--- a/application/application.pro
+++ b/application/application.pro
@@ -146,7 +146,8 @@ OTHER_FILES += \
     icons/64x64/quandoparte.png \
     icons/80x80/quandoparte.png \
     icons/scalable/quandoparte.svg \
-    icons/sailfish/90x90/quandoparte.svg \
+    icons/sailfish/86x86/quandoparte.png \
+    icons/sailfish/90x90/quandoparte.png \
     icons/sailfish/scalable/quandoparte.svg \
     icons/quandoparte.png \
     resources/quandoparte.css \
@@ -215,6 +216,11 @@ unix:sailfish {
     i18n.path = $$DATADIR/i18n
     stations.path = $$DATADIR/stations
 
+    INSTALLS += i18n
+    INSTALLS += stations
+}
+
+desktop {
     icon48.files = icons/48x48/$${TARGET}.png
     icon64.files = icons/64x64/$${TARGET}.png
     iconscalable.files = icons/scalable/$${TARGET}.svg
@@ -225,8 +231,6 @@ unix:sailfish {
 
     INSTALLS += icon48
     INSTALLS += iconscalable
-    INSTALLS += i18n
-    INSTALLS += stations
 }
 
 maemo5 {
@@ -238,10 +242,11 @@ maemo5 {
 }
 
 sailfish {
-    icon90.files = icons/sailfish/90x90/$${TARGET}.png
-    icon90.path = /usr/share/icons/hicolor/meegotouch/apps
-    INSTALLS += icon90
+    icon86.files = icons/sailfish/86x86/$${TARGET}.png
+    icon86.path = /usr/share/icons/hicolor/meegotouch/apps
+    INSTALLS += icon86
 }
+
 harmattan {
     desktopfile.files = resources/$$PLATFORM/applications/$${TARGET}.desktop
     desktopfile.path = $$DESKTOPDIR

diff --git a/application/icons/sailfish/86x86/quandoparte.png b/application/icons/sailfish/86x86/quandoparte.png
new file mode 100644 (file)
index 0000000..f97601a
Binary files /dev/null and b/application/icons/sailfish/86x86/quandoparte.png differ

diff --git a/application/icons/sailfish/90x90/quandoparte.png b/application/icons/sailfish/90x90/quandoparte.png
deleted file mode 100644 (file)
index 8665d94..0000000
Binary files a/application/icons/sailfish/90x90/quandoparte.png and /dev/null differ

diff --git a/application/resources/i18n/quandoparte_it.qm b/application/resources/i18n/quandoparte_it.qm
index cb68d3a..bcd314f 100644 (file)
Binary files a/application/resources/i18n/quandoparte_it.qm and b/application/resources/i18n/quandoparte_it.qm differ

diff --git a/application/resources/i18n/quandoparte_it.ts b/application/resources/i18n/quandoparte_it.ts
index 201065f..5041e28 100644 (file)
--- a/application/resources/i18n/quandoparte_it.ts
+++ b/application/resources/i18n/quandoparte_it.ts
@@ -5,16 +5,19 @@
     <name>AboutPage</name>
     <message>
         <location filename="../harmattan/qml/AboutPage.qml" line="20"/>
+        <location filename="../sailfish/qml/pages/AboutPage.qml" line="10"/>
         <source>About Quando Parte</source>
         <translation>Informazioni su Quando Parte</translation>
     </message>
     <message>
-        <location filename="../harmattan/qml/AboutPage.qml" line="30"/>
+        <location filename="../harmattan/qml/AboutPage.qml" line="39"/>
+        <location filename="../sailfish/qml/pages/AboutPage.qml" line="23"/>
         <source>&lt;h2&gt;&lt;a href=&apos;http://quandoparte.garage.maemo.org&apos;&gt;Quando Parte&lt;/a&gt;&lt;/h2&gt;&lt;p style=&apos;font-size:small;&apos;&gt;version </source>
         <translation>&lt;h2&gt;&lt;a href=&apos;http://quandoparte.garage.maemo.org&apos;&gt;Quando Parte&lt;/a&gt;&lt;/h2&gt;&lt;p style=&apos;font-size:small;&apos;&gt;versione </translation>
     </message>
     <message>
-        <location filename="../harmattan/qml/AboutPage.qml" line="33"/>
+        <location filename="../harmattan/qml/AboutPage.qml" line="42"/>
+        <location filename="../sailfish/qml/pages/AboutPage.qml" line="27"/>
         <source>&lt;/p&gt;&lt;p&gt;Copyright (c) 2010, 2011, 2012, 2013&lt;/p&gt;&lt;p&gt;Luciano Montanaro (&lt;a href=&apos;mailto:mikelima@cirulla.net&apos;&gt;mikelima@cirulla.net&lt;/a&gt;)&lt;/p&gt;&lt;p&gt;Licensed under the GNU Public License v2 or above&lt;/p&gt;&lt;p/&gt;&lt;p&gt;Station geolocation data from &lt;a href=&apos;http://www.openstreetmap.org&apos;&gt;OpenStreetMap&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Realtime train data from &lt;a href=&apos;http://mobile.viaggiatreno.it&apos;&gt;Viaggiatreno&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;/p&gt;&lt;p&gt;Copyright © 2010, 2011, 2012, 2013&lt;/p&gt;&lt;p&gt;Luciano Montanaro (&lt;a href=&apos;mailto:mikelima@cirulla.net&apos;&gt;mikelima@cirulla.net&lt;/a&gt;)&lt;/p&gt;&lt;p&gt;Utilizzabile secondo la licenza GNU Public License v2 o superiore&lt;/p&gt;&lt;p/&gt;&lt;p&gt;Dati di geolocalizzazione delle stazioni ottenuti da &lt;a href=&apos;http://www.openstreetmap.org&apos;&gt;OpenStreetMap&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Dati in tempo reale sui treni da &lt;a href=&apos;http://mobile.viaggiatreno.it&apos;&gt;Viaggiatreno&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
@@ -107,21 +110,25 @@
     </message>
     <message>
         <location filename="../harmattan/qml/StationListPage.qml" line="55"/>
+        <location filename="../sailfish/qml/pages/StationListPage.qml" line="25"/>
         <source>About Quando Parte</source>
         <translation>Informazioni su Quando Parte</translation>
     </message>
     <message>
         <location filename="../harmattan/qml/StationListPage.qml" line="66"/>
+        <location filename="../sailfish/qml/pages/StationListPage.qml" line="29"/>
         <source>Stations by Name</source>
         <translation>Stazioni per nome</translation>
     </message>
     <message>
         <location filename="../harmattan/qml/StationListPage.qml" line="67"/>
+        <location filename="../sailfish/qml/pages/StationListPage.qml" line="33"/>
         <source>Stations by Distance</source>
         <translation>Stazioni per distanza</translation>
     </message>
     <message>
         <location filename="../harmattan/qml/StationListPage.qml" line="68"/>
+        <location filename="../sailfish/qml/pages/StationListPage.qml" line="37"/>
         <source>Stations Recently Seen</source>
         <translation>Stazioni viste di recente</translation>
     </message>
@@ -137,6 +144,11 @@
         <source>Show Last Station on Startup</source>
         <translation type="obsolete">Mostra l&apos;ultima stazione all&apos;avvio</translation>
     </message>
+    <message>
+        <location filename="../sailfish/qml/pages/StationListPage.qml" line="43"/>
+        <source>Search station...</source>
+        <translation>Cerca stazione...</translation>
+    </message>
 </context>
 <context>
     <name>StationListView</name>
@@ -195,16 +207,19 @@
     <name>StationPage</name>
     <message>
         <location filename="../harmattan/qml/StationPage.qml" line="29"/>
+        <location filename="../sailfish/qml/pages/StationPage.qml" line="19"/>
         <source>Departures</source>
         <translation>Partenze</translation>
     </message>
     <message>
         <location filename="../harmattan/qml/StationPage.qml" line="30"/>
+        <location filename="../sailfish/qml/pages/StationPage.qml" line="23"/>
         <source>Arrivals</source>
         <translation>Arrivi</translation>
     </message>
     <message>
-        <location filename="../harmattan/qml/StationPage.qml" line="101"/>
+        <location filename="../harmattan/qml/StationPage.qml" line="106"/>
+        <location filename="../sailfish/qml/pages/StationPage.qml" line="67"/>
         <source>Error!</source>
         <translation>Errore!</translation>
     </message>
@@ -220,31 +235,51 @@
         <source>Platform </source>
         <translation type="obsolete">Binario</translation>
     </message>
+    <message>
+        <location filename="../sailfish/qml/pages/StationPage.qml" line="15"/>
+        <source>Update Schedule</source>
+        <translation>Aggiorna orario</translation>
+    </message>
+    <message>
+        <location filename="../sailfish/qml/pages/StationPage.qml" line="36"/>
+        <source>Departures from </source>
+        <translation>Partenze da </translation>
+    </message>
+    <message>
+        <location filename="../sailfish/qml/pages/StationPage.qml" line="36"/>
+        <source>Arrivals to </source>
+        <translation>Arrivi a </translation>
+    </message>
 </context>
 <context>
     <name>StationScheduleDelegate</name>
     <message>
         <location filename="../harmattan/qml/StationScheduleDelegate.qml" line="77"/>
+        <location filename="../sailfish/qml/pages/components/StationScheduleDelegate.qml" line="61"/>
         <source>from %1</source>
         <translation>da %1</translation>
     </message>
     <message>
         <location filename="../harmattan/qml/StationScheduleDelegate.qml" line="83"/>
+        <location filename="../sailfish/qml/pages/components/StationScheduleDelegate.qml" line="66"/>
         <source>to %1</source>
         <translation>per %1</translation>
     </message>
     <message>
         <location filename="../harmattan/qml/StationScheduleDelegate.qml" line="136"/>
+        <location filename="../sailfish/qml/pages/components/StationScheduleDelegate.qml" line="110"/>
         <source>Platform %1</source>
         <translation>Binario %1</translation>
     </message>
     <message>
         <location filename="../harmattan/qml/StationScheduleDelegate.qml" line="138"/>
+        <location filename="../sailfish/qml/pages/components/StationScheduleDelegate.qml" line="112"/>
         <source>Platform &lt;span style=&apos;font-weight:bold;color:%2&apos;&gt;%1&lt;/span&gt;</source>
         <translation>Binario &lt;span style=&apos;font-weight:bold;color:%2&apos;&gt;%1&lt;/span&gt;</translation>
     </message>
     <message>
         <location filename="../harmattan/qml/StationScheduleDelegate.qml" line="140"/>
+        <location filename="../sailfish/qml/pages/components/StationScheduleDelegate.qml" line="114"/>
         <source>Platform &lt;span style=&apos;text-decoration:line-through&apos;&gt;%1&lt;/span&gt; &lt;span style=&apos;font-weight:bold;color:%3&apos;&gt;%2&lt;/span&gt;</source>
         <translation>Binario &lt;span style=&apos;text-decoration:line-through&apos;&gt;%1&lt;/span&gt; &lt;span style=&apos;font-weight:bold;color:%3&apos;&gt;%2&lt;/span&gt;</translation>
     </message>
@@ -260,17 +295,17 @@
 <context>
     <name>StationScheduleModel</name>
     <message>
-        <location filename="../../stationschedulemodel.cpp" line="222"/>
+        <location filename="../../stationschedulemodel.cpp" line="234"/>
         <source>Unknown station</source>
         <translation>Stazione sconosciuta</translation>
     </message>
     <message>
-        <location filename="../../stationschedulemodel.cpp" line="224"/>
+        <location filename="../../stationschedulemodel.cpp" line="236"/>
         <source>Unknown error</source>
         <translation>Reeore sconosciuto</translation>
     </message>
     <message>
-        <location filename="../../stationschedulemodel.cpp" line="277"/>
+        <location filename="../../stationschedulemodel.cpp" line="289"/>
         <source>Network error</source>
         <translation>Errore di rete</translation>
     </message>

diff --git a/rpm/quandoparte.yaml b/rpm/quandoparte.yaml
index 1946842..23fcd86 100755 (executable)
--- a/rpm/quandoparte.yaml
+++ b/rpm/quandoparte.yaml
@@ -27,12 +27,17 @@ Requires:
 - sailfishsilica-qt5
 - mapplauncherd-booster-silica-qt5
 Files:
-- '%{_datadir}/icons/hicolor/scalable/apps'
-- '%{_datadir}/icons/hicolor/48x48/apps'
 - '%{_datadir}/icons/hicolor/meegotouch/apps'
 - '%{_datadir}/applications'
 - '%{_datadir}/apps/quandoparte/i18n'
 - '%{_datadir}/apps/quandoparte/stations'
 - '%{_datadir}/apps/quandoparte/qml'
 - '%{_bindir}'
+- 
+- /usr/bin
+- /usr/share/applications
+- /usr/share/apps/quandoparte/i18n
+- /usr/share/apps/quandoparte/stations
+- /usr/share/icons/hicolor/meegotouch/apps
+- /usr/share/apps/quandoparte/qml
 PkgBR: []