Updated Finnish translation and disable automatic translation loading

Reviewed by:

diff --git a/res/languages/situare_fi.ts b/res/languages/situare_fi.ts
index a1632f6..13307f8 100644 (file)
--- a/res/languages/situare_fi.ts
+++ b/res/languages/situare_fi.ts
@@ -4,17 +4,31 @@
 <context>
     <name>FriendListPanel</name>
     <message>
-        <location filename="../../src/ui/friendlistpanel.cpp" line="34"/>
+        <location filename="../../src/ui/friendlistpanel.cpp" line="44"/>
         <source>Show all</source>
-        <translation type="unfinished">Näytä kaikki</translation>
+        <translation>Näytä kaikki</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/friendlistpanel.cpp" line="108"/>
+        <source>Selected: %1</source>
+        <translation>Valittu: %1</translation>
     </message>
 </context>
 <context>
     <name>GPSPositionPrivate</name>
     <message>
         <location filename="../../src/gps/gpspositionprivate.cpp" line="56"/>
+        <location filename="../../src/gps/gpspositionprivateliblocation.cpp" line="59"/>
         <source>Unable to use GPS</source>
-        <translation type="unfinished">GPS ei käytössä</translation>
+        <translation>GPS ei käytössä</translation>
+    </message>
+</context>
+<context>
+    <name>LiblocationWrapper</name>
+    <message>
+        <location filename="../../src/gps/liblocationwrapper.cpp" line="105"/>
+        <source>Error in GPS</source>
+        <translation>GPS virhe</translation>
     </message>
 </context>
 <context>
@@ -22,7 +36,7 @@
     <message>
         <location filename="../../src/ui/logindialog.cpp" line="32"/>
         <source>Login to Situare with Facebook account</source>
-        <translation type="unfinished">Kirjaudu Situareen Facebook tunnuksilla</translation>
+        <translation>Kirjaudu Situareen Facebook tunnuksilla</translation>
     </message>
     <message>
         <source>Connect</source>
@@ -31,67 +45,66 @@
     <message>
         <location filename="../../src/ui/logindialog.cpp" line="42"/>
         <source>Login</source>
-        <translation type="unfinished">Kirjaudu</translation>
+        <translation>Kirjaudu</translation>
     </message>
     <message>
         <location filename="../../src/ui/logindialog.cpp" line="45"/>
         <source>E-mail:</source>
-        <translation type="unfinished">Sähköposti:</translation>
+        <translation>Sähköposti:</translation>
     </message>
     <message>
         <location filename="../../src/ui/logindialog.cpp" line="46"/>
         <source>Password:</source>
-        <translation type="unfinished">Salasana:</translation>
+        <translation>Salasana:</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="84"/>
-        <location filename="../../src/ui/mainwindow.cpp" line="647"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="88"/>
         <source>Situare</source>
-        <translation type="unfinished">Situare</translation>
+        <translation>Situare</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="310"/>
-        <location filename="../../src/ui/mainwindow.cpp" line="504"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="375"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="634"/>
         <source>Login</source>
-        <translation type="unfinished">Kirjaudu</translation>
+        <translation>Kirjaudu</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="315"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="380"/>
         <source>Settings</source>
-        <translation type="unfinished">Asetukset</translation>
+        <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="320"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="385"/>
         <source>GPS</source>
-        <translation type="unfinished">GPS</translation>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="327"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="392"/>
         <source>Auto centering</source>
-        <translation type="unfinished">Automaattinen keskitys</translation>
+        <translation>Automaattinen keskitys</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="333"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="398"/>
         <source>Main</source>
-        <translation type="unfinished">Päävalikko</translation>
+        <translation>Päävalikko</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="338"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="403"/>
         <source>Menu</source>
-        <translation type="unfinished">Valikko</translation>
+        <translation>Valikko</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="375"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="506"/>
         <source>GPS timeout</source>
-        <translation type="unfinished"></translation>
+        <translation>GPS pyyntö aikakatkaistiin</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="497"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="628"/>
         <source>Logout</source>
-        <translation type="unfinished">Kirjaudu ulos</translation>
+        <translation>Kirjaudu ulos</translation>
     </message>
 </context>
 <context>
@@ -133,23 +146,23 @@
     <message>
         <location filename="../../src/ui/settingsdialog.cpp" line="44"/>
         <source>Settings</source>
-        <translation type="unfinished">Asetukset</translation>
+        <translation>Asetukset</translation>
     </message>
     <message>
         <location filename="../../src/ui/settingsdialog.cpp" line="50"/>
         <source>Use automatic location update</source>
-        <translation type="unfinished">Sijainnin automaattinen päivitys</translation>
+        <translation>Sijainnin automaattinen päivitys</translation>
     </message>
     <message>
         <location filename="../../src/ui/settingsdialog.cpp" line="57"/>
         <location filename="../../src/ui/settingsdialog.cpp" line="89"/>
         <source>Update interval</source>
-        <translation type="unfinished">Päivitysväli</translation>
+        <translation>Päivitysväli</translation>
     </message>
     <message>
         <location filename="../../src/ui/settingsdialog.cpp" line="138"/>
         <source>%1 min</source>
-        <translation type="unfinished">%1 min</translation>
+        <translation>%1 min</translation>
     </message>
 </context>
 <context>
@@ -157,47 +170,58 @@
     <message>
         <location filename="../../src/engine/engine.cpp" line="136"/>
         <source>Auto centering disabled</source>
-        <translation type="unfinished">Automaattinen keskitys pois päältä</translation>
+        <translation>Automaattinen keskitys pois päältä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="219"/>
-        <location filename="../../src/engine/engine.cpp" line="226"/>
+        <location filename="../../src/engine/engine.cpp" line="220"/>
+        <location filename="../../src/engine/engine.cpp" line="228"/>
         <source>GPS enabled</source>
-        <translation type="unfinished">GPS päällä</translation>
+        <translation>GPS päällä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="220"/>
-        <location filename="../../src/engine/engine.cpp" line="229"/>
+        <location filename="../../src/engine/engine.cpp" line="221"/>
+        <location filename="../../src/engine/engine.cpp" line="231"/>
         <source>Auto centering enabled</source>
-        <translation type="unfinished">Automaattinen keskitys päällä</translation>
+        <translation>Automaattinen keskitys päällä</translation>
     </message>
 </context>
 <context>
     <name>UpdateLocationDialog</name>
     <message>
-        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="30"/>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="31"/>
         <source>Update Location</source>
-        <translation type="unfinished">Päivitä sijainti</translation>
+        <translation>Päivitä sijainti</translation>
     </message>
     <message>
-        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="39"/>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="43"/>
         <source>Publish on Facebook</source>
-        <translation type="unfinished">Julkaise Facebookissa</translation>
+        <translation>Julkaise Facebookissa</translation>
     </message>
     <message>
-        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="44"/>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="49"/>
         <source>Send</source>
-        <translation type="unfinished">Lähetä</translation>
+        <translation>Lähetä</translation>
     </message>
     <message>
-        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="47"/>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="52"/>
         <source>Location:</source>
-        <translation type="unfinished">Sijainti:</translation>
+        <translation>Sijainti:</translation>
     </message>
     <message>
-        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="48"/>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="53"/>
         <source>Message:</source>
-        <translation type="unfinished">Viesti:</translation>
+        <translation>Viesti:</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfo</name>
+    <message>
+        <location filename="../../src/ui/userinfo.cpp" line="342"/>
+        <source>Location update failed
+
+Your message is saved to textbox until sending will succeed</source>
+        <translatorcomment>Do \n&apos;s work properly?</translatorcomment>
+        <translation>Sijainnin päivitys epäonnistui\n\nVistisi on tallennettu kunnes pävitys on onnistunut</translation>
     </message>
 </context>
 </TS>

diff --git a/src/main.cpp b/src/main.cpp
index 3ec7c56..ae229df 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,12 +29,11 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 
-    QTranslator translator;
-    bool loaded = translator.load(":/res/languages/situare_" + QLocale::system().name());
-    a.installTranslator(&translator);
-
-    QString locale = QLocale::system().name();
-    qDebug() << "Localization" << locale << "loaded:" << loaded;
+//    QTranslator translator;
+//    bool loaded = translator.load(":/res/languages/situare_" + QLocale::system().name());
+//    a.installTranslator(&translator);
+//    QString locale = QLocale::system().name();
+//    qDebug() << "Localization" << locale << "loaded:" << loaded;
 
     SituareEngine engine;
     int appRet = a.exec();