VINklumpen

7 files changed, 3 insertions, 100 deletions

diff --git a/Makefile b/Makefile
index 8c6110c..da5feba 100644
--- a/Makefile
+++ b/Makefile
@@ -222,25 +222,25 @@ install:
 	cd bin/kdepim; make install
 	cp -r Pim $(QPEDIR)/apps
 	cp db2file/db2file $(QPEDIR)/bin/db2file
 	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
 	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
 	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
 	cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
 dist: 
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *~
-	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
+	cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
 	mkipks kmicrokdelibs.control
 	mkipks korganizer.control
 	mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	mkipks kopiemail.control
   endif
 	mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
 	mkipks phoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
 	mkipks pwmanager.control
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 8c6110c..da5feba 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -222,25 +222,25 @@ install:
 	cd bin/kdepim; make install
 	cp -r Pim $(QPEDIR)/apps
 	cp db2file/db2file $(QPEDIR)/bin/db2file
 	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
 	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
 	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
 	cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
 dist: 
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *~
-	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
+	cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
 	mkipks kmicrokdelibs.control
 	mkipks korganizer.control
 	mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	mkipks kopiemail.control
   endif
 	mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
 	mkipks phoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
 	mkipks pwmanager.control
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
@@ -26,25 +26,24 @@
 { "ExternalID","ExternalID" },
 { "Resource loaded: '%1'","Resource loaded: '%1'" },
 { "Select View","Select View" },
 { "Modify View...","Modify View..." },
 { "Add View...","Add View..." },
 { "Delete View","Delete View" },
 { "Refresh View","Refresh View" },
 { "Edit &Filters...","Edit &Filters..." },
 { "Select Filter","Select Filter" },
 { "Style:","Style:" },
 { "HTML table style.","HTML table style." },
 { "Default Table View","Default Table View" },
-{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "Show Extension Bar","Show Extension Bar" },
 { "None","None" },
 { "Name...","Name..." },
 { "Role:","Role:" },
 { "Organization:","Organization:" },
 { "Formatted name:","Formatted name:" },
 { "Edit Phone Numbers...","Edit Phone Numbers..." },
 { "Categories","Categories" },
 { "Public","Public" },
 { "Private","Private" },
 { "Confidential","Confidential" },
 { "&General","&General" },
@@ -55,47 +54,24 @@
 { "&IM address:","&IM address:" },
 { "&Address","&Address" },
 { "Department:","Department:" },
 { "Office:","Office:" },
 { "Profession:","Profession:" },
 { "Manager's name:","Manager's name:" },
 { "Assistant's name:","Assistant's name:" },
 { "Nick name:","Nick name:" },
 { "Spouse's name:","Spouse's name:" },
 { "Children's names:","Children's names:" },
 { "Birthday:","Birthday:" },
 { " Local Time"," Local Time" },
-{ "+12:00 Asia/Kamchatka","+12:00 Asia/Kamchatka" },
-{ "+11:00 Asia/Magadan","+11:00 Asia/Magadan" },
-{ "+10:00 Asia/Vladivostok","+10:00 Asia/Vladivostok" },
-{ "+09:00 Asia/Tokyo","+09:00 Asia/Tokyo" },
-{ "+08:00 Asia/Hongkong","+08:00 Asia/Hongkong" },
-{ "+07:00 Asia/Bangkok","+07:00 Asia/Bangkok" },
-{ "+06:00 Indian/Chagos","+06:00 Indian/Chagos" },
-{ "+05:00 Indian/Maldives","+05:00 Indian/Maldives" },
-{ "+04:00 Indian/Mauritius","+04:00 Indian/Mauritius" },
-{ "+03:00 Europe/Moscow","+03:00 Europe/Moscow" },
-{ "+02:00 Europe/Helsinki","+02:00 Europe/Helsinki" },
-{ " 00:00 Europe/London(UTC)"," 00:00 Europe/London(UTC)" },
-{ "-01:00 Atlantic/Azores","-01:00 Atlantic/Azores" },
-{ "-02:00 Brazil/DeNoronha","-02:00 Brazil/DeNoronha" },
-{ "-03:00 Brazil/East","-03:00 Brazil/East" },
-{ "-04:00 Brazil/West","-04:00 Brazil/West" },
-{ "-05:00 US/Eastern","-05:00 US/Eastern" },
-{ "-06:00 US/Central","-06:00 US/Central" },
-{ "-07:00 US/Mountain","-07:00 US/Mountain" },
-{ "-08:00 US/Pacific","-08:00 US/Pacific" },
-{ "-09:00 US/Alaska","-09:00 US/Alaska" },
-{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
-{ "-11:00 US/Samoa","-11:00 US/Samoa" },
 { "Mon","Mon" },
 { "Tue","Tue" },
 { "Wed","Wed" },
 { "Thu","Thu" },
 { "Fri","Fri" },
 { "Sat","Sat" },
 { "Sun","Sun" },
 { "January","January" },
 { "February","February" },
 { "March","March" },
 { "April","April" },
 { "May","May" },
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
@@ -26,25 +26,24 @@
 { "ExternalID","ExternalID" },
 { "Resource loaded: '%1'","Resource loaded: '%1'" },
 { "Select View","Select View" },
 { "Modify View...","Modify View..." },
 { "Add View...","Add View..." },
 { "Delete View","Delete View" },
 { "Refresh View","Refresh View" },
 { "Edit &Filters...","Edit &Filters..." },
 { "Select Filter","Select Filter" },
 { "Style:","Style:" },
 { "HTML table style.","HTML table style." },
 { "Default Table View","Default Table View" },
-{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "Show Extension Bar","Show Extension Bar" },
 { "None","None" },
 { "Name...","Name..." },
 { "Role:","Role:" },
 { "Organization:","Organization:" },
 { "Formatted name:","Formatted name:" },
 { "Edit Phone Numbers...","Edit Phone Numbers..." },
 { "Categories","Categories" },
 { "Public","Public" },
 { "Private","Private" },
 { "Confidential","Confidential" },
 { "&General","&General" },
@@ -55,47 +54,24 @@
 { "&IM address:","&IM address:" },
 { "&Address","&Address" },
 { "Department:","Department:" },
 { "Office:","Office:" },
 { "Profession:","Profession:" },
 { "Manager's name:","Manager's name:" },
 { "Assistant's name:","Assistant's name:" },
 { "Nick name:","Nick name:" },
 { "Spouse's name:","Spouse's name:" },
 { "Children's names:","Children's names:" },
 { "Birthday:","Birthday:" },
 { " Local Time"," Local Time" },
-{ "+12:00 Asia/Kamchatka","+12:00 Asia/Kamchatka" },
-{ "+11:00 Asia/Magadan","+11:00 Asia/Magadan" },
-{ "+10:00 Asia/Vladivostok","+10:00 Asia/Vladivostok" },
-{ "+09:00 Asia/Tokyo","+09:00 Asia/Tokyo" },
-{ "+08:00 Asia/Hongkong","+08:00 Asia/Hongkong" },
-{ "+07:00 Asia/Bangkok","+07:00 Asia/Bangkok" },
-{ "+06:00 Indian/Chagos","+06:00 Indian/Chagos" },
-{ "+05:00 Indian/Maldives","+05:00 Indian/Maldives" },
-{ "+04:00 Indian/Mauritius","+04:00 Indian/Mauritius" },
-{ "+03:00 Europe/Moscow","+03:00 Europe/Moscow" },
-{ "+02:00 Europe/Helsinki","+02:00 Europe/Helsinki" },
-{ " 00:00 Europe/London(UTC)"," 00:00 Europe/London(UTC)" },
-{ "-01:00 Atlantic/Azores","-01:00 Atlantic/Azores" },
-{ "-02:00 Brazil/DeNoronha","-02:00 Brazil/DeNoronha" },
-{ "-03:00 Brazil/East","-03:00 Brazil/East" },
-{ "-04:00 Brazil/West","-04:00 Brazil/West" },
-{ "-05:00 US/Eastern","-05:00 US/Eastern" },
-{ "-06:00 US/Central","-06:00 US/Central" },
-{ "-07:00 US/Mountain","-07:00 US/Mountain" },
-{ "-08:00 US/Pacific","-08:00 US/Pacific" },
-{ "-09:00 US/Alaska","-09:00 US/Alaska" },
-{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
-{ "-11:00 US/Samoa","-11:00 US/Samoa" },
 { "Mon","Mon" },
 { "Tue","Tue" },
 { "Wed","Wed" },
 { "Thu","Thu" },
 { "Fri","Fri" },
 { "Sat","Sat" },
 { "Sun","Sun" },
 { "January","January" },
 { "February","February" },
 { "March","March" },
 { "April","April" },
 { "May","May" },
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
@@ -829,49 +829,24 @@
 { "Save Journal/Description...","Speichere Journal/Details..." },
 { "This saves the text/details of selected\nJournals and Events/Todos\nto a text file.","Das speichert den Text bzw.\ndie Details von selektierten\nJournalen und Events/Todos\nin eine Textdatei." },
 { "Continue","Weitermachen" },
 { " birthdays/anniversaries added!"," Geburts-/Jahrestage hinzugefügt" },
 { "Attendee:","Teilnehmer:" },
 { "Click OK to search ->","Klicke zum Suchen auf OK ->" },
 { "On day ","Am Tag " },
 { "%1 of ","%1 des Monats" },
 { "%1 of the year","%1 des Jahres" },
 { "Anonymous","Anonym" },
 { "nobody@nowhere","niemand@nirgendwo" },
 { "calendar.html","calendar.html" },
-{ "+01:00 Europe/Oslo(CET)","+01:00 Europa/Oslo(CET)" },
-{ " Local Time"," Locale Zeit" },
-{ "+12:00 Asia/Kamchatka","+12:00 Asien/Kamchatka" },
-{ "+11:00 Asia/Magadan","+11:00 Asien/Magadan" },
-{ "+10:00 Asia/Vladivostok","+10:00 Asien/Vladivostok" },
-{ "+09:00 Asia/Tokyo","+09:00 Asien/Tokyo" },
-{ "+08:00 Asia/Hongkong","+08:00 Asien/Hongkong" },
-{ "+07:00 Asia/Bangkok","+07:00 Asien/Bangkok" },
-{ "+06:00 Indian/Chagos","+06:00 Indien/Chagos" },
-{ "+05:00 Indian/Maldives","+05:00 Indien/Maldiven" },
-{ "+04:00 Indian/Mauritius","+04:00 Indien/Mauritius" },
-{ "+03:00 Europe/Moscow","+03:00 Europa/Moskau" },
-{ "+02:00 Europe/Helsinki","+02:00 Europa/Helsinki" },
-{ " 00:00 Europe/London(UTC)"," 00:00 Europa/London(UTC)" },
-{ "-01:00 Atlantic/Azores","-01:00 Atlantik/Azoren" },
-{ "-02:00 Brazil/DeNoronha","-02:00 Brasilien/DeNoronha" },
-{ "-03:00 Brazil/East","-03:00 Brasilien/Ost" },
-{ "-04:00 Brazil/West","-04:00 Brasilien/West" },
-{ "-05:00 US/Eastern","-05:00 US/Eastern" },
-{ "-06:00 US/Central","-06:00 US/Central" },
-{ "-07:00 US/Mountain","-07:00 US/Mountain" },
-{ "-08:00 US/Pacific","-08:00 US/Pacific" },
-{ "-09:00 US/Alaska","-09:00 US/Alaska" },
-{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
-{ "-11:00 US/Samoa","-11:00 US/Samoa" },
 { "Unknown Name","Unbekannter Name" },
 { "unknown@nowhere","unbekannt@nirgendwo" },
 { "Beam via IR!","Beam via IR!" },
 { "Next Month","Nächster Monat" },
 { "Prio","Prio" },
 { "Reparent Todo","Mache Sub-Todo" },
 { "tomorrow","morgen" },
 { "today","heute" },
 { "yesterday","gestern" },
 { "Ok","Ok" },
 { "Ok+Agenda","Ok+Agenda" },
 { "Email","Email" },
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index 82d3c02..b2651d4 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -829,49 +829,25 @@
 { "Save Journal/Description...","Speichere Journal/Details..." },
 { "This saves the text/details of selected\nJournals and Events/Todos\nto a text file.","Das speichert den Text bzw.\ndie Details von selektierten\nJournalen und Events/Todos\nin eine Textdatei." },
 { "Continue","Weitermachen" },
 { " birthdays/anniversaries added!"," Geburts-/Jahrestage hinzugefügt" },
 { "Attendee:","Teilnehmer:" },
 { "Click OK to search ->","Klicke zum Suchen auf OK ->" },
 { "On day ","Am Tag " },
 { "%1 of ","%1 des Monats" },
 { "%1 of the year","%1 des Jahres" },
 { "Anonymous","Anonymo" },
 { "nobody@nowhere","niemand@nirgendwo" },
 { "calendar.html","calendar.html" },
-{ "+01:00 Europe/Oslo(CET)","+01:00 Europa/Oslo(CET)" },
 { " Local Time"," Locale Zeit" },
-{ "+12:00 Asia/Kamchatka","+12:00 Asien/Kamchatka" },
-{ "+11:00 Asia/Magadan","+11:00 Asien/Magadan" },
-{ "+10:00 Asia/Vladivostok","+10:00 Asien/Vladivostok" },
-{ "+09:00 Asia/Tokyo","+09:00 Asien/Tokyo" },
-{ "+08:00 Asia/Hongkong","+08:00 Asien/Hongkong" },
-{ "+07:00 Asia/Bangkok","+07:00 Asien/Bangkok" },
-{ "+06:00 Indian/Chagos","+06:00 Indien/Chagos" },
-{ "+05:00 Indian/Maldives","+05:00 Indien/Maldiven" },
-{ "+04:00 Indian/Mauritius","+04:00 Indien/Mauritius" },
-{ "+03:00 Europe/Moscow","+03:00 Europa/Moskau" },
-{ "+02:00 Europe/Helsinki","+02:00 Europa/Helsinki" },
-{ " 00:00 Europe/London(UTC)"," 00:00 Europa/London(UTC)" },
-{ "-01:00 Atlantic/Azores","-01:00 Atlantik/Azoren" },
-{ "-02:00 Brazil/DeNoronha","-02:00 Brasilien/DeNoronha" },
-{ "-03:00 Brazil/East","-03:00 Brasilien/Ost" },
-{ "-04:00 Brazil/West","-04:00 Brasilien/West" },
-{ "-05:00 US/Eastern","-05:00 US/Eastern" },
-{ "-06:00 US/Central","-06:00 US/Central" },
-{ "-07:00 US/Mountain","-07:00 US/Mountain" },
-{ "-08:00 US/Pacific","-08:00 US/Pacific" },
-{ "-09:00 US/Alaska","-09:00 US/Alaska" },
-{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
-{ "-11:00 US/Samoa","-11:00 US/Samoa" },
 { "Unknown Name","Unbekannter Name" },
 { "unknown@nowhere","unbekannt@nirgendwo" },
 { "Beam via IR!","Beam via IR!" },
 { "Next Month","Nächster Monat" },
 { "Prio","Prio" },
 { "Reparent Todo","Mache Sub-Todo" },
 { "tomorrow","morgen" },
 { "today","heute" },
 { "yesterday","gestern" },
 { "Ok","Ok" },
 { "Ok+Agenda","Ok+Agenda" },
 { "Email","Email" },
diff --git a/version b/version
index 0c43deb..87258cb 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.9";
+version = "1.9.10";