Major pro file overhaul from davipt. Commited by me, since it touches

many core files ... please report bugs on this to davipt

7 files changed, 99 insertions, 100 deletions

diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro
index 3d9d49f..2849127 100644
--- a/noncore/unsupported/filebrowser/filebrowser.pro
+++ b/noncore/unsupported/filebrowser/filebrowser.pro
@@ -7,17 +7,18 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 INTERFACES	=
-TRANSLATIONS = ../i18n/de/filebrowser.ts
-TRANSLATIONS += ../i18n/es/filebrowser.ts
-TRANSLATIONS += ../i18n/pt/filebrowser.ts
-TRANSLATIONS += ../i18n/pt_BR/filebrowser.ts
-TRANSLATIONS   += ../i18n/en/filebrowser.ts
-TRANSLATIONS   += ../i18n/hu/filebrowser.ts
-TRANSLATIONS   += ../i18n/ja/filebrowser.ts
-TRANSLATIONS   += ../i18n/fr/filebrowser.ts
-TRANSLATIONS   += ../i18n/sl/filebrowser.ts
-TRANSLATIONS   += ../i18n/ko/filebrowser.ts
-TRANSLATIONS   += ../i18n/no/filebrowser.ts
-TRANSLATIONS   += ../i18n/pl/filebrowser.ts
-TRANSLATIONS   += ../i18n/zh_CN/filebrowser.ts
-TRANSLATIONS   += ../i18n/zh_TW/filebrowser.ts
+
+TRANSLATIONS = ../../../i18n/de/filebrowser.pro.in.ts \
+	 ../../../i18n/en/filebrowser.pro.in.ts \
+	 ../../../i18n/es/filebrowser.pro.in.ts \
+	 ../../../i18n/fr/filebrowser.pro.in.ts \
+	 ../../../i18n/hu/filebrowser.pro.in.ts \
+	 ../../../i18n/ja/filebrowser.pro.in.ts \
+	 ../../../i18n/ko/filebrowser.pro.in.ts \
+	 ../../../i18n/no/filebrowser.pro.in.ts \
+	 ../../../i18n/pl/filebrowser.pro.in.ts \
+	 ../../../i18n/pt/filebrowser.pro.in.ts \
+	 ../../../i18n/pt_BR/filebrowser.pro.in.ts \
+	 ../../../i18n/sl/filebrowser.pro.in.ts \
+	 ../../../i18n/zh_CN/filebrowser.pro.in.ts \
+	 ../../../i18n/zh_TW/filebrowser.pro.in.ts
diff --git a/noncore/unsupported/gsmtool/gsmtool.pro b/noncore/unsupported/gsmtool/gsmtool.pro
index 73bac50..d627075 100644
--- a/noncore/unsupported/gsmtool/gsmtool.pro
+++ b/noncore/unsupported/gsmtool/gsmtool.pro
@@ -13,19 +13,17 @@ LIBS            += -lqpe -L$(GSMLIBDIR)/gsmlib/.libs -lgsmme
 INTERFACES	= gsmtoolbase.ui
 TARGET		= gsmtool
 
-
-TRANSLATIONS = ../../../i18n/de/gsmtool.ts
-TRANSLATIONS += ../../../i18n/en/gsmtool.ts
-TRANSLATIONS += ../../../i18n/es/gsmtool.ts
-TRANSLATIONS += ../../../i18n/fr/gsmtool.ts
-TRANSLATIONS += ../../../i18n/hu/gsmtool.ts
-TRANSLATIONS += ../../../i18n/ja/gsmtool.ts
-TRANSLATIONS += ../../../i18n/ko/gsmtool.ts
-TRANSLATIONS += ../../../i18n/no/gsmtool.ts
-TRANSLATIONS += ../../../i18n/pl/gsmtool.ts
-TRANSLATIONS += ../../../i18n/pt/gsmtool.ts
-TRANSLATIONS += ../../../i18n/pt_BR/gsmtool.ts
-TRANSLATIONS += ../../../i18n/sl/gsmtool.ts
-TRANSLATIONS += ../../../i18n/zh_CN/gsmtool.ts
-TRANSLATIONS += ../../../i18n/zh_TW/gsmtool.ts
-
+TRANSLATIONS = ../../../i18n/de/gsmtool.ts \
+	 ../../../i18n/en/gsmtool.ts \
+	 ../../../i18n/es/gsmtool.ts \
+	 ../../../i18n/fr/gsmtool.ts \
+	 ../../../i18n/hu/gsmtool.ts \
+	 ../../../i18n/ja/gsmtool.ts \
+	 ../../../i18n/ko/gsmtool.ts \
+	 ../../../i18n/no/gsmtool.ts \
+	 ../../../i18n/pl/gsmtool.ts \
+	 ../../../i18n/pt/gsmtool.ts \
+	 ../../../i18n/pt_BR/gsmtool.ts \
+	 ../../../i18n/sl/gsmtool.ts \
+	 ../../../i18n/zh_CN/gsmtool.ts \
+	 ../../../i18n/zh_TW/gsmtool.ts
diff --git a/noncore/unsupported/mail2/bend/bend.pro b/noncore/unsupported/mail2/bend/bend.pro
index bb96d76..fe0aed0 100644
--- a/noncore/unsupported/mail2/bend/bend.pro
+++ b/noncore/unsupported/mail2/bend/bend.pro
@@ -9,19 +9,17 @@ LIBS		+=	-lmail -lqpe
 TARGET		=	bend
 DESTDIR		+=	$(OPIEDIR)/plugins/applets/
 
-
-TRANSLATIONS = ../../../i18n/de/libbend.ts
-TRANSLATIONS += ../../../i18n/en/libbend.ts
-TRANSLATIONS += ../../../i18n/es/libbend.ts
-TRANSLATIONS += ../../../i18n/fr/libbend.ts
-TRANSLATIONS += ../../../i18n/hu/libbend.ts
-TRANSLATIONS += ../../../i18n/ja/libbend.ts
-TRANSLATIONS += ../../../i18n/ko/libbend.ts
-TRANSLATIONS += ../../../i18n/no/libbend.ts
-TRANSLATIONS += ../../../i18n/pl/libbend.ts
-TRANSLATIONS += ../../../i18n/pt/libbend.ts
-TRANSLATIONS += ../../../i18n/pt_BR/libbend.ts
-TRANSLATIONS += ../../../i18n/sl/libbend.ts
-TRANSLATIONS += ../../../i18n/zh_CN/libbend.ts
-TRANSLATIONS += ../../../i18n/zh_TW/libbend.ts
-
+TRANSLATIONS = ../../../i18n/de/libbend.ts \
+	 ../../../i18n/en/libbend.ts \
+	 ../../../i18n/es/libbend.ts \
+	 ../../../i18n/fr/libbend.ts \
+	 ../../../i18n/hu/libbend.ts \
+	 ../../../i18n/ja/libbend.ts \
+	 ../../../i18n/ko/libbend.ts \
+	 ../../../i18n/no/libbend.ts \
+	 ../../../i18n/pl/libbend.ts \
+	 ../../../i18n/pt/libbend.ts \
+	 ../../../i18n/pt_BR/libbend.ts \
+	 ../../../i18n/sl/libbend.ts \
+	 ../../../i18n/zh_CN/libbend.ts \
+	 ../../../i18n/zh_TW/libbend.ts
diff --git a/noncore/unsupported/mail2/libmail/libmail.pro b/noncore/unsupported/mail2/libmail/libmail.pro
index af65a3e..e80ecaf 100644
--- a/noncore/unsupported/mail2/libmail/libmail.pro
+++ b/noncore/unsupported/mail2/libmail/libmail.pro
@@ -23,19 +23,17 @@ LIBS		+=	-L$(OPIEDIR)/lib -lqpe
 TARGET		=	mail
 DESTDIR		=	$(QTDIR)/lib
 
-
-TRANSLATIONS = ../../../i18n/de/libmail.ts
-TRANSLATIONS += ../../../i18n/en/libmail.ts
-TRANSLATIONS += ../../../i18n/es/libmail.ts
-TRANSLATIONS += ../../../i18n/fr/libmail.ts
-TRANSLATIONS += ../../../i18n/hu/libmail.ts
-TRANSLATIONS += ../../../i18n/ja/libmail.ts
-TRANSLATIONS += ../../../i18n/ko/libmail.ts
-TRANSLATIONS += ../../../i18n/no/libmail.ts
-TRANSLATIONS += ../../../i18n/pl/libmail.ts
-TRANSLATIONS += ../../../i18n/pt/libmail.ts
-TRANSLATIONS += ../../../i18n/pt_BR/libmail.ts
-TRANSLATIONS += ../../../i18n/sl/libmail.ts
-TRANSLATIONS += ../../../i18n/zh_CN/libmail.ts
-TRANSLATIONS += ../../../i18n/zh_TW/libmail.ts
-
+TRANSLATIONS = ../../../i18n/de/libmail.ts \
+	 ../../../i18n/en/libmail.ts \
+	 ../../../i18n/es/libmail.ts \
+	 ../../../i18n/fr/libmail.ts \
+	 ../../../i18n/hu/libmail.ts \
+	 ../../../i18n/ja/libmail.ts \
+	 ../../../i18n/ko/libmail.ts \
+	 ../../../i18n/no/libmail.ts \
+	 ../../../i18n/pl/libmail.ts \
+	 ../../../i18n/pt/libmail.ts \
+	 ../../../i18n/pt_BR/libmail.ts \
+	 ../../../i18n/sl/libmail.ts \
+	 ../../../i18n/zh_CN/libmail.ts \
+	 ../../../i18n/zh_TW/libmail.ts
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index 117c863..985a6fb 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -43,19 +43,17 @@ LIBS           += 	-lmail -lqpe -lopie
 TARGET		= 	mail 
 DESTDIR		= 	$(OPIEDIR)/bin
 
-
-TRANSLATIONS = ../../i18n/de/mail.ts
-TRANSLATIONS += ../../i18n/en/mail.ts
-TRANSLATIONS += ../../i18n/es/mail.ts
-TRANSLATIONS += ../../i18n/fr/mail.ts
-TRANSLATIONS += ../../i18n/hu/mail.ts
-TRANSLATIONS += ../../i18n/ja/mail.ts
-TRANSLATIONS += ../../i18n/ko/mail.ts
-TRANSLATIONS += ../../i18n/no/mail.ts
-TRANSLATIONS += ../../i18n/pl/mail.ts
-TRANSLATIONS += ../../i18n/pt/mail.ts
-TRANSLATIONS += ../../i18n/pt_BR/mail.ts
-TRANSLATIONS += ../../i18n/sl/mail.ts
-TRANSLATIONS += ../../i18n/zh_CN/mail.ts
-TRANSLATIONS += ../../i18n/zh_TW/mail.ts
-
+TRANSLATIONS = ../../i18n/de/mail.ts \
+	 ../../i18n/en/mail.ts \
+	 ../../i18n/es/mail.ts \
+	 ../../i18n/fr/mail.ts \
+	 ../../i18n/hu/mail.ts \
+	 ../../i18n/ja/mail.ts \
+	 ../../i18n/ko/mail.ts \
+	 ../../i18n/no/mail.ts \
+	 ../../i18n/pl/mail.ts \
+	 ../../i18n/pt/mail.ts \
+	 ../../i18n/pt_BR/mail.ts \
+	 ../../i18n/sl/mail.ts \
+	 ../../i18n/zh_CN/mail.ts \
+	 ../../i18n/zh_TW/mail.ts
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro
index 7f60ed8..986cbcd 100644
--- a/noncore/unsupported/oipkg/oipkg.pro
+++ b/noncore/unsupported/oipkg/oipkg.pro
@@ -35,3 +35,17 @@ INTERFACES	= runwindow.ui \
 		pksettingsbase.ui
 TARGET		= oipkg
 
+TRANSLATIONS = ../../../i18n/de/oipkg.ts \
+	 ../../../i18n/en/oipkg.ts \
+	 ../../../i18n/es/oipkg.ts \
+	 ../../../i18n/fr/oipkg.ts \
+	 ../../../i18n/hu/oipkg.ts \
+	 ../../../i18n/ja/oipkg.ts \
+	 ../../../i18n/ko/oipkg.ts \
+	 ../../../i18n/no/oipkg.ts \
+	 ../../../i18n/pl/oipkg.ts \
+	 ../../../i18n/pt/oipkg.ts \
+	 ../../../i18n/pt_BR/oipkg.ts \
+	 ../../../i18n/sl/oipkg.ts \
+	 ../../../i18n/zh_CN/oipkg.ts \
+	 ../../../i18n/zh_TW/oipkg.ts
diff --git a/noncore/unsupported/qpdf/qpdf.pro b/noncore/unsupported/qpdf/qpdf.pro
index a5f7735..d2a553b 100644
--- a/noncore/unsupported/qpdf/qpdf.pro
+++ b/noncore/unsupported/qpdf/qpdf.pro
@@ -1,8 +1,6 @@
 TEMPLATE    =  app
-
 CONFIG      *= qt embedded release warn_off
 CONFIG      -= warn_on
-
 SOURCES     =  xpdf/Array.cc \
                xpdf/BuiltinFont.cc \
                xpdf/BuiltinFontTables.cc \
@@ -40,12 +38,10 @@ SOURCES     =  xpdf/Array.cc \
                qpdf.cpp \
                qbusybar.cpp \
                gooStub.cpp
-
 HEADERS     =  QOutputDev.h \
                QPEOutputDev.h \
                qbusybar.h \
                qpdf.h
-
 INCLUDEPATH += . \
                .. \
                xpdf \
@@ -54,24 +50,20 @@ INCLUDEPATH += . \
                goo
                
 LIBS        += -L $(OPIEDIR)/lib -lqpe -lopie
-
 DESTDIR      = $(OPIEDIR)/bin
 TARGET       = qpdf
 
-
-
-TRANSLATIONS = ../../../i18n/de/qpdf.ts
-TRANSLATIONS += ../../../i18n/en/qpdf.ts
-TRANSLATIONS += ../../../i18n/es/qpdf.ts
-TRANSLATIONS += ../../../i18n/fr/qpdf.ts
-TRANSLATIONS += ../../../i18n/hu/qpdf.ts
-TRANSLATIONS += ../../../i18n/ja/qpdf.ts
-TRANSLATIONS += ../../../i18n/ko/qpdf.ts
-TRANSLATIONS += ../../../i18n/no/qpdf.ts
-TRANSLATIONS += ../../../i18n/pl/qpdf.ts
-TRANSLATIONS += ../../../i18n/pt/qpdf.ts
-TRANSLATIONS += ../../../i18n/pt_BR/qpdf.ts
-TRANSLATIONS += ../../../i18n/sl/qpdf.ts
-TRANSLATIONS += ../../../i18n/zh_CN/qpdf.ts
-TRANSLATIONS += ../../../i18n/zh_TW/qpdf.ts
-
+TRANSLATIONS = ../../../i18n/de/qpdf.ts \
+	 ../../../i18n/en/qpdf.ts \
+	 ../../../i18n/es/qpdf.ts \
+	 ../../../i18n/fr/qpdf.ts \
+	 ../../../i18n/hu/qpdf.ts \
+	 ../../../i18n/ja/qpdf.ts \
+	 ../../../i18n/ko/qpdf.ts \
+	 ../../../i18n/no/qpdf.ts \
+	 ../../../i18n/pl/qpdf.ts \
+	 ../../../i18n/pt/qpdf.ts \
+	 ../../../i18n/pt_BR/qpdf.ts \
+	 ../../../i18n/sl/qpdf.ts \
+	 ../../../i18n/zh_CN/qpdf.ts \
+	 ../../../i18n/zh_TW/qpdf.ts