Finished Finnish localization

Reviewed by: Ville Tiensuu

diff --git a/.gitignore b/.gitignore
index 8294240..5cb6130 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ doc/doxygen/*
 situare
 mainwindow_test
 qrc_images.cpp
+qrc_languages.cpp
 build-stamp
 debian/situare.substvars
 debian/files

diff --git a/languages.qrc b/languages.qrc
new file mode 100644 (file)
index 0000000..1ca9b97
--- /dev/null
+++ b/languages.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>res/languages/situare_fi.qm</file>
+    </qresource>
+</RCC>

diff --git a/res/languages/fi/README.txt b/res/languages/fi/README.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/res/languages/situare_fi.qm b/res/languages/situare_fi.qm
new file mode 100644 (file)
index 0000000..0e944cd
Binary files /dev/null and b/res/languages/situare_fi.qm differ

diff --git a/res/languages/situare_fi.ts b/res/languages/situare_fi.ts
new file mode 100644 (file)
index 0000000..a1632f6
--- /dev/null
+++ b/res/languages/situare_fi.ts
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fi_FI">
+<context>
+    <name>FriendListPanel</name>
+    <message>
+        <location filename="../../src/ui/friendlistpanel.cpp" line="34"/>
+        <source>Show all</source>
+        <translation type="unfinished">Näytä kaikki</translation>
+    </message>
+</context>
+<context>
+    <name>GPSPositionPrivate</name>
+    <message>
+        <location filename="../../src/gps/gpspositionprivate.cpp" line="56"/>
+        <source>Unable to use GPS</source>
+        <translation type="unfinished">GPS ei käytössä</translation>
+    </message>
+</context>
+<context>
+    <name>LoginDialog</name>
+    <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>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="obsolete">Yhdistä</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/logindialog.cpp" line="42"/>
+        <source>Login</source>
+        <translation type="unfinished">Kirjaudu</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/logindialog.cpp" line="45"/>
+        <source>E-mail:</source>
+        <translation type="unfinished">Sähköposti:</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/logindialog.cpp" line="46"/>
+        <source>Password:</source>
+        <translation type="unfinished">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"/>
+        <source>Situare</source>
+        <translation type="unfinished">Situare</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/mainwindow.cpp" line="310"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="504"/>
+        <source>Login</source>
+        <translation type="unfinished">Kirjaudu</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/mainwindow.cpp" line="315"/>
+        <source>Settings</source>
+        <translation type="unfinished">Asetukset</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/mainwindow.cpp" line="320"/>
+        <source>GPS</source>
+        <translation type="unfinished">GPS</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/mainwindow.cpp" line="327"/>
+        <source>Auto centering</source>
+        <translation type="unfinished">Automaattinen keskitys</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/mainwindow.cpp" line="333"/>
+        <source>Main</source>
+        <translation type="unfinished">Päävalikko</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/mainwindow.cpp" line="338"/>
+        <source>Menu</source>
+        <translation type="unfinished">Valikko</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/mainwindow.cpp" line="375"/>
+        <source>GPS timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/mainwindow.cpp" line="497"/>
+        <source>Logout</source>
+        <translation type="unfinished">Kirjaudu ulos</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../../src/common.h" line="52"/>
+        <source>Session expired. Please login again</source>
+        <translation>Istunto vanhentunut. Kirjaudu uudelleen</translation>
+    </message>
+    <message>
+        <location filename="../../src/common.h" line="53"/>
+        <source>Invalid E-mail address or password</source>
+        <translation>Virheellinen sähköpostiosoite tai salasana</translation>
+    </message>
+    <message>
+        <location filename="../../src/common.h" line="54"/>
+        <source>Update failed, please try again</source>
+        <translation>Päivitys epäonnistui. Yritä uudelleen</translation>
+    </message>
+    <message>
+        <location filename="../../src/common.h" line="55"/>
+        <source>Data retrieval failed, please try again</source>
+        <oldsource>Data retrieval failed, plaease try again</oldsource>
+        <translation>Tiedon haku epäonnistui. Yritä uudelleen</translation>
+    </message>
+    <message>
+        <location filename="../../src/common.h" line="56"/>
+        <source>Address retrieval failed, please try again</source>
+        <translation>Osoitteen haku epäonnistui. Yritä uudelleen</translation>
+    </message>
+    <message>
+        <location filename="../../src/common.h" line="57"/>
+        <source>Image download failed</source>
+        <translation>Kuvan haku epäonnistui</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../../src/ui/settingsdialog.cpp" line="44"/>
+        <source>Settings</source>
+        <translation type="unfinished">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>
+    </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>
+    </message>
+    <message>
+        <location filename="../../src/ui/settingsdialog.cpp" line="138"/>
+        <source>%1 min</source>
+        <translation type="unfinished">%1 min</translation>
+    </message>
+</context>
+<context>
+    <name>SituareEngine</name>
+    <message>
+        <location filename="../../src/engine/engine.cpp" line="136"/>
+        <source>Auto centering disabled</source>
+        <translation type="unfinished">Automaattinen keskitys pois päältä</translation>
+    </message>
+    <message>
+        <location filename="../../src/engine/engine.cpp" line="219"/>
+        <location filename="../../src/engine/engine.cpp" line="226"/>
+        <source>GPS enabled</source>
+        <translation type="unfinished">GPS päällä</translation>
+    </message>
+    <message>
+        <location filename="../../src/engine/engine.cpp" line="220"/>
+        <location filename="../../src/engine/engine.cpp" line="229"/>
+        <source>Auto centering enabled</source>
+        <translation type="unfinished">Automaattinen keskitys päällä</translation>
+    </message>
+</context>
+<context>
+    <name>UpdateLocationDialog</name>
+    <message>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="30"/>
+        <source>Update Location</source>
+        <translation type="unfinished">Päivitä sijainti</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="39"/>
+        <source>Publish on Facebook</source>
+        <translation type="unfinished">Julkaise Facebookissa</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="44"/>
+        <source>Send</source>
+        <translation type="unfinished">Lähetä</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="47"/>
+        <source>Location:</source>
+        <translation type="unfinished">Sijainti:</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/updatelocation/updatelocationdialog.cpp" line="48"/>
+        <source>Message:</source>
+        <translation type="unfinished">Viesti:</translation>
+    </message>
+</context>
+</TS>

diff --git a/src/main.cpp b/src/main.cpp
index 50e4337..3ec7c56 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,11 +28,14 @@
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-    QString locale = QLocale::system().name();
-    qWarning() << "LOCALE:" << locale;
+
     QTranslator translator;
-    translator.load("situare_" + QLocale::system().name());
+    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();
     return appRet;

diff --git a/src/src.pro b/src/src.pro
index 534cc88..06948b9 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,7 +5,9 @@ TARGET = ../situare
 TEMPLATE = app
 INCLUDEPATH += /usr/include/qjson
 LIBS += -lqjson
-RESOURCES += ../images.qrc
+RESOURCES += ../images.qrc \
+    ../languages.qrc
+TRANSLATIONS += ../res/languages/situare_fi.ts
 SOURCES += main.cpp \
     ui/mainwindow.cpp \
     situareservice/situareservice.cpp \
@@ -97,7 +99,6 @@ QT += network \
     webkit
 DEFINES += QT_NO_DEBUG_OUTPUT
 
-TRANSLATIONS = tr_fi.ts
 
 maemo5 | simulator {
     armel {