Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
	res/languages/situare_fi.qm
	res/languages/situare_fi.ts

diff --cc res/languages/situare_fi.qm
index e6155f1,410ef3b..e127476
Binary files differ

diff --cc res/languages/situare_fi.ts
index c838fed,487c306..8f355b7
--- 1/res/languages/situare_fi.ts
--- 2/res/languages/situare_fi.ts
+++ b/res/languages/situare_fi.ts
@@@ -69,43 -69,43 +69,43 @@@
          <translation>Situare</translation>
      </message>
      <message>
-         <location filename="../../src/ui/mainwindow.cpp" line="402"/>
-         <location filename="../../src/ui/mainwindow.cpp" line="666"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="399"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="663"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="400"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="664"/>
          <source>Login</source>
          <translation>Kirjaudu</translation>
      </message>
      <message>
-         <location filename="../../src/ui/mainwindow.cpp" line="407"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="404"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="405"/>
          <source>Settings</source>
          <translation>Asetukset</translation>
      </message>
      <message>
-         <location filename="../../src/ui/mainwindow.cpp" line="412"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="409"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="410"/>
          <source>GPS</source>
          <translation>GPS</translation>
      </message>
      <message>
-         <location filename="../../src/ui/mainwindow.cpp" line="419"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="416"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="417"/>
          <source>Auto centering</source>
          <translation>Automaattinen keskitys</translation>
      </message>
      <message>
-         <location filename="../../src/ui/mainwindow.cpp" line="425"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="422"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="423"/>
          <source>Main</source>
          <translation>Päävalikko</translation>
      </message>
      <message>
-         <location filename="../../src/ui/mainwindow.cpp" line="430"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="427"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="428"/>
          <source>Menu</source>
          <translation>Valikko</translation>
      </message>
      <message>
-         <location filename="../../src/ui/mainwindow.cpp" line="538"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="535"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="536"/>
          <source>GPS timeout</source>
          <translation>GPS pyyntö aikakatkaistiin</translation>
      </message>
      <message>
-         <location filename="../../src/ui/mainwindow.cpp" line="660"/>
 -        <location filename="../../src/ui/mainwindow.cpp" line="657"/>
++        <location filename="../../src/ui/mainwindow.cpp" line="658"/>
          <source>Logout</source>
          <translation>Kirjaudu ulos</translation>
      </message>
@@@ -165,126 -165,131 +165,136 @@@
  <context>
      <name>SituareEngine</name>
      <message>
--        <location filename="../../src/engine/engine.cpp" line="133"/>
++        <location filename="../../src/engine/engine.cpp" line="136"/>
          <source>Auto centering disabled</source>
          <translation>Automaattinen keskitys pois päältä</translation>
      </message>
      <message>
--        <location filename="../../src/engine/engine.cpp" line="183"/>
++        <location filename="../../src/engine/engine.cpp" line="186"/>
          <source>Unable to start GPS</source>
          <translation>GPS käynnistys epäonnistui</translation>
      </message>
      <message>
--        <location filename="../../src/engine/engine.cpp" line="196"/>
++        <location filename="../../src/engine/engine.cpp" line="199"/>
          <source>Do you want to enable automatic location update with %1 min update interval?</source>
          <translation>Asetetaanko automaattinen paikan päivitys %1 minuutin välein päälle?</translation>
      </message>
      <message>
--        <location filename="../../src/engine/engine.cpp" line="201"/>
++        <location filename="../../src/engine/engine.cpp" line="204"/>
          <source>Automatic location update enabled</source>
          <translation>Automaattinen paikan päivitys päällä</translation>
      </message>
      <message>
--        <location filename="../../src/engine/engine.cpp" line="230"/>
++        <location filename="../../src/engine/engine.cpp" line="233"/>
          <source>Unknown server error</source>
-         <translation type="unfinished"></translation>
+         <translation>Tuntematon palvelinvirhe</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="236"/>
          <source>Missing argument from request</source>
-         <translation type="unfinished"></translation>
+         <translation type="obsolete">Pyynnöstä puuttuu parametri</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="238"/>
 -        <location filename="../../src/engine/engine.cpp" line="236"/>
++        <location filename="../../src/engine/engine.cpp" line="239"/>
+         <source>Missing parameter from request</source>
+         <translation>Pyynnöstä puuttuu parametri</translation>
+     </message>
+     <message>
 -        <location filename="../../src/engine/engine.cpp" line="238"/>
++        <location filename="../../src/engine/engine.cpp" line="241"/>
          <source>Connection refused by the server</source>
          <translation>Palvelin ei vastaa pyyntöihin</translation>
      </message>
      <message>
--        <location filename="../../src/engine/engine.cpp" line="244"/>
++        <location filename="../../src/engine/engine.cpp" line="247"/>
          <source>Connection closed by the server</source>
          <translation>Palvelin sulki yhteyden</translation>
      </message>
      <message>
--        <location filename="../../src/engine/engine.cpp" line="250"/>
++        <location filename="../../src/engine/engine.cpp" line="253"/>
          <source>Remote server not found</source>
          <translation>Palvelinta ei löydy</translation>
      </message>
      <message>
--        <location filename="../../src/engine/engine.cpp" line="256"/>
++        <location filename="../../src/engine/engine.cpp" line="259"/>
          <source>Connection timed out</source>
          <translation>Yhteys aikakatkaistiin</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="262"/>
 -        <location filename="../../src/engine/engine.cpp" line="260"/>
++        <location filename="../../src/engine/engine.cpp" line="265"/>
 +        <source>No network connection</source>
-         <translation>Ei verkkoyhteyttä</translation>
++        <translation type="unfinished">Ei verkkoyhteyttä</translation>
 +    </message>
 +    <message>
-         <location filename="../../src/engine/engine.cpp" line="266"/>
++        <location filename="../../src/engine/engine.cpp" line="269"/>
          <source>Session expired. Please login again</source>
          <translation>Istunto vanhentunut. Kirjaudu uudelleen</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="274"/>
 -        <location filename="../../src/engine/engine.cpp" line="268"/>
++        <location filename="../../src/engine/engine.cpp" line="277"/>
          <source>Invalid E-mail address or password</source>
          <translation>Virheellinen sähköpostiosoite tai salasana</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="279"/>
 -        <location filename="../../src/engine/engine.cpp" line="273"/>
++        <location filename="../../src/engine/engine.cpp" line="282"/>
          <source>Update failed, please try again</source>
          <translation>Päivitys epäonnistui. Yritä uudelleen</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="283"/>
 -        <location filename="../../src/engine/engine.cpp" line="277"/>
++        <location filename="../../src/engine/engine.cpp" line="286"/>
          <source>Data retrieval failed, please try again</source>
          <translation>Tiedon haku epäonnistui. Yritä uudelleen</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="286"/>
 -        <location filename="../../src/engine/engine.cpp" line="283"/>
++        <location filename="../../src/engine/engine.cpp" line="292"/>
          <source>Address retrieval failed</source>
          <translation>Osoitteen haku epäonnistui</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="299"/>
 -        <location filename="../../src/engine/engine.cpp" line="296"/>
++        <location filename="../../src/engine/engine.cpp" line="305"/>
          <source>Malformatted reply from server</source>
          <translation>Viallisesti muotoiltu serverin vastaus</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="305"/>
 -        <location filename="../../src/engine/engine.cpp" line="302"/>
++        <location filename="../../src/engine/engine.cpp" line="311"/>
+         <source>Address server not responding</source>
+         <translation>Osoitepalvelin ei vastaa</translation>
+     </message>
+     <message>
 -        <location filename="../../src/engine/engine.cpp" line="451"/>
++        <location filename="../../src/engine/engine.cpp" line="479"/>
+         <source>Automatic location update</source>
+         <translation>Automaattinen paikan päivitys</translation>
+     </message>
+     <message>
          <source>Geolocation server not responding</source>
-         <translation type="unfinished"></translation>
+         <translation type="obsolete">Geolokaatio serveri ei vastaa</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="309"/>
          <source>Geolocation request failed, please try again</source>
-         <translation type="unfinished"></translation>
+         <translation type="obsolete">Geolokaatio pyyntö epäonnistui.Yritä uudelleen</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="313"/>
          <source>Invalid lat/lon value, please try again</source>
-         <translation type="unfinished"></translation>
+         <translation type="obsolete">Virheellinen lat/lon arvo. Yritä uudelleen</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="462"/>
          <source>Automatic location update.</source>
-         <translation type="unfinished"></translation>
+         <translation type="obsolete">Automaattinen paikkatiedon päivitys.</translation>
      </message>
      <message>
          <source>Address retrieval failed, please try again</source>
          <translation type="obsolete">Osoitteen haku epäonnistui. Yritä uudelleen</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="289"/>
 -        <location filename="../../src/engine/engine.cpp" line="286"/>
++        <location filename="../../src/engine/engine.cpp" line="295"/>
          <source>Image download failed</source>
          <translation>Kuvan haku epäonnistui</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="292"/>
 -        <location filename="../../src/engine/engine.cpp" line="289"/>
++        <location filename="../../src/engine/engine.cpp" line="298"/>
          <source>Map image download failed</source>
          <translation>Karttakuvan lataaminen epäonnistui</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="296"/>
 -        <location filename="../../src/engine/engine.cpp" line="293"/>
++        <location filename="../../src/engine/engine.cpp" line="302"/>
          <source>GPS initialization failed</source>
          <translation>GPS alustus epäonnistui</translation>
      </message>
@@@ -297,14 -302,14 +307,14 @@@
          <translation type="obsolete">Virheellinen JSON, parsiminen epäonnistui</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="351"/>
-         <location filename="../../src/engine/engine.cpp" line="359"/>
 -        <location filename="../../src/engine/engine.cpp" line="340"/>
 -        <location filename="../../src/engine/engine.cpp" line="348"/>
++        <location filename="../../src/engine/engine.cpp" line="349"/>
++        <location filename="../../src/engine/engine.cpp" line="357"/>
          <source>GPS enabled</source>
          <translation>GPS päällä</translation>
      </message>
      <message>
-         <location filename="../../src/engine/engine.cpp" line="352"/>
-         <location filename="../../src/engine/engine.cpp" line="362"/>
 -        <location filename="../../src/engine/engine.cpp" line="341"/>
 -        <location filename="../../src/engine/engine.cpp" line="351"/>
++        <location filename="../../src/engine/engine.cpp" line="350"/>
++        <location filename="../../src/engine/engine.cpp" line="360"/>
          <source>Auto centering enabled</source>
          <translation>Automaattinen keskitys päällä</translation>
      </message>
@@@ -347,7 -352,7 +357,7 @@@ Your message is saved to textbox until 
          <translation type="obsolete">Sijainnin päivitys epäonnistui\n\nVistisi on tallennettu kunnes pävitys on onnistunut</translation>
      </message>
      <message>
--        <location filename="../../src/ui/userinfo.cpp" line="357"/>
++        <location filename="../../src/ui/userinfo.cpp" line="353"/>
          <source>Location update failed, please try again</source>
          <translation>Paikkatiedon päivitys epäonnistui, yritä uudelleen</translation>
      </message>

diff --cc src/engine/engine.cpp
Simple merge

diff --cc src/ui/userinfo.cpp
Simple merge