3 files changed, 42 insertions, 57 deletions
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 1db454e..cf83612 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -1,33 +1,28 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 # Input
 INTERFACES += binary.ui
 HEADERS = binaryimpl.h \
            binaryfactory.h 
 SOURCES = binaryimpl.cpp \
            binaryfactory.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                    $(OPIEDIR)/calc2
 DEPENDPATH      += $(OPIEDIR)/include 
 DESTDIR = $(OPIEDIR)/plugins/calculator
+TRANSLATIONS = ../../../../i18n/de/lib.ts \
-TRANSLATIONS = ../../../../i18n/de/lib.ts
+         ../../../../i18n/en/lib.ts \
-TRANSLATIONS += ../../../../i18n/en/lib.ts
+         ../../../../i18n/es/lib.ts \
-TRANSLATIONS += ../../../../i18n/es/lib.ts
+         ../../../../i18n/fr/lib.ts \
-TRANSLATIONS += ../../../../i18n/fr/lib.ts
+         ../../../../i18n/hu/lib.ts \
-TRANSLATIONS += ../../../../i18n/hu/lib.ts
+         ../../../../i18n/ja/lib.ts \
-TRANSLATIONS += ../../../../i18n/ja/lib.ts
+         ../../../../i18n/ko/lib.ts \
-TRANSLATIONS += ../../../../i18n/ko/lib.ts
+         ../../../../i18n/no/lib.ts \
-TRANSLATIONS += ../../../../i18n/no/lib.ts
+         ../../../../i18n/pl/lib.ts \
-TRANSLATIONS += ../../../../i18n/pl/lib.ts
+         ../../../../i18n/pt/lib.ts \
-TRANSLATIONS += ../../../../i18n/pt/lib.ts
+         ../../../../i18n/pt_BR/lib.ts \
-TRANSLATIONS += ../../../../i18n/pt_BR/lib.ts
+         ../../../../i18n/sl/lib.ts \
-TRANSLATIONS += ../../../../i18n/sl/lib.ts
+         ../../../../i18n/zh_CN/lib.ts \
-TRANSLATIONS += ../../../../i18n/zh_CN/lib.ts
+         ../../../../i18n/zh_TW/lib.ts
-TRANSLATIONS += ../../../../i18n/zh_TW/lib.ts
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index 5167f4a..5b58b36 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -1,28 +1,23 @@
 TEMPLATE = app
 CONFIG += qt release
 # Input
 HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
 SOURCES += calc.cpp main.cpp engine.cpp
 INCLUDEPATH     += $(OPIEDIR)/include 
 DEPENDPATH      += $(OPIEDIR)/include 
 LIBS += -lqpe -Wl,-export-dynamic 
+TRANSLATIONS = ../../../i18n/de/calc.pro.in.ts \
+         ../../../i18n/en/calc.pro.in.ts \
-TRANSLATIONS = ../../../i18n/de/calc.pro.in.ts
+         ../../../i18n/es/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/en/calc.pro.in.ts
+         ../../../i18n/fr/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/es/calc.pro.in.ts
+         ../../../i18n/hu/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/fr/calc.pro.in.ts
+         ../../../i18n/ja/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/hu/calc.pro.in.ts
+         ../../../i18n/ko/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/ja/calc.pro.in.ts
+         ../../../i18n/no/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/ko/calc.pro.in.ts
+         ../../../i18n/pl/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/no/calc.pro.in.ts
+         ../../../i18n/pt/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/pl/calc.pro.in.ts
+         ../../../i18n/pt_BR/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/pt/calc.pro.in.ts
+         ../../../i18n/sl/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/pt_BR/calc.pro.in.ts
+         ../../../i18n/zh_CN/calc.pro.in.ts \
-TRANSLATIONS += ../../../i18n/sl/calc.pro.in.ts
+         ../../../i18n/zh_TW/calc.pro.in.ts
-TRANSLATIONS += ../../../i18n/zh_CN/calc.pro.in.ts
-TRANSLATIONS += ../../../i18n/zh_TW/calc.pro.in.ts
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index b0c8546..148d307 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -1,31 +1,26 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 # Input
 INTERFACES += simple.ui
 HEADERS = simpleimpl.h  simplefactory.h stdinstructions.h
 SOURCES = simpleimpl.cpp simplefactory.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                    $(OPIEDIR)/calc2
 DEPENDPATH      += $(OPIEDIR)/include 
 DESTDIR = $(OPIEDIR)/plugins/calculator
+TRANSLATIONS = ../../../../i18n/de/lib.ts \
-TRANSLATIONS = ../../../../i18n/de/lib.ts
+         ../../../../i18n/en/lib.ts \
-TRANSLATIONS += ../../../../i18n/en/lib.ts
+         ../../../../i18n/es/lib.ts \
-TRANSLATIONS += ../../../../i18n/es/lib.ts
+         ../../../../i18n/fr/lib.ts \
-TRANSLATIONS += ../../../../i18n/fr/lib.ts
+         ../../../../i18n/hu/lib.ts \
-TRANSLATIONS += ../../../../i18n/hu/lib.ts
+         ../../../../i18n/ja/lib.ts \
-TRANSLATIONS += ../../../../i18n/ja/lib.ts
+         ../../../../i18n/ko/lib.ts \
-TRANSLATIONS += ../../../../i18n/ko/lib.ts
+         ../../../../i18n/no/lib.ts \
-TRANSLATIONS += ../../../../i18n/no/lib.ts
+         ../../../../i18n/pl/lib.ts \
-TRANSLATIONS += ../../../../i18n/pl/lib.ts
+         ../../../../i18n/pt/lib.ts \
-TRANSLATIONS += ../../../../i18n/pt/lib.ts
+         ../../../../i18n/pt_BR/lib.ts \
-TRANSLATIONS += ../../../../i18n/pt_BR/lib.ts
+         ../../../../i18n/sl/lib.ts \
-TRANSLATIONS += ../../../../i18n/sl/lib.ts
+         ../../../../i18n/zh_CN/lib.ts \
-TRANSLATIONS += ../../../../i18n/zh_CN/lib.ts
+         ../../../../i18n/zh_TW/lib.ts
-TRANSLATIONS += ../../../../i18n/zh_TW/lib.ts

diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro index 1db454e..cf83612 100644 --- a/noncore/tools/calc2/binary/binary.pro +++ b/noncore/tools/calc2/binary/binary.pro
@@ -1,33 +1,28 @@
1	TEMPLATE = lib	1	TEMPLATE = lib
2	CONFIG -= moc	2	CONFIG -= moc
3	CONFIG += qt release	3	CONFIG += qt release
4
5	# Input	4	# Input
6	INTERFACES += binary.ui	5	INTERFACES += binary.ui
7	HEADERS = binaryimpl.h \	6	HEADERS = binaryimpl.h \
8	binaryfactory.h	7	binaryfactory.h
9	SOURCES = binaryimpl.cpp \	8	SOURCES = binaryimpl.cpp \
10	binaryfactory.cpp	9	binaryfactory.cpp
11
12	INCLUDEPATH += $(OPIEDIR)/include \	10	INCLUDEPATH += $(OPIEDIR)/include \
13	$(OPIEDIR)/calc2	11	$(OPIEDIR)/calc2
14	DEPENDPATH += $(OPIEDIR)/include	12	DEPENDPATH += $(OPIEDIR)/include
15
16	DESTDIR = $(OPIEDIR)/plugins/calculator	13	DESTDIR = $(OPIEDIR)/plugins/calculator
17		14
18		15	TRANSLATIONS = ../../../../i18n/de/lib.ts \
19	TRANSLATIONS = ../../../../i18n/de/lib.ts	16	../../../../i18n/en/lib.ts \
20	TRANSLATIONS += ../../../../i18n/en/lib.ts	17	../../../../i18n/es/lib.ts \
21	TRANSLATIONS += ../../../../i18n/es/lib.ts	18	../../../../i18n/fr/lib.ts \
22	TRANSLATIONS += ../../../../i18n/fr/lib.ts	19	../../../../i18n/hu/lib.ts \
23	TRANSLATIONS += ../../../../i18n/hu/lib.ts	20	../../../../i18n/ja/lib.ts \
24	TRANSLATIONS += ../../../../i18n/ja/lib.ts	21	../../../../i18n/ko/lib.ts \
25	TRANSLATIONS += ../../../../i18n/ko/lib.ts	22	../../../../i18n/no/lib.ts \
26	TRANSLATIONS += ../../../../i18n/no/lib.ts	23	../../../../i18n/pl/lib.ts \
27	TRANSLATIONS += ../../../../i18n/pl/lib.ts	24	../../../../i18n/pt/lib.ts \
28	TRANSLATIONS += ../../../../i18n/pt/lib.ts	25	../../../../i18n/pt_BR/lib.ts \
29	TRANSLATIONS += ../../../../i18n/pt_BR/lib.ts	26	../../../../i18n/sl/lib.ts \
30	TRANSLATIONS += ../../../../i18n/sl/lib.ts	27	../../../../i18n/zh_CN/lib.ts \
31	TRANSLATIONS += ../../../../i18n/zh_CN/lib.ts	28	../../../../i18n/zh_TW/lib.ts
32	TRANSLATIONS += ../../../../i18n/zh_TW/lib.ts
33


diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro index 5167f4a..5b58b36 100644 --- a/noncore/tools/calc2/calc.pro +++ b/noncore/tools/calc2/calc.pro
@@ -1,28 +1,23 @@
1	TEMPLATE = app	1	TEMPLATE = app
2	CONFIG += qt release	2	CONFIG += qt release
3
4	# Input	3	# Input
5	HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h	4	HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
6	SOURCES += calc.cpp main.cpp engine.cpp	5	SOURCES += calc.cpp main.cpp engine.cpp
7
8	INCLUDEPATH += $(OPIEDIR)/include	6	INCLUDEPATH += $(OPIEDIR)/include
9	DEPENDPATH += $(OPIEDIR)/include	7	DEPENDPATH += $(OPIEDIR)/include
10	LIBS += -lqpe -Wl,-export-dynamic	8	LIBS += -lqpe -Wl,-export-dynamic
11		9
12		10	TRANSLATIONS = ../../../i18n/de/calc.pro.in.ts \
13		11	../../../i18n/en/calc.pro.in.ts \
14	TRANSLATIONS = ../../../i18n/de/calc.pro.in.ts	12	../../../i18n/es/calc.pro.in.ts \
15	TRANSLATIONS += ../../../i18n/en/calc.pro.in.ts	13	../../../i18n/fr/calc.pro.in.ts \
16	TRANSLATIONS += ../../../i18n/es/calc.pro.in.ts	14	../../../i18n/hu/calc.pro.in.ts \
17	TRANSLATIONS += ../../../i18n/fr/calc.pro.in.ts	15	../../../i18n/ja/calc.pro.in.ts \
18	TRANSLATIONS += ../../../i18n/hu/calc.pro.in.ts	16	../../../i18n/ko/calc.pro.in.ts \
19	TRANSLATIONS += ../../../i18n/ja/calc.pro.in.ts	17	../../../i18n/no/calc.pro.in.ts \
20	TRANSLATIONS += ../../../i18n/ko/calc.pro.in.ts	18	../../../i18n/pl/calc.pro.in.ts \
21	TRANSLATIONS += ../../../i18n/no/calc.pro.in.ts	19	../../../i18n/pt/calc.pro.in.ts \
22	TRANSLATIONS += ../../../i18n/pl/calc.pro.in.ts	20	../../../i18n/pt_BR/calc.pro.in.ts \
23	TRANSLATIONS += ../../../i18n/pt/calc.pro.in.ts	21	../../../i18n/sl/calc.pro.in.ts \
24	TRANSLATIONS += ../../../i18n/pt_BR/calc.pro.in.ts	22	../../../i18n/zh_CN/calc.pro.in.ts \
25	TRANSLATIONS += ../../../i18n/sl/calc.pro.in.ts	23	../../../i18n/zh_TW/calc.pro.in.ts
26	TRANSLATIONS += ../../../i18n/zh_CN/calc.pro.in.ts
27	TRANSLATIONS += ../../../i18n/zh_TW/calc.pro.in.ts
28


diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro index b0c8546..148d307 100644 --- a/noncore/tools/calc2/simple/simple.pro +++ b/noncore/tools/calc2/simple/simple.pro
@@ -1,31 +1,26 @@
1	TEMPLATE = lib	1	TEMPLATE = lib
2	CONFIG -= moc	2	CONFIG -= moc
3	CONFIG += qt release	3	CONFIG += qt release
4
5	# Input	4	# Input
6	INTERFACES += simple.ui	5	INTERFACES += simple.ui
7	HEADERS = simpleimpl.h simplefactory.h stdinstructions.h	6	HEADERS = simpleimpl.h simplefactory.h stdinstructions.h
8	SOURCES = simpleimpl.cpp simplefactory.cpp	7	SOURCES = simpleimpl.cpp simplefactory.cpp
9
10	INCLUDEPATH += $(OPIEDIR)/include \	8	INCLUDEPATH += $(OPIEDIR)/include \
11	$(OPIEDIR)/calc2	9	$(OPIEDIR)/calc2
12	DEPENDPATH += $(OPIEDIR)/include	10	DEPENDPATH += $(OPIEDIR)/include
13
14	DESTDIR = $(OPIEDIR)/plugins/calculator	11	DESTDIR = $(OPIEDIR)/plugins/calculator
15		12
16		13	TRANSLATIONS = ../../../../i18n/de/lib.ts \
17	TRANSLATIONS = ../../../../i18n/de/lib.ts	14	../../../../i18n/en/lib.ts \
18	TRANSLATIONS += ../../../../i18n/en/lib.ts	15	../../../../i18n/es/lib.ts \
19	TRANSLATIONS += ../../../../i18n/es/lib.ts	16	../../../../i18n/fr/lib.ts \
20	TRANSLATIONS += ../../../../i18n/fr/lib.ts	17	../../../../i18n/hu/lib.ts \
21	TRANSLATIONS += ../../../../i18n/hu/lib.ts	18	../../../../i18n/ja/lib.ts \
22	TRANSLATIONS += ../../../../i18n/ja/lib.ts	19	../../../../i18n/ko/lib.ts \
23	TRANSLATIONS += ../../../../i18n/ko/lib.ts	20	../../../../i18n/no/lib.ts \
24	TRANSLATIONS += ../../../../i18n/no/lib.ts	21	../../../../i18n/pl/lib.ts \
25	TRANSLATIONS += ../../../../i18n/pl/lib.ts	22	../../../../i18n/pt/lib.ts \
26	TRANSLATIONS += ../../../../i18n/pt/lib.ts	23	../../../../i18n/pt_BR/lib.ts \
27	TRANSLATIONS += ../../../../i18n/pt_BR/lib.ts	24	../../../../i18n/sl/lib.ts \
28	TRANSLATIONS += ../../../../i18n/sl/lib.ts	25	../../../../i18n/zh_CN/lib.ts \
29	TRANSLATIONS += ../../../../i18n/zh_CN/lib.ts	26	../../../../i18n/zh_TW/lib.ts
30	TRANSLATIONS += ../../../../i18n/zh_TW/lib.ts
31