summaryrefslogtreecommitdiffabout
Side-by-side diff
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:
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
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 8c6110c..da5feba 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -228,13 +228,13 @@ install:
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
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 @@
{ "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:" },
@@ -61,35 +60,12 @@
{ "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" },
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 @@
{ "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:" },
@@ -61,35 +60,12 @@
{ "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" },
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 @@
{ "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" },
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 @@
{ "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" },
diff --git a/version b/version
index 0c43deb..87258cb 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.9";
+version = "1.9.10";