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

Conflicts:
	src/src.pro

diff --combined images.qrc
index b311eaf,b311eaf..f407513
--- 1/images.qrc
--- 2/images.qrc
+++ b/images.qrc
@@@ -7,7 -7,7 +7,6 @@@
          <file>res/images/envelope.png</file>
          <file>res/images/zoom_in.png</file>
          <file>res/images/zoom_out.png</file>
--        <file>res/images/personal_info_bckgrnd.png</file>
          <file>res/images/refresh.png</file>
          <file>res/images/refresh_s.png</file>
          <file>res/images/send_position.png</file>

diff --combined src/src.pro
index ff4965b,06948b9..10e7c8a
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -5,7 -5,9 +5,9 @@@ TARGET = ../situar
  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 \
@@@ -95,18 -97,10 +97,18 @@@ HEADERS += ui/mainwindow.h 
      network/networkreply.h
  QT += network \
      webkit
 -DEFINES += QT_NO_DEBUG_OUTPUT
  
 +DEFINES += QT_NO_DEBUG_OUTPUT
  
 -maemo5 | simulator {
 +simulator {
 +    SOURCES += network/networkhandlerprivatestub.cpp \
 +               gps/gpspositionprivate.cpp
 +    HEADERS += network/networkhandlerprivatestub.h \
 +               gps/gpspositionprivate.h
 +    QT += maemo5
 +    CONFIG += mobility
 +    MOBILITY += location
 +} else:maemo5 {
      armel {
          DEFINES += ARMEL
          INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
@@@ -118,17 -112,11 +120,17 @@@
          SOURCES += network/networkhandlerprivatestub.cpp
          HEADERS += network/networkhandlerprivatestub.h
      }
 -    SOURCES += gps/gpspositionprivate.cpp
 -    HEADERS += gps/gpspositionprivate.h
 +    SOURCES += gps/gpspositionprivateliblocation.cpp \
 +               gps/liblocationwrapper.cpp \
 +               gps/geopositioninfo.cpp \
 +               gps/geocoordinate.cpp
 +    HEADERS += gps/gpspositionprivateliblocation.h \
 +               gps/liblocationwrapper.h \
 +               gps/geopositioninfo.h \
 +               gps/geocoordinate.h
      QT += maemo5
 -    CONFIG += mobility
 -    MOBILITY = location
 +    CONFIG += link_pkgconfig
 +    PKGCONFIG += glib-2.0 liblocation
      message([QJson])
      message(Make sure you have QJson development headers installed)
      message(add: deb http://repository.maemo.org/extras-devel fremantle free non-free)