summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--Makefile.Embedded2
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt24
-rw-r--r--bin/kdepim/kaddressbook/usertranslation.txt24
-rw-r--r--bin/kdepim/korganizer/usertranslation.txt25
-rw-r--r--korganizer/wordsgerman.h24
-rw-r--r--version2
7 files changed, 3 insertions, 100 deletions
diff --git a/Makefile b/Makefile
index 8c6110c..da5feba 100644
--- a/Makefile
+++ b/Makefile
@@ -228,13 +228,13 @@ install:
228 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop 228 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
229 229
230dist: 230dist:
231 @echo Dont forget to do "make install" before "make dist" 231 @echo Dont forget to do "make install" before "make dist"
232 rm -f *arm.ipk 232 rm -f *arm.ipk
233 rm -f *~ 233 rm -f *~
234 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim 234 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
235 mkipks kmicrokdelibs.control 235 mkipks kmicrokdelibs.control
236 mkipks korganizer.control 236 mkipks korganizer.control
237 mkipks kaddressbook.control 237 mkipks kaddressbook.control
238 ifndef BUILD_NO_MICROMAIL 238 ifndef BUILD_NO_MICROMAIL
239 mkipks kopiemail.control 239 mkipks kopiemail.control
240 endif 240 endif
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 8c6110c..da5feba 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -228,13 +228,13 @@ install:
228 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop 228 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
229 229
230dist: 230dist:
231 @echo Dont forget to do "make install" before "make dist" 231 @echo Dont forget to do "make install" before "make dist"
232 rm -f *arm.ipk 232 rm -f *arm.ipk
233 rm -f *~ 233 rm -f *~
234 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim 234 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
235 mkipks kmicrokdelibs.control 235 mkipks kmicrokdelibs.control
236 mkipks korganizer.control 236 mkipks korganizer.control
237 mkipks kaddressbook.control 237 mkipks kaddressbook.control
238 ifndef BUILD_NO_MICROMAIL 238 ifndef BUILD_NO_MICROMAIL
239 mkipks kopiemail.control 239 mkipks kopiemail.control
240 endif 240 endif
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index d7e9d0a..a5ba794 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -32,13 +32,12 @@
32{ "Refresh View","Refresh View" }, 32{ "Refresh View","Refresh View" },
33{ "Edit &Filters...","Edit &Filters..." }, 33{ "Edit &Filters...","Edit &Filters..." },
34{ "Select Filter","Select Filter" }, 34{ "Select Filter","Select Filter" },
35{ "Style:","Style:" }, 35{ "Style:","Style:" },
36{ "HTML table style.","HTML table style." }, 36{ "HTML table style.","HTML table style." },
37{ "Default Table View","Default Table View" }, 37{ "Default Table View","Default Table View" },
38{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
39{ "Show Extension Bar","Show Extension Bar" }, 38{ "Show Extension Bar","Show Extension Bar" },
40{ "None","None" }, 39{ "None","None" },
41{ "Name...","Name..." }, 40{ "Name...","Name..." },
42{ "Role:","Role:" }, 41{ "Role:","Role:" },
43{ "Organization:","Organization:" }, 42{ "Organization:","Organization:" },
44{ "Formatted name:","Formatted name:" }, 43{ "Formatted name:","Formatted name:" },
@@ -61,35 +60,12 @@
61{ "Assistant's name:","Assistant's name:" }, 60{ "Assistant's name:","Assistant's name:" },
62{ "Nick name:","Nick name:" }, 61{ "Nick name:","Nick name:" },
63{ "Spouse's name:","Spouse's name:" }, 62{ "Spouse's name:","Spouse's name:" },
64{ "Children's names:","Children's names:" }, 63{ "Children's names:","Children's names:" },
65{ "Birthday:","Birthday:" }, 64{ "Birthday:","Birthday:" },
66{ " Local Time"," Local Time" }, 65{ " Local Time"," Local Time" },
67{ "+12:00 Asia/Kamchatka","+12:00 Asia/Kamchatka" },
68{ "+11:00 Asia/Magadan","+11:00 Asia/Magadan" },
69{ "+10:00 Asia/Vladivostok","+10:00 Asia/Vladivostok" },
70{ "+09:00 Asia/Tokyo","+09:00 Asia/Tokyo" },
71{ "+08:00 Asia/Hongkong","+08:00 Asia/Hongkong" },
72{ "+07:00 Asia/Bangkok","+07:00 Asia/Bangkok" },
73{ "+06:00 Indian/Chagos","+06:00 Indian/Chagos" },
74{ "+05:00 Indian/Maldives","+05:00 Indian/Maldives" },
75{ "+04:00 Indian/Mauritius","+04:00 Indian/Mauritius" },
76{ "+03:00 Europe/Moscow","+03:00 Europe/Moscow" },
77{ "+02:00 Europe/Helsinki","+02:00 Europe/Helsinki" },
78{ " 00:00 Europe/London(UTC)"," 00:00 Europe/London(UTC)" },
79{ "-01:00 Atlantic/Azores","-01:00 Atlantic/Azores" },
80{ "-02:00 Brazil/DeNoronha","-02:00 Brazil/DeNoronha" },
81{ "-03:00 Brazil/East","-03:00 Brazil/East" },
82{ "-04:00 Brazil/West","-04:00 Brazil/West" },
83{ "-05:00 US/Eastern","-05:00 US/Eastern" },
84{ "-06:00 US/Central","-06:00 US/Central" },
85{ "-07:00 US/Mountain","-07:00 US/Mountain" },
86{ "-08:00 US/Pacific","-08:00 US/Pacific" },
87{ "-09:00 US/Alaska","-09:00 US/Alaska" },
88{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
89{ "-11:00 US/Samoa","-11:00 US/Samoa" },
90{ "Mon","Mon" }, 66{ "Mon","Mon" },
91{ "Tue","Tue" }, 67{ "Tue","Tue" },
92{ "Wed","Wed" }, 68{ "Wed","Wed" },
93{ "Thu","Thu" }, 69{ "Thu","Thu" },
94{ "Fri","Fri" }, 70{ "Fri","Fri" },
95{ "Sat","Sat" }, 71{ "Sat","Sat" },
diff --git a/bin/kdepim/kaddressbook/usertranslation.txt b/bin/kdepim/kaddressbook/usertranslation.txt
index d7e9d0a..a5ba794 100644
--- a/bin/kdepim/kaddressbook/usertranslation.txt
+++ b/bin/kdepim/kaddressbook/usertranslation.txt
@@ -32,13 +32,12 @@
32{ "Refresh View","Refresh View" }, 32{ "Refresh View","Refresh View" },
33{ "Edit &Filters...","Edit &Filters..." }, 33{ "Edit &Filters...","Edit &Filters..." },
34{ "Select Filter","Select Filter" }, 34{ "Select Filter","Select Filter" },
35{ "Style:","Style:" }, 35{ "Style:","Style:" },
36{ "HTML table style.","HTML table style." }, 36{ "HTML table style.","HTML table style." },
37{ "Default Table View","Default Table View" }, 37{ "Default Table View","Default Table View" },
38{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
39{ "Show Extension Bar","Show Extension Bar" }, 38{ "Show Extension Bar","Show Extension Bar" },
40{ "None","None" }, 39{ "None","None" },
41{ "Name...","Name..." }, 40{ "Name...","Name..." },
42{ "Role:","Role:" }, 41{ "Role:","Role:" },
43{ "Organization:","Organization:" }, 42{ "Organization:","Organization:" },
44{ "Formatted name:","Formatted name:" }, 43{ "Formatted name:","Formatted name:" },
@@ -61,35 +60,12 @@
61{ "Assistant's name:","Assistant's name:" }, 60{ "Assistant's name:","Assistant's name:" },
62{ "Nick name:","Nick name:" }, 61{ "Nick name:","Nick name:" },
63{ "Spouse's name:","Spouse's name:" }, 62{ "Spouse's name:","Spouse's name:" },
64{ "Children's names:","Children's names:" }, 63{ "Children's names:","Children's names:" },
65{ "Birthday:","Birthday:" }, 64{ "Birthday:","Birthday:" },
66{ " Local Time"," Local Time" }, 65{ " Local Time"," Local Time" },
67{ "+12:00 Asia/Kamchatka","+12:00 Asia/Kamchatka" },
68{ "+11:00 Asia/Magadan","+11:00 Asia/Magadan" },
69{ "+10:00 Asia/Vladivostok","+10:00 Asia/Vladivostok" },
70{ "+09:00 Asia/Tokyo","+09:00 Asia/Tokyo" },
71{ "+08:00 Asia/Hongkong","+08:00 Asia/Hongkong" },
72{ "+07:00 Asia/Bangkok","+07:00 Asia/Bangkok" },
73{ "+06:00 Indian/Chagos","+06:00 Indian/Chagos" },
74{ "+05:00 Indian/Maldives","+05:00 Indian/Maldives" },
75{ "+04:00 Indian/Mauritius","+04:00 Indian/Mauritius" },
76{ "+03:00 Europe/Moscow","+03:00 Europe/Moscow" },
77{ "+02:00 Europe/Helsinki","+02:00 Europe/Helsinki" },
78{ " 00:00 Europe/London(UTC)"," 00:00 Europe/London(UTC)" },
79{ "-01:00 Atlantic/Azores","-01:00 Atlantic/Azores" },
80{ "-02:00 Brazil/DeNoronha","-02:00 Brazil/DeNoronha" },
81{ "-03:00 Brazil/East","-03:00 Brazil/East" },
82{ "-04:00 Brazil/West","-04:00 Brazil/West" },
83{ "-05:00 US/Eastern","-05:00 US/Eastern" },
84{ "-06:00 US/Central","-06:00 US/Central" },
85{ "-07:00 US/Mountain","-07:00 US/Mountain" },
86{ "-08:00 US/Pacific","-08:00 US/Pacific" },
87{ "-09:00 US/Alaska","-09:00 US/Alaska" },
88{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
89{ "-11:00 US/Samoa","-11:00 US/Samoa" },
90{ "Mon","Mon" }, 66{ "Mon","Mon" },
91{ "Tue","Tue" }, 67{ "Tue","Tue" },
92{ "Wed","Wed" }, 68{ "Wed","Wed" },
93{ "Thu","Thu" }, 69{ "Thu","Thu" },
94{ "Fri","Fri" }, 70{ "Fri","Fri" },
95{ "Sat","Sat" }, 71{ "Sat","Sat" },
diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt
index a693fa2..0236b92 100644
--- a/bin/kdepim/korganizer/usertranslation.txt
+++ b/bin/kdepim/korganizer/usertranslation.txt
@@ -835,37 +835,12 @@
835{ "On day ","Am Tag " }, 835{ "On day ","Am Tag " },
836{ "%1 of ","%1 des Monats" }, 836{ "%1 of ","%1 des Monats" },
837{ "%1 of the year","%1 des Jahres" }, 837{ "%1 of the year","%1 des Jahres" },
838{ "Anonymous","Anonym" }, 838{ "Anonymous","Anonym" },
839{ "nobody@nowhere","niemand@nirgendwo" }, 839{ "nobody@nowhere","niemand@nirgendwo" },
840{ "calendar.html","calendar.html" }, 840{ "calendar.html","calendar.html" },
841{ "+01:00 Europe/Oslo(CET)","+01:00 Europa/Oslo(CET)" },
842{ " Local Time"," Locale Zeit" },
843{ "+12:00 Asia/Kamchatka","+12:00 Asien/Kamchatka" },
844{ "+11:00 Asia/Magadan","+11:00 Asien/Magadan" },
845{ "+10:00 Asia/Vladivostok","+10:00 Asien/Vladivostok" },
846{ "+09:00 Asia/Tokyo","+09:00 Asien/Tokyo" },
847{ "+08:00 Asia/Hongkong","+08:00 Asien/Hongkong" },
848{ "+07:00 Asia/Bangkok","+07:00 Asien/Bangkok" },
849{ "+06:00 Indian/Chagos","+06:00 Indien/Chagos" },
850{ "+05:00 Indian/Maldives","+05:00 Indien/Maldiven" },
851{ "+04:00 Indian/Mauritius","+04:00 Indien/Mauritius" },
852{ "+03:00 Europe/Moscow","+03:00 Europa/Moskau" },
853{ "+02:00 Europe/Helsinki","+02:00 Europa/Helsinki" },
854{ " 00:00 Europe/London(UTC)"," 00:00 Europa/London(UTC)" },
855{ "-01:00 Atlantic/Azores","-01:00 Atlantik/Azoren" },
856{ "-02:00 Brazil/DeNoronha","-02:00 Brasilien/DeNoronha" },
857{ "-03:00 Brazil/East","-03:00 Brasilien/Ost" },
858{ "-04:00 Brazil/West","-04:00 Brasilien/West" },
859{ "-05:00 US/Eastern","-05:00 US/Eastern" },
860{ "-06:00 US/Central","-06:00 US/Central" },
861{ "-07:00 US/Mountain","-07:00 US/Mountain" },
862{ "-08:00 US/Pacific","-08:00 US/Pacific" },
863{ "-09:00 US/Alaska","-09:00 US/Alaska" },
864{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
865{ "-11:00 US/Samoa","-11:00 US/Samoa" },
866{ "Unknown Name","Unbekannter Name" }, 841{ "Unknown Name","Unbekannter Name" },
867{ "unknown@nowhere","unbekannt@nirgendwo" }, 842{ "unknown@nowhere","unbekannt@nirgendwo" },
868{ "Beam via IR!","Beam via IR!" }, 843{ "Beam via IR!","Beam via IR!" },
869{ "Next Month","Nächster Monat" }, 844{ "Next Month","Nächster Monat" },
870{ "Prio","Prio" }, 845{ "Prio","Prio" },
871{ "Reparent Todo","Mache Sub-Todo" }, 846{ "Reparent Todo","Mache Sub-Todo" },
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index 82d3c02..b2651d4 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -835,37 +835,13 @@
835{ "On day ","Am Tag " }, 835{ "On day ","Am Tag " },
836{ "%1 of ","%1 des Monats" }, 836{ "%1 of ","%1 des Monats" },
837{ "%1 of the year","%1 des Jahres" }, 837{ "%1 of the year","%1 des Jahres" },
838{ "Anonymous","Anonymo" }, 838{ "Anonymous","Anonymo" },
839{ "nobody@nowhere","niemand@nirgendwo" }, 839{ "nobody@nowhere","niemand@nirgendwo" },
840{ "calendar.html","calendar.html" }, 840{ "calendar.html","calendar.html" },
841{ "+01:00 Europe/Oslo(CET)","+01:00 Europa/Oslo(CET)" },
842{ " Local Time"," Locale Zeit" }, 841{ " Local Time"," Locale Zeit" },
843{ "+12:00 Asia/Kamchatka","+12:00 Asien/Kamchatka" },
844{ "+11:00 Asia/Magadan","+11:00 Asien/Magadan" },
845{ "+10:00 Asia/Vladivostok","+10:00 Asien/Vladivostok" },
846{ "+09:00 Asia/Tokyo","+09:00 Asien/Tokyo" },
847{ "+08:00 Asia/Hongkong","+08:00 Asien/Hongkong" },
848{ "+07:00 Asia/Bangkok","+07:00 Asien/Bangkok" },
849{ "+06:00 Indian/Chagos","+06:00 Indien/Chagos" },
850{ "+05:00 Indian/Maldives","+05:00 Indien/Maldiven" },
851{ "+04:00 Indian/Mauritius","+04:00 Indien/Mauritius" },
852{ "+03:00 Europe/Moscow","+03:00 Europa/Moskau" },
853{ "+02:00 Europe/Helsinki","+02:00 Europa/Helsinki" },
854{ " 00:00 Europe/London(UTC)"," 00:00 Europa/London(UTC)" },
855{ "-01:00 Atlantic/Azores","-01:00 Atlantik/Azoren" },
856{ "-02:00 Brazil/DeNoronha","-02:00 Brasilien/DeNoronha" },
857{ "-03:00 Brazil/East","-03:00 Brasilien/Ost" },
858{ "-04:00 Brazil/West","-04:00 Brasilien/West" },
859{ "-05:00 US/Eastern","-05:00 US/Eastern" },
860{ "-06:00 US/Central","-06:00 US/Central" },
861{ "-07:00 US/Mountain","-07:00 US/Mountain" },
862{ "-08:00 US/Pacific","-08:00 US/Pacific" },
863{ "-09:00 US/Alaska","-09:00 US/Alaska" },
864{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
865{ "-11:00 US/Samoa","-11:00 US/Samoa" },
866{ "Unknown Name","Unbekannter Name" }, 842{ "Unknown Name","Unbekannter Name" },
867{ "unknown@nowhere","unbekannt@nirgendwo" }, 843{ "unknown@nowhere","unbekannt@nirgendwo" },
868{ "Beam via IR!","Beam via IR!" }, 844{ "Beam via IR!","Beam via IR!" },
869{ "Next Month","Nächster Monat" }, 845{ "Next Month","Nächster Monat" },
870{ "Prio","Prio" }, 846{ "Prio","Prio" },
871{ "Reparent Todo","Mache Sub-Todo" }, 847{ "Reparent Todo","Mache Sub-Todo" },
diff --git a/version b/version
index 0c43deb..87258cb 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "1.9.9"; version = "1.9.10";