rev 11213 - in trunk/packages/kdepim/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Sun Jun 29 18:21:16 UTC 2008
Author: ana
Date: 2008-06-29 18:21:15 +0000 (Sun, 29 Jun 2008)
New Revision: 11213
Added:
trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff
Modified:
trunk/packages/kdepim/debian/changelog
Log:
add branch pull, mega-commit follows
Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog 2008-06-29 18:10:57 UTC (rev 11212)
+++ trunk/packages/kdepim/debian/changelog 2008-06-29 18:21:15 UTC (rev 11213)
@@ -21,9 +21,14 @@
+++ Changes by Ana Beatriz Guerrero Lopez:
+ * KDE_3_5_BRANCH update (up to r825749): contains a lot of stuff, including:
+ - Fix for when replying to address with umlaut and comma, it creates two
+ addressees. (Closes: #397635)
+ -
+
* Add Conflicts to kdepim-dev with previous knode versions. (Closes: #475351)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 24 Jun 2008 15:39:43 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 29 Jun 2008 19:10:03 +0200
kdepim (4:3.5.9-2) unstable; urgency=low
Added: trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff (rev 0)
+++ trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff 2008-06-29 18:21:15 UTC (rev 11213)
@@ -0,0 +1,20436 @@
+#DPATCHLEVEL=0
+Index: akregator/src/mk4storage/metakit/include/mk4.h
+===================================================================
+--- akregator/src/mk4storage/metakit/include/mk4.h.orig 2006-07-22 10:14:06.000000000 +0200
++++ akregator/src/mk4storage/metakit/include/mk4.h 2008-06-29 20:10:36.000000000 +0200
+@@ -101,7 +101,7 @@
+ // and here's the other end of the scale...
+ #if !defined (_WIN32) && !defined (q4_LONG64)
+ #if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
+- defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || \
++ defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || defined (__mips64) || \
+ (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
+ #define q4_LONG64 1
+ #endif
+Index: akregator/src/mk4storage/metakit/src/header.h
+===================================================================
+--- akregator/src/mk4storage/metakit/src/header.h.orig 2005-09-10 10:23:37.000000000 +0200
++++ akregator/src/mk4storage/metakit/src/header.h 2008-06-29 20:10:36.000000000 +0200
+@@ -139,12 +139,6 @@
+
+ typedef unsigned char t4_byte; // create typedefs for t4_byte, etc.
+
+-#if SIZEOF_LONG == 8
+-typedef int t4_i32; // longs are 64b, so int must be 32b
+-#else
+-typedef long t4_i32; // longs aren't 64b, so they are 32b
+-#endif
+-
+ /////////////////////////////////////////////////////////////////////////////
+ // Include header files which contain additional os/cpu/ide/fw specifics
+
+Index: akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
+===================================================================
+--- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop.orig 2008-02-13 10:39:27.000000000 +0100
++++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=Metakit geymslu bakendi
+ Name[it]=Backend archiviazione metakit
+ Name[ja]=メタã‚ットストレージãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰
++Name[ka]=Metakit მეხსიერების ბუფერი
+ Name[kk]=Metakit архивтеу бағдарламаÑÑ‹
+ Name[km]=កម្មវិធី​ážáž¶áž„​ក្រោយ​សម្រាប់​រក្សាទុក (Metakit)
+ Name[ko]=Metakit ì €ìž¥ì†Œ 백엔드
+@@ -68,6 +69,7 @@
+ Comment[is]=Ãforrit fyrir Akregator
+ Comment[it]=Plugin per Akregator
+ Comment[ja]=Akregator 用プラグイン
++Comment[ka]=Akregator-ის მáƒáƒ“ული
+ Comment[kk]=Akregator-дың плагин модулі
+ Comment[km]=កម្មវិធី​ជំនួយ Akregator
+ Comment[ko]=Akregator 플러그ì¸
+@@ -91,7 +93,8 @@
+ Comment[sv]=Insticksprogram för Akregator
+ Comment[tr]=Akregator Eklentisi
+ Comment[uk]=Втулок Ð´Ð»Ñ Akregator
+-Comment[uz]=Akregator учун плагин
++Comment[uz]=Akregator uchun plagin
++Comment[uz at cyrillic]=Akregator учун плагин
+ Comment[zh_CN]=Akregator æ’件
+ Comment[zh_TW]=Akregator 外掛程å¼
+ ServiceTypes=Akregator/Plugin
+Index: akregator/src/akregator_plugin.desktop
+===================================================================
+--- akregator/src/akregator_plugin.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ akregator/src/akregator_plugin.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Comment[is]=Ãforrit fyrir Akregator
+ Comment[it]=Plugin per Akregator
+ Comment[ja]=Akregator 用プラグイン
++Comment[ka]=Akregator-ის მáƒáƒ“ული
+ Comment[kk]=Akregator-дың плагин модулі
+ Comment[km]=កម្មវិធី​ជំនួយ Akregator
+ Comment[ko]=Akregator 플러그ì¸
+@@ -48,7 +49,8 @@
+ Comment[sv]=Insticksprogram för Akregator
+ Comment[tr]=Akregator Eklentisi
+ Comment[uk]=Втулок Ð´Ð»Ñ Akregator
+-Comment[uz]=Akregator учун плагин
++Comment[uz]=Akregator uchun plagin
++Comment[uz at cyrillic]=Akregator учун плагин
+ Comment[zh_CN]=Akregator æ’件
+ Comment[zh_TW]=Akregator 外掛程å¼
+
+Index: akregator/src/akregator.desktop
+===================================================================
+--- akregator/src/akregator.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ akregator/src/akregator.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ GenericName[is]=RSS fréttaforrit
+ GenericName[it]=Lettore Fonti RSS
+ GenericName[ja]=RSS ニュースリーダー
++GenericName[ka]=RSS კვების წáƒáƒ›áƒ™áƒ˜áƒ—ხველი
+ GenericName[kk]=RSS жаңалықтарын оқу
+ GenericName[km]=កម្មវិធី​អាន​មážáž·áž–áŸážáŸŒáž˜áž¶áž“ RSS
+ GenericName[ko]=RSS 피드 리ë”
+@@ -53,7 +54,8 @@
+ GenericName[ta]=RSS பீஃட௠வாசிபà¯à®ªà®¾à®©à¯
+ GenericName[tr]=RSS Haber Kaynağı Okuyucu
+ GenericName[uk]=Програма Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð¿Ð¾Ð´Ð°Ñ‡ RSS
+-GenericName[uz]=RSS Ñнгиликларни ўқувчи
++GenericName[uz]=RSS yangiliklarni oʻquvchi
++GenericName[uz at cyrillic]=RSS Ñнгиликларни ўқувчи
+ GenericName[zh_CN]=RSS ç§å阅读器
+ GenericName[zh_TW]=RSS Feed 閱讀器
+ Comment=An RSS Aggregator for KDE
+@@ -78,6 +80,7 @@
+ Comment[is]=RSS fréttaforrit fyrir KDE
+ Comment[it]=Un concentratore KDE per RSS
+ Comment[ja]=KDE 用 RSS アグリゲータ
++Comment[ka]= RSS áƒáƒ’რეგáƒáƒ¢áƒ˜ KDE-სთვის
+ Comment[kk]=KDE-нің RSS жаңалық агрегаторы
+ Comment[km]=កម្មវិធី​អាន RSS សម្រាប់ KDE
+ Comment[ko]=KDEìš© RSS 리ë”
+@@ -100,7 +103,8 @@
+ Comment[ta]=கேடியிகà¯à®•à®¾à®© ஒர௠RSS சேரà¯à®ªà¯à®ªà®¾à®©à¯
+ Comment[tr]=Bir KDE RSS Okuyucusu
+ Comment[uk]=Ðгрегатор RSS Ð´Ð»Ñ KDE
+-Comment[uz]=KDE учун RSS Ñнгиликларни ўқувчи
++Comment[uz]=KDE uchun RSS yangiliklarni oʻquvchi
++Comment[uz at cyrillic]=KDE учун RSS Ñнгиликларни ўқувчи
+ Comment[zh_CN]=KDE RSS 新闻收集器
+ Comment[zh_TW]=KDE 的 RSS 收集器
+ Terminal=false
+Index: akregator/src/eventsrc
+===================================================================
+--- akregator/src/eventsrc.orig 2008-02-13 10:39:28.000000000 +0100
++++ akregator/src/eventsrc 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Name[is]=Straum bætt við
+ Name[it]=Aggiunta fonte
+ Name[ja]=フィード追åŠ
++Name[ka]=დáƒáƒ›áƒáƒ¢áƒ”ბულირკვებáƒ
+ Name[kk]=Қор қоÑылды
+ Name[km]=បាន​បន្ážáŸ‚ម​មážáž·áž–áŸážáŸŒáž˜áž¶áž“
+ Name[ko]=피드 추가ë¨
+@@ -52,7 +53,8 @@
+ Name[ta]=பீஃட௠சேரà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Name[tr]=Haber kaynağı eklendi
+ Name[uk]=Подачу додано
+-Name[uz]=Янгиликлар таÑмаÑи қўшилди
++Name[uz]=Yangiliklar tasmasi qoʻshildi
++Name[uz at cyrillic]=Янгиликлар таÑмаÑи қўшилди
+ Name[zh_CN]=æ·»åŠ äº†æ–°é—»æº
+ Name[zh_TW]=å·²åŠ å…¥ Feed
+ Comment=A new feed was remotely added to Akregator
+@@ -76,6 +78,7 @@
+ Comment[is]=Nýjum straum var bætt við Akregator
+ Comment[it]=Una nuova fonte è stata aggiunta ad Akregator da remoto
+ Comment[ja]=æ–°è¦ãƒ•ã‚£ãƒ¼ãƒ‰ãŒãƒªãƒ¢ãƒ¼ãƒˆã§ Akregator ã«è¿½åŠ ã•ã‚Œã¾ã—ãŸ
++Comment[ka]=Akregator-ის სიáƒáƒ¡ დისტáƒáƒœáƒªáƒ˜áƒ£áƒ áƒáƒ“ áƒáƒ®áƒáƒšáƒ˜ კვებრდáƒáƒ”მáƒáƒ¢áƒ
+ Comment[kk]=Akregator-ға қашықтан жаңа қор қоÑылды
+ Comment[km]=បាន​បន្ážáŸ‚ម​មážáž·áž–áŸážáŸŒáž˜áž¶áž“​ážáŸ’មី​មួយ​ពី​ចម្ងាយ​ទៅ Akregator
+ Comment[ko]=Akregatorì— í”¼ë“œê°€ ì›ê²©ìœ¼ë¡œ 추가ë¨
+@@ -99,7 +102,8 @@
+ Comment[ta]=Akregatorகà¯à®•à¯ ஒர௠பà¯à®¤à®¿à®¯ உளà¯à®³à¯€à®Ÿà¯ சேரà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Akregator'a yeni bir haber kaynağı eklendi
+ Comment[uk]=Ðову подачу було віддалено додано до Akregator
+-Comment[uz]=Akregator даÑтурига Ñнги Ñнгиликлар таÑмаÑи қўшилди
++Comment[uz]=Akregator dasturiga yangi yangiliklar tasmasi qoʻshildi
++Comment[uz at cyrillic]=Akregator даÑтурига Ñнги Ñнгиликлар таÑмаÑи қўшилди
+ Comment[zh_CN]=æ–°é—»æºè¿œç¨‹æ·»åŠ 进了 Akregator
+ Comment[zh_TW]=已從é ç«¯åŠ å…¥æ–°çš„ feed 到 Akregator
+ default_presentation=4
+@@ -131,6 +135,7 @@
+ Name[is]=Nýjar greinar
+ Name[it]=Nuovi articoli
+ Name[ja]=æ–°è¦è¨˜äº‹
++Name[ka]=áƒáƒ®áƒáƒšáƒ˜ სტáƒáƒ¢áƒ˜áƒ”ბი
+ Name[kk]=Жаңа мақалалар
+ Name[km]=អážáŸ’ážáž”ទ​ážáŸ’មី
+ Name[ko]=새 글
+@@ -155,7 +160,8 @@
+ Name[ta]= பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿à®•à®³à¯
+ Name[tr]=Yeni Haberler
+ Name[uk]=Ðові Ñтатті
+-Name[uz]=Янги мақолалар
++Name[uz]=Yangi maqolalar
++Name[uz at cyrillic]=Янги мақолалар
+ Name[zh_CN]=新闻文ç«
+ Name[zh_TW]=æ–°æ–‡ç«
+ Comment=New articles were fetched
+@@ -182,6 +188,7 @@
+ Comment[is]=Nýjar greinar voru sóttar
+ Comment[it]=I nuovi articoli sono stati recuperati
+ Comment[ja]=æ–°è¦è¨˜äº‹ã‚’å–å¾—ã—ã¾ã—ãŸ
++Comment[ka]=მიღებულირáƒáƒ®áƒáƒšáƒ˜ სტáƒáƒ¢áƒ˜áƒ”ბი
+ Comment[kk]=Жаңа мақалалар қабылданды
+ Comment[km]=បាន​ប្រមូល​អážáŸ’ážáž”ទ​ážáŸ’មី
+ Comment[ko]=새 ê¸€ì„ ê°€ì ¸ì˜´
+Index: kmobile/libkmobile.desktop
+===================================================================
+--- kmobile/libkmobile.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kmobile/libkmobile.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[is]=Hrár KDE vélbúnaðarrekill fyrir farsÃma og lófatölvur
+ Name[it]=KDE driver hardware di basso livello per dispositivi portatili
+ Name[ja]=KDE モãƒã‚¤ãƒ«æ©Ÿå™¨ä½Žãƒ¬ãƒ™ãƒ«ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒ‰ãƒ©ã‚¤ãƒ
++Name[ka]=KDE მáƒáƒ‘ილური მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის დáƒáƒ‘áƒáƒšáƒ“áƒáƒœáƒ˜áƒáƒœáƒ˜ ხისტი დრáƒáƒ˜áƒ•áƒ”რი
+ Name[kk]=KDE-нің қалта құрылғы жабдықтың төмен деңгейлі драйвері
+ Name[km]=កម្មវិធី​បញ្ជា​ផ្នែករឹង​កម្រិážâ€‹áž‘ាប​របស់​ឧបករណáŸâ€‹áž…áž›áŸáž KDE
+ Name[lt]=KDE mobiliųjų įrenginių žemo lygmens aparatinės įrangos tvarkyklė
+Index: kmobile/devices/gnokii/libkmobile_gnokii.desktop
+===================================================================
+--- kmobile/devices/gnokii/libkmobile_gnokii.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kmobile/devices/gnokii/libkmobile_gnokii.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -28,6 +28,7 @@
+ Name[is]=FarsÃmi eða lófatölva (gnokii)
+ Name[it]=Telefono cellulare o organizer (gnokii)
+ Name[ja]=æºå¸¯é›»è©±ã¾ãŸã¯ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ç®¡ç† (gnokii)
++Name[ka]=მáƒáƒ‘ილური ტელეფáƒáƒœáƒ˜ áƒáƒœ áƒáƒ გáƒáƒœáƒ˜áƒ–áƒáƒ¢áƒáƒ ი(gnokii)
+ Name[kk]=Қалта телефон не ҰйымдаÑтырғыш (gnokii)
+ Name[km]=កម្មវិធី​រៀបចំ​ទូរសáŸáž–្ទ​ចលáŸáž (gnokii)
+ Name[lt]=Mobilus telefonas ar asmeninÄ—s info tvarkyklÄ— (gnokii)
+@@ -50,7 +51,8 @@
+ Name[tg]=Телефони мобилӣ ё органайзери (gnokii)
+ Name[tr]=Cep Telefonu ya da Organizer (gnokii)
+ Name[uk]=Мобільний телефон та тижневик (gnokii)
+-Name[uz]=УÑли телефон ёки органайзер (gnokii)
++Name[uz]=Uyali telefon yoki organayzer (gnokii)
++Name[uz at cyrillic]=УÑли телефон ёки органайзер (gnokii)
+ Name[zh_CN]=移动电è¯æˆ– PDA(gnokii)
+ Name[zh_TW]=行動電話或數ä½åŠ©ç†(gnokii)
+ Comment=This driver supports many NOKIA and other mobile phones via the gnokii library
+@@ -77,6 +79,7 @@
+ Comment[is]=Þessi rekill styður marga farsÃma frá NOKIA og fleiri gegnum gnokii aðgerðasafnið
+ Comment[it]=Questo driver supporta molti NOKIA e altri telefoni cellulari tramite la libreria gnokii
+ Comment[ja]=ã“ã®ãƒ‰ãƒ©ã‚¤ãƒã¯ gnokii ライブラリを介ã—㦠NOKIA ãŠã‚ˆã³ä»–社製ã®æºå¸¯é›»è©±ã‚’幅広ãサãƒãƒ¼ãƒˆã—ã¾ã™
++Comment[ka]=ეს დრáƒáƒ˜áƒ•áƒ”რი მხáƒáƒ ს უáƒáƒ”რს Nokia-ს მრáƒáƒ•áƒáƒš დრსხვრტელეფáƒáƒœáƒ”ბს gnokii ბიბლიáƒáƒ—ეკის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით
+ Comment[kk]=Бұл көп NOKIA мен баÑқа қалта құрылғыларды, gnokii жиыны арқылы, қамтитын драйвер
+ Comment[km]=កម្មវិធី​បញ្ជា​នáŸáŸ‡â€‹áž‚ាំទ្រ​ប្រភáŸáž‘​ទូរសáŸáž–្ទ​ណូគៀ និង​ទូរសáŸáž–្ទ​ផ្សáŸáž„ៗ​ទៀážâ€‹áž‡áž¶áž…្រើន​ážáž¶áž˜â€‹ážšáž™áŸˆâ€‹áž”ណ្ណាលáŸáž™ gnokii
+ Comment[lt]=Ši tvarkyklė palaiko daugelį NOKIA ir kitų telefonų pasinaudodama gnokii biblioteka
+@@ -86,7 +89,7 @@
+ Comment[ne]=यो डà¥à¤°à¤¾à¤‡à¤à¤°à¤²à¥‡ जिनोकी लाइबà¥à¤°à¥‡à¤°à¥€à¤¬à¤¾à¤Ÿ धेरै नोकिया र अनà¥à¤¯ मोबाइल फोन समरà¥à¤¥à¤¨ गरà¥à¤›
+ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gnokii-bibliotheek
+ Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gnokii-biblioteket
+-Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gnokii
++Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowych Nokia i innych za pomocą biblioteki gnokii
+ Comment[pt]=Este controlador suportar muitos NOKIAs, bem como outros telemóveis, com a biblioteca 'gnokii'
+ Comment[pt_BR]=Este driver suporta muitos telefones móveis, NOKIA e outros, via biblioteca gnokii
+ Comment[ru]=Ðтот драйвер поддерживает множеÑтво моделей мобильных телефонов Nokia и других производителей через библиотеку gnokii
+Index: kmobile/devices/skeleton/libkmobile_skeleton.desktop
+===================================================================
+--- kmobile/devices/skeleton/libkmobile_skeleton.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kmobile/devices/skeleton/libkmobile_skeleton.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=Grunntæki
+ Name[it]=Dispositivo skeleton
+ Name[ja]=スケルトンデãƒã‚¤ã‚¹
++Name[ka]=მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის ჩáƒáƒœáƒ©áƒ®áƒ˜
+ Name[kk]=Қаңқалы құрылғы
+ Name[km]=ឧបករណáŸâ€‹áž‚្រោង
+ Name[lt]=Įrenginio skeletas
+@@ -78,6 +79,7 @@
+ Comment[is]=Grunn farsÃmi eða lófatölva
+ Comment[it]=Dispositivo portatile skeleton
+ Comment[ja]=モãƒã‚¤ãƒ«ã‚¹ã‚±ãƒ«ãƒˆãƒ³ãƒ‡ãƒã‚¤ã‚¹
++Comment[ka]=მáƒáƒ‘ილურის ჩáƒáƒœáƒ©áƒ®áƒ˜áƒ¡ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ
+ Comment[kk]=Қалта қаңқалы құрылғы
+ Comment[km]=ឧបករណáŸâ€‹áž‚្រោង​ចលáŸáž
+ Comment[lt]=Mobilaus įrenginio skeletas
+Index: kmobile/devices/gammu/libkmobile_gammu.desktop
+===================================================================
+--- kmobile/devices/gammu/libkmobile_gammu.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kmobile/devices/gammu/libkmobile_gammu.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -28,6 +28,7 @@
+ Name[is]=FarsÃmi eða lófatölva (gammu)
+ Name[it]=Organizer o telefono cellulare (gammu)
+ Name[ja]=æºå¸¯é›»è©±ã¾ãŸã¯ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ç®¡ç† (gammu)
++Name[ka]=მáƒáƒ‘ილური ტელეფáƒáƒœáƒ˜ áƒáƒœ áƒáƒ გáƒáƒœáƒ˜áƒ–áƒáƒ¢áƒáƒ ი(gammu)
+ Name[kk]=Қалта телефон не ҰйымдаÑтырғыш (gammu)
+ Name[km]=កម្មវិធី​រៀបចំ​ទូរសáŸáž–្ទ​ចលáŸáž (gammu)
+ Name[lt]=Mobilus telefonas ar asmeninÄ—s info tvarkyklÄ— (gammu)
+@@ -50,7 +51,8 @@
+ Name[tg]=Телефони мобилӣ ё органайзер (gammu)
+ Name[tr]=Cep Telefonu ya da Organizer (gammu)
+ Name[uk]=Мобільний телефон та тижневик (gammu)
+-Name[uz]=УÑли телефон ёки органайзер (gammu)
++Name[uz]=Uyali telefon yoki organayzer (gammu)
++Name[uz at cyrillic]=УÑли телефон ёки органайзер (gammu)
+ Name[zh_CN]=移动电è¯æˆ– PDA(gammu)
+ Name[zh_TW]=行動電話或數ä½åŠ©ç†(gammu)
+ Comment=This driver supports many NOKIA and other mobile phones via the gammu library
+@@ -77,6 +79,7 @@
+ Comment[is]=Þessi rekill styður marga NOKIA og aðra farsÃma gegnum gammu aðgerðasafnið
+ Comment[it]=Questo driver supporta molti NOKIA e altri telefoni cellulari tramite la libreria gammu.
+ Comment[ja]=ã“ã®ãƒ‰ãƒ©ã‚¤ãƒã¯ gammu ライブラリを介ã—㦠NOKIA ãŠã‚ˆã³ä»–社製ã®æºå¸¯é›»è©±ã‚’幅広ãサãƒãƒ¼ãƒˆã—ã¾ã™
++Comment[ka]=ეს დრáƒáƒ˜áƒ•áƒ”რი მხáƒáƒ ს უáƒáƒ”რს Nokia-ს მრáƒáƒ•áƒáƒš დრსხვრტელეფáƒáƒœáƒ”ბს gammu ბიბლიáƒáƒ—ეკის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით
+ Comment[kk]=Бұл көп NOKIA мен баÑқа қалта құрылғыларды, gammu жиыны арқылы, қамтитын драйвер
+ Comment[km]=កម្មវិធី​បញ្ជា​នáŸáŸ‡â€‹áž‚ាំទ្រ​ប្រភáŸáž‘​ទូរសáŸáž–្ទ​ណូគៀ និងទូរសáŸáž–្ទ​ផ្សáŸáž„ៗ​ទៀážâ€‹áž‡áž¶áž…្រើន​ážáž¶áž˜â€‹ážšáž™áŸˆâ€‹áž”ណ្ណាលáŸáž™ gammu
+ Comment[lt]=Ši tvarkyklė palaiko daugelį NOKIA ir kitų telefonų pasinaudodama gammu biblioteka
+@@ -86,7 +89,7 @@
+ Comment[ne]=यो डà¥à¤°à¤¾à¤‡à¤à¤°à¤²à¥‡ गामॠलाइबà¥à¤°à¥‡à¤°à¥€à¤¬à¤¾à¤Ÿ धेरै नोकिया र अनà¥à¤¯ मोबाइल फोन समरà¥à¤¥à¤¨ गरà¥à¤›
+ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gammu-bibliotheek
+ Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gammu-biblioteket
+-Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gammu
++Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowych Nokia i innych za pomocą biblioteki gammu
+ Comment[pt]=Este controlador suportar muitos NOKIAs, bem como outros telemóveis, com a biblioteca 'gammu'
+ Comment[pt_BR]=Este driver suporta muitos telefones móveis, NOKIA e outros, via biblioteca gammu
+ Comment[ru]=Ðтот драйвер поддерживает множеÑтво моделей мобильных телефонов Nokia и других производителей через библиотеку gammu
+Index: kmobile/devices/digicam/libkmobile_digicam.desktop
+===================================================================
+--- kmobile/devices/digicam/libkmobile_digicam.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kmobile/devices/digicam/libkmobile_digicam.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -28,6 +28,7 @@
+ Name[is]=Stafræn myndavél
+ Name[it]=Macchina fotografica digitale
+ Name[ja]=デジタルカメラ
++Name[ka]=ციფრული კáƒáƒ›áƒ”რáƒ
+ Name[kk]=Цифрлық камера
+ Name[km]=ម៉ាស៊ីន​ážážâ€‹ážšáž¼áž”​ឌីជីážáž›
+ Name[lt]=SkaitmeninÄ— kamera
+@@ -54,7 +55,8 @@
+ Name[tg]=Камераи digital
+ Name[tr]=Dijital Kamera
+ Name[uk]=Цифровий фотоапарат
+-Name[uz]=Фотоапарат
++Name[uz]=Fotoaparat
++Name[uz at cyrillic]=Фотоапарат
+ Name[zh_CN]=æ•°ç 相机
+ Name[zh_TW]=數ä½ç›¸æ©Ÿ
+ Comment=This driver supports many digital cameras
+@@ -81,6 +83,7 @@
+ Comment[is]=Þessi rekill styður margar stafrænar myndavélar
+ Comment[it]=Questo driver supporta molte fotocamere digitali
+ Comment[ja]=ã“ã®ãƒ‰ãƒ©ã‚¤ãƒã¯å¤šç¨®ã®ãƒ‡ã‚¸ã‚¿ãƒ«ã‚«ãƒ¡ãƒ©ã‚’サãƒãƒ¼ãƒˆã—ã¾ã™
++Comment[ka]=ეს დრáƒáƒ˜áƒ•áƒ”რი უáƒáƒ”რს მხáƒáƒ ს მრáƒáƒ•áƒáƒš ციფრულ კáƒáƒ›áƒ”რáƒáƒ¡
+ Comment[kk]=Бұл бірÑпыра цифрлық камераларды қамтитын драйвер
+ Comment[km]=កម្មវិធី​បញ្ជា​នáŸáŸ‡â€‹áž‚ាំទ្រ​ម៉ាស៊ីន​ážážâ€‹ážšáž¼áž”​ឌីជីážáž›â€‹áž‡áž¶áž…្រើន
+ Comment[lt]=Ši tvarkyklė palaiko daugelį skaitmeninių kamerų
+Index: kmobile/kmobile.desktop
+===================================================================
+--- kmobile/kmobile.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kmobile/kmobile.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -44,6 +44,7 @@
+ GenericName[is]=Sýsla með lófatölvur og farsÃma
+ GenericName[it]=Gestisce dispositivi portatili
+ GenericName[ja]=モãƒã‚¤ãƒ«æ©Ÿå™¨ã®ç®¡ç†
++GenericName[ka]=მáƒáƒ‘ილური მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ების მáƒáƒ თვáƒ
+ GenericName[kk]=Қалта құрылғыларды баÑқару
+ GenericName[km]=គ្រប់គ្រង​ឧបករណáŸâ€‹áž…áž›áŸáž
+ GenericName[lt]=Mobiliųjų įrenginių tvarkymas
+@@ -99,6 +100,7 @@
+ Comment[is]=KDE stjórnforrit fyrir lófatölvur og farsÃma
+ Comment[it]=Un gestore di dispositivi portatili di KDE
+ Comment[ja]=KDE モãƒã‚¤ãƒ«æ©Ÿå™¨ãƒžãƒãƒ¼ã‚¸ãƒ£
++Comment[ka]=KDE-ს მáƒáƒ‘ილურმáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ—რმმáƒáƒ თველი
+ Comment[kk]=KDE-нің қалта құрылғылар менеджері
+ Comment[km]=កម្មវិធី​គ្រប់គ្រង​ឧបករណáŸâ€‹áž…áž›áŸáž KDE
+ Comment[lt]=KDE mobiliųjų įrenginių tvarkyklė
+Index: kmobile/kioslave/mimetypes/mobile_addressbook.desktop
+===================================================================
+--- kmobile/kioslave/mimetypes/mobile_addressbook.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kmobile/kioslave/mimetypes/mobile_addressbook.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Comment[is]=Tengiliðir à farsÃma eða lófatölvu
+ Comment[it]=Contatti nel dispositivo portatile
+ Comment[ja]=モãƒã‚¤ãƒ«æ©Ÿå™¨å†…ã®é€£çµ¡å…ˆ
++Comment[ka]=კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბი მáƒáƒ‘ილურმáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–
+ Comment[kk]=Қалта құрылғыдағы контакттар
+ Comment[km]=ទំនាក់​ទំនង​ក្នុង​ឧបករណáŸâ€‹áž…áž›áŸáž
+ Comment[lt]=Kontaktai mobiliajame įrenginyje
+Index: kmobile/kioslave/mimetypes/mobile_notes.desktop
+===================================================================
+--- kmobile/kioslave/mimetypes/mobile_notes.desktop.orig 2007-10-08 11:50:39.000000000 +0200
++++ kmobile/kioslave/mimetypes/mobile_notes.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -26,6 +26,7 @@
+ Comment[is]=Ãminningar à farsÃma eða lófatölvu
+ Comment[it]=Note nel dispositivo portatile
+ Comment[ja]=モãƒã‚¤ãƒ«æ©Ÿå™¨å†…ã®ãƒ¡ãƒ¢
++Comment[ka]=ჩáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ”ბი მáƒáƒ‘ილურტელეფáƒáƒœáƒ–ე
+ Comment[kk]=Қалта құрылғыдағы жазбалар
+ Comment[km]=ចំណាំ​ក្នុង​ឧបករណáŸâ€‹áž…áž›áŸáž
+ Comment[lt]=Užrašai mobiliajame įrenginyje
+Index: kmobile/kioslave/mimetypes/mobile_calendar.desktop
+===================================================================
+--- kmobile/kioslave/mimetypes/mobile_calendar.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kmobile/kioslave/mimetypes/mobile_calendar.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Comment[is]=Dagatal à farsÃma eða lófatölvu
+ Comment[it]=Calendari nel dispositivo portatile
+ Comment[ja]=モãƒã‚¤ãƒ«æ©Ÿå™¨å†…ã®ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
++Comment[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი მáƒáƒ‘ილურმáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–ე
+ Comment[kk]=Қалта құрылғыдағы күнтізбе
+ Comment[km]=ប្រážáž·áž‘ិន​ក្នុង​ឧបករណáŸâ€‹áž…áž›áŸáž
+ Comment[lt]=Kalendorius mobiliajame įrenginyje
+Index: kmobile/kioslave/mimetypes/mobile_device.desktop
+===================================================================
+--- kmobile/kioslave/mimetypes/mobile_device.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kmobile/kioslave/mimetypes/mobile_device.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Comment[is]=FarsÃmi eða lófatölva
+ Comment[it]=Dispositivo portatile
+ Comment[ja]=モãƒã‚¤ãƒ«æ©Ÿå™¨
++Comment[ka]=მáƒáƒ‘ილური მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ
+ Comment[kk]=Қалта құрылғыÑÑ‹
+ Comment[km]=ឧបករណáŸâ€‹áž…áž›áŸáž
+ Comment[lt]=Mobilusis įrenginys
+Index: wizards/groupwarewizard.desktop
+===================================================================
+--- wizards/groupwarewizard.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ wizards/groupwarewizard.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -23,6 +23,7 @@
+ Name[is]=KDE hópvinnukerfisálfur
+ Name[it]=Assistente configurazione di KDE Groupware
+ Name[ja]=KDE グループウェアウィザード
++Name[ka]=სერვერი Groupware
+ Name[kk]=KDE бірікен Ð¶Ò±Ð¼Ñ‹Ñ ÑˆÐµÐ±ÐµÑ€Ñ–
+ Name[km]=អ្នក​ជំនួយការ​កម្មវិធី​ពហុ​អ្នក​ប្រើ​របស់ KDE
+ Name[ko]=KDE 그룹웨어 마법사
+Index: kresources/tvanytime/kcal_tvanytime.desktop
+===================================================================
+--- kresources/tvanytime/kcal_tvanytime.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/tvanytime/kcal_tvanytime.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=Sjónvarpsdagskrár
+ Name[it]=Programmi TV
+ Name[ja]=TV 番組予定
++Name[ka]=ტელეპრáƒáƒ’რáƒáƒ›áƒ
+ Name[kk]=TV кеÑтелері
+ Name[km]=កាលវិភាគ​ទូរទស្សនáŸ
+ Name[lt]=TV tvarkaraÅ¡Äiai
+Index: kresources/egroupware/kabc_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/kabc_xmlrpc.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/egroupware/kabc_xmlrpc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=eGroupware þjónn (gegnum XML-RPC)
+ Name[it]=Server eGroupware (via XML-RPC)
+ Name[ja]=eGroupware サーム(XML-RPC 経由)
++Name[ka]=სერბერი eGroupware (XML-RPC-ის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით)
+ Name[kk]=eGroupware Ñервері (XML-RPC арқылы)
+ Name[km]=ម៉ាស៊ីន​បម្រើ eGroupware (ážáž¶áž˜â€‹ážšáž™áŸˆ XML-RPC)
+ Name[lt]=eGroupware serveris (per XML-RPC)
+Index: kresources/egroupware/knotes_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/knotes_xmlrpc.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/egroupware/knotes_xmlrpc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=eGroupware þjónn (gegnum XML-RPC)
+ Name[it]=Server eGroupware (via XML-RPC)
+ Name[ja]=eGroupware サーム(XML-RPC 経由)
++Name[ka]=სერბერი eGroupware (XML-RPC-ის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით)
+ Name[kk]=eGroupware Ñервері (XML-RPC арқылы)
+ Name[km]=ម៉ាស៊ីន​បម្រើ eGroupware (ážáž¶áž˜â€‹ážšáž™áŸˆ XML-RPC)
+ Name[lt]=eGroupware serveris (per XML-RPC)
+Index: kresources/egroupware/kcal_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/kcal_xmlrpc.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/egroupware/kcal_xmlrpc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=eGroupware þjónn (gegnum XML-RPC)
+ Name[it]=Server eGroupware (via XML-RPC)
+ Name[ja]=eGroupware サーム(XML-RPC 経由)
++Name[ka]=სერბერი eGroupware (XML-RPC-ის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით)
+ Name[kk]=eGroupware Ñервері (XML-RPC арқылы)
+ Name[km]=ម៉ាស៊ីន​បម្រើ eGroupware (ážáž¶áž˜â€‹ážšáž™áŸˆ XML-RPC)
+ Name[lt]=eGroupware serveris (per XML-RPC)
+Index: kresources/exchange/exchange.desktop
+===================================================================
+--- kresources/exchange/exchange.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/exchange/exchange.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=Exchange 2000 þjónn
+ Name[it]=Server Exchange 2000
+ Name[ja]=Exchange 2000 サーãƒ
++Name[ka]=სერვერი Exchange 2000
+ Name[kk]=MS Exchange 2000 Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ Exchange ២០០áŸ
+ Name[lt]=Exchange 2000 serveris
+Index: kresources/exchange/exchange_deprecated.desktop
+===================================================================
+--- kresources/exchange/exchange_deprecated.desktop.orig 2007-10-08 11:50:39.000000000 +0200
++++ kresources/exchange/exchange_deprecated.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=Exchange 2000 þjónn (úrelt)
+ Name[it]=Server Exchange 2000 (deprecato)
+ Name[ja]=Exchange 2000 サーム(廃æ¢äºˆå®š)
++Name[ka]=სერვერი Exchange 2000 (მáƒáƒ«áƒ•áƒ”ლებული)
+ Name[kk]=MS Exchange 2000 Ñервері (еÑкірген)
+ Name[km]=ម៉ាស៊ីន​បម្រើ Exchange ២០០០(មិន​សូវ​ល្អ)
+ Name[lt]=Exchange 2000 serveris (deprecated)
+Index: kresources/scalix/kabc/scalix.desktop
+===================================================================
+--- kresources/scalix/kabc/scalix.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/scalix/kabc/scalix.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -7,14 +7,18 @@
+ Name[de]=Adressbuch auf einem Scalix-Server via KMail
+ Name[el]=Βιβλίο διευθÏνσεων σε εξυπηÏετητή Scalix μÎσω του KMail
+ Name[et]=Aadressiraamat Scalix-serveris (KMaili vahendusel)
++Name[fr]=Carnet d'adresses sur serveur Scalix via KMail
+ Name[it]=Rubrica indirizzi su server Scalix via KMail
+ Name[ja]=KMail 経由 Scalix サーãƒã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³
+ Name[nds]=Adressbook op Scalix-Server över KMail
+ Name[nl]=Adresboek op Scalix-server via KMail
++Name[pl]=Książka adresowa na serwerze Scalix za pośrednictwem KMaila
++Name[ru]=ÐдреÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð° на Ñервере Scalix через KMail
+ Name[sk]=Adresár na Scalix serveri pomocou KMail
+ Name[sr]=ÐдреÑар на Scalix Ñерверу преко KMail-а
+ Name[sr at Latn]=Adresar na Scalix serveru preko KMail-a
+ Name[sv]=Adressbok på Scalix-server via Kmail
++Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Adres Defteri
+ Name[zh_CN]=通过 KMail 访问 Scalix æœåŠ¡å™¨ä¸Šçš„地å€ç°¿
+ Name[zh_TW]=é€éŽ KMail å–å¾— Scalix 伺æœå™¨ä¸Šçš„通訊錄
+ X-KDE-Library=kabc_scalix
+Index: kresources/scalix/knotes/scalix.desktop
+===================================================================
+--- kresources/scalix/knotes/scalix.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/scalix/knotes/scalix.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -7,14 +7,18 @@
+ Name[de]=Notizen auf einem Scalix-Server via KMail
+ Name[el]=Σημειώσεις σε εξυπηÏετητή Scalix μÎσω του KMail
+ Name[et]=Kalender Scalix-serveris (KMaili vahendusel)
++Name[fr]=Notes sur serveur Scalix via KMail
+ Name[it]=Note su server Scalix via KMail
+ Name[ja]=KMail 経由 Scalix サーãƒã®ãƒ¡ãƒ¢
+ Name[nds]=Notizen op Scalix-Server över KMail
+ Name[nl]=Notities op Scalix-server via KMail
++Name[pl]=Notatki na serwerze Scalix za pośrednictwem KMaila
++Name[ru]=Заметки на Ñервере Scalix через KMail
+ Name[sk]=Poznámky na Scalix serveri pomocou KMail
+ Name[sr]=Белешке на Scalix Ñерверу преко KMail-а
+ Name[sr at Latn]=Beleške na Scalix serveru preko KMail-a
+ Name[sv]=Anteckningar på Scalix-server via Kmail
++Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Takvim
+ Name[zh_CN]=通过 KMail 访问 Scalix æœåŠ¡å™¨ä¸Šçš„日历
+ Name[zh_TW]=é€éŽ KMail å–å¾— Scalix 伺æœå™¨ä¸Šçš„便æ¢
+ X-KDE-Library=knotes_scalix
+Index: kresources/scalix/shared/resourcescalixbase.cpp
+===================================================================
+--- kresources/scalix/shared/resourcescalixbase.cpp.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/scalix/shared/resourcescalixbase.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -33,6 +33,8 @@
+ #include "resourcescalixbase.h"
+ #include "kmailconnection.h"
+
++#include <folderselectdialog.h>
++
+ #include <klocale.h>
+ #include <kstandarddirs.h>
+ #include <kinputdialog.h>
+@@ -160,10 +162,10 @@
+ return possible.begin().data(); // yes this is the subresource key, i.e. location
+
+ // Several found, ask the user
+- QString chosenLabel = KInputDialog::getItem( i18n( "Select Resource Folder" ),
+- i18n( "You have more than one writable resource folder. "
+- "Please select the one you want to write to." ),
+- possible.keys() );
++ QString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
++ i18n( "You have more than one writable resource folder. "
++ "Please select the one you want to write to." ),
++ possible.keys() );
+ if ( chosenLabel.isEmpty() ) // cancelled
+ return QString::null;
+ return possible[chosenLabel];
+Index: kresources/scalix/shared/Makefile.am
+===================================================================
+--- kresources/scalix/shared/Makefile.am.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/scalix/shared/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir) $(all_includes)
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
+
+ noinst_HEADERS = resourcescalixbase.h scalixbase.h subresource.h
+
+@@ -9,7 +9,7 @@
+ subresource.cpp \
+ kmailconnection.skel kmailicalIface.stub
+ libresourcescalixshared_la_METASOURCES = AUTO
+-libresourcescalixshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
++libresourcescalixshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la ../../lib/libkgroupwaredav.la
+ libresourcescalixshared_la_LDFLAGS = -no-undefined
+
+ kmailicalIface_DCOPIDLNG = true
+Index: kresources/scalix/kcal/scalix.desktop
+===================================================================
+--- kresources/scalix/kcal/scalix.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/scalix/kcal/scalix.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -7,14 +7,18 @@
+ Name[de]=Kalender auf einem Scalix-Server via KMail
+ Name[el]=ΗμεÏολόγιο σε εξυπηÏετητή Scalix μÎσω του KMail
+ Name[et]=Kalender Scalix-serveris (KMaili vahendusel)
++Name[fr]=Agenda sur serveur Scalix via KMail
+ Name[it]=Calendario su server Scalix via KMail
+ Name[ja]=KMail 経由 Scalix サーãƒã®ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
+ Name[nds]=Kalenner op Scalix-Server över KMail
+ Name[nl]=Agenda op Scalix-server via KMail
++Name[pl]=Kalendarz na serwerze Scalix za pośrednictwem KMaila
++Name[ru]=Календарь на Ñервере Scalix через KMail
+ Name[sk]=Kalendár na Scalix serveri pomocou KMail
+ Name[sr]=Календар на Scalix Ñерверу преко KMail-а
+ Name[sr at Latn]=Kalendar na Scalix serveru preko KMail-a
+ Name[sv]=Kalender på Scalix-server via Kmail
++Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Takvim
+ Name[zh_CN]=通过 KMail 访问 Scalix æœåŠ¡å™¨ä¸Šçš„日历
+ Name[zh_TW]=é€éŽ KMail å–å¾— Scalix 伺æœå™¨ä¸Šçš„行事曆
+ X-KDE-Library=kcal_scalix
+Index: kresources/groupwise/kcal_groupwise.desktop
+===================================================================
+--- kresources/groupwise/kcal_groupwise.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/groupwise/kcal_groupwise.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=Novell GroupWise þjónn
+ Name[it]=Server Novell GroupWise
+ Name[ja]=Novell GroupWise サーãƒ
++Name[ka]=სერვერი Novell GroupWise
+ Name[kk]=Novell GroupWise Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ GroupWise របស់​ណូវែល
+ Name[lt]=Novell GroupWise serveris
+Index: kresources/groupwise/kabc_groupwise.desktop
+===================================================================
+--- kresources/groupwise/kabc_groupwise.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/groupwise/kabc_groupwise.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=Novell GroupWise þjónn
+ Name[it]=Server Novell GroupWise
+ Name[ja]=Novell GroupWise サーãƒ
++Name[ka]=სერვერი Novell GroupWise
+ Name[kk]=Novell GroupWise Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ GroupWise របស់​ណូវែល
+ Name[lt]=Novell GroupWise serveris
+Index: kresources/slox/kcal_slox.desktop
+===================================================================
+--- kresources/slox/kcal_slox.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/slox/kcal_slox.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=SUSE LINUX Openexchange þjónn
+ Name[it]=Server SUSE LINUX Openexchange
+ Name[ja]=SUSE LINUX Openexchange サーãƒ
++Name[ka]= SUSE LINUX Openexchange სერვერი
+ Name[kk]=SUSE LINUX Openexchange Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ Openexchange របស់​ស៊ូស៊ីលីនីក
+ Name[lt]=SUSE LINUX Openexchange serveris
+Index: kresources/slox/kcal_ox.desktop
+===================================================================
+--- kresources/slox/kcal_ox.desktop.orig 2007-10-08 11:50:39.000000000 +0200
++++ kresources/slox/kcal_ox.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -19,6 +19,7 @@
+ Name[hu]=OpenXchange-kiszolgáló
+ Name[is]=OpenXchange þjónn
+ Name[ja]=OpenXchange サーãƒ
++Name[ka]=Openexchange სერვერი
+ Name[kk]=OpenXchange Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ OpenXchange
+ Name[lt]=OpenXchange serveris
+Index: kresources/slox/kabc_slox.desktop
+===================================================================
+--- kresources/slox/kabc_slox.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/slox/kabc_slox.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=SUSE LINUX Openexchange þjónn
+ Name[it]=Server SUSE LINUX Openexchange
+ Name[ja]=SUSE LINUX Openexchange サーãƒ
++Name[ka]= SUSE LINUX Openexchange სერვერი
+ Name[kk]=SUSE LINUX Openexchange Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ Openexchange របស់​ស៊ូស៊ីលីនីក
+ Name[lt]=SUSE LINUX Openexchange serveris
+Index: kresources/slox/kabc_ox.desktop
+===================================================================
+--- kresources/slox/kabc_ox.desktop.orig 2007-10-08 11:50:39.000000000 +0200
++++ kresources/slox/kabc_ox.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -19,6 +19,7 @@
+ Name[hu]=OpenXchange-kiszolgáló
+ Name[is]=OpenXchange þjónn
+ Name[ja]=OpenXchange サーãƒ
++Name[ka]=Openexchange სერვერი
+ Name[kk]=OpenXchange Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ OpenXchange
+ Name[lt]=OpenXchange serveris
+Index: kresources/groupdav/kabc_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kabc_groupdav.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/groupdav/kabc_groupdav.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=GroupDAV þjónn (t.d. OpenGroupware)
+ Name[it]=Server GroupDAV (per es. OpenGroupware)
+ Name[ja]=GroupDAV サーム(例 OpenGroupware)
++Name[ka]=სერვერი GroupDAV (მáƒáƒ’., OpenGroupware)
+ Name[kk]=GroupDAV Ñервері (мыÑалы OpenGroupware)
+ Name[km]=ម៉ាស៊ីន​បម្រើ GroupDAV (ឧ. OpenGroupware)
+ Name[lt]=GroupDAV serveris (pvz.: OpenGroupware)
+Index: kresources/groupdav/kcal_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kcal_groupdav.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/groupdav/kcal_groupdav.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=GroupDAV þjónn (t.d. OpenGroupware)
+ Name[it]=Server GroupDAV (per es. OpenGroupware)
+ Name[ja]=GroupDAV サーム(例 OpenGroupware)
++Name[ka]=სერვერი GroupDAV (მáƒáƒ’., OpenGroupware)
+ Name[kk]=GroupDAV Ñервері (мыÑалы OpenGroupware)
+ Name[km]=ម៉ាស៊ីន​បម្រើ GroupDAV (ឧ. OpenGroupware)
+ Name[lt]=GroupDAV serveris (pvz.: OpenGroupware)
+Index: kresources/kolab/kabc/kolab.desktop
+===================================================================
+--- kresources/kolab/kabc/kolab.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/kolab/kabc/kolab.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=Vistfangaskrá á IMAP þjóni gegnum KMail
+ Name[it]=Rubrica indirizzi su server IMAP via KMail
+ Name[ja]=KMail 経由 IMAP サーãƒã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³
++Name[ka]=წიგნáƒáƒ™áƒ˜ IMAP-ის სერვერზე KMail-ის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით
+ Name[kk]=KMail арқылы IMAP Ñерверіндегі адреÑтік кітапша
+ Name[km]=សៀវភៅ​អាសយដ្ឋាន​លើ​ម៉ាស៊ីន​បម្រើ IMAP ážáž¶áž˜â€‹ážšáž™áŸˆ KMail
+ Name[lt]=Adresų knygelė IMAP serveryje per KMail
+Index: kresources/kolab/knotes/kolabresource.desktop
+===================================================================
+--- kresources/kolab/knotes/kolabresource.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/kolab/knotes/kolabresource.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=IMAP þjónn gegnum KMail
+ Name[it]=Server IMAP via KMail
+ Name[ja]=KMail 経由 IMAP サーãƒ
++Name[ka]= IMAP-ს სერვერთáƒáƒœ დáƒáƒ¨áƒ•áƒ”ბრKMail-ის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით
+ Name[kk]=KMail арқылы IMAP Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ IMAP ážáž¶áž˜â€‹ážšáž™áŸˆ KMail
+ Name[lt]=IMAP serveris per KMail
+Index: kresources/kolab/shared/Makefile.am
+===================================================================
+--- kresources/kolab/shared/Makefile.am.orig 2005-09-10 10:23:47.000000000 +0200
++++ kresources/kolab/shared/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir) $(all_includes)
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
+
+ noinst_HEADERS = resourcekolabbase.h kolabbase.h subresource.h
+
+@@ -9,7 +9,7 @@
+ subresource.cpp \
+ kmailconnection.skel kmailicalIface.stub
+ libresourcekolabshared_la_METASOURCES = AUTO
+-libresourcekolabshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
++libresourcekolabshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la ../../lib/libkgroupwarebase.la
+ libresourcekolabshared_la_LDFLAGS = -no-undefined
+
+ kmailicalIface_DCOPIDLNG = true
+Index: kresources/kolab/shared/resourcekolabbase.cpp
+===================================================================
+--- kresources/kolab/shared/resourcekolabbase.cpp.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/kolab/shared/resourcekolabbase.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -34,6 +34,8 @@
+ #include "resourcekolabbase.h"
+ #include "kmailconnection.h"
+
++#include <folderselectdialog.h>
++
+ #include <klocale.h>
+ #include <kstandarddirs.h>
+ #include <kinputdialog.h>
+@@ -238,8 +240,8 @@
+ "Please select the one you want to write to." );
+
+ // Several found, ask the user
+- QString chosenLabel = KInputDialog::getItem( i18n( "Select Resource Folder" ),
+- t, possible.keys() );
++ QString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
++ t, possible.keys() );
+ if ( chosenLabel.isEmpty() ) // cancelled
+ return QString::null;
+ return possible[chosenLabel];
+Index: kresources/kolab/kcal/kolab.desktop
+===================================================================
+--- kresources/kolab/kcal/kolab.desktop.orig 2008-02-13 10:39:28.000000000 +0100
++++ kresources/kolab/kcal/kolab.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=Dagatal á IMAP þjóni gegnum KMail
+ Name[it]=Calendario su server IMAP via KMail
+ Name[ja]=KMail 経由 IMAP サーãƒã®ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი IMAP სერვერზე KMail-ის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით
+ Name[kk]=KMail арқылы IMAP Ñерверіндегі күнтізбе
+ Name[km]=ប្រážáž·áž‘ិន​លើ​ម៉ាស៊ីន​បម្រើ IMAP ážáž¶áž˜â€‹ážšáž™áŸˆ KMail
+ Name[lt]=Kalendorius IMAP serveryje per KMail
+Index: kresources/blogging/blogging.desktop
+===================================================================
+--- kresources/blogging/blogging.desktop.orig 2008-02-13 10:39:29.000000000 +0100
++++ kresources/blogging/blogging.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -20,6 +20,7 @@
+ Name[is]=Dagbækur sem blogg á þjóni
+ Name[it]=Diari come blog su un server
+ Name[ja]=サーãƒä¸Šã®ãƒ–ãƒã‚°ã¨ã—ã¦ã®ã‚¸ãƒ£ãƒ¼ãƒŠãƒ«
++Name[ka]=ბლáƒáƒ’ისმáƒáƒ’ვáƒáƒ ი ჟურნáƒáƒšáƒ”ბი სერვერზე
+ Name[kk]=Сервердегі күнделік блог ретінде
+ Name[km]=ទិនានុប្បវážáŸ’ážáž·â€‹áž‡áž¶â€‹áž€áŸ†ážŽážáŸ‹áž áŸážáž»â€‹áž”ណ្ដាញ​នៅ​លើ​ម៉ាស៊ីន​បម្រើ
+ Name[lt]=Dienynai kaip Blog'ai serveryje
+Index: kresources/birthdays/kabc.desktop
+===================================================================
+--- kresources/birthdays/kabc.desktop.orig 2008-02-13 10:39:29.000000000 +0100
++++ kresources/birthdays/kabc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Name[is]=Afmælisdagar úr KAddressBook
+ Name[it]=Compleanni da KAddessBook
+ Name[ja]=アドレス帳ã®èª•ç”Ÿæ—¥
++Name[ka]=დáƒáƒ‘áƒáƒ“ების დღეები KDE წიგნáƒáƒ™áƒ˜áƒ“áƒáƒœ
+ Name[kk]=KAddressBook-тағы туған күндер
+ Name[km]=ážáŸ’ងៃ​ážáž½áž”​កំណើážâ€‹áž–ី KAddressBook
+ Name[lt]=Gimtadieniai iš KAddressBook
+Index: kresources/remote/remote.desktop
+===================================================================
+--- kresources/remote/remote.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/remote/remote.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[is]=Dagatal à fjarlægri skrá
+ Name[it]=Calendario in file remoto
+ Name[ja]=リモートファイルã®ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი გáƒáƒ ე ფáƒáƒ˜áƒšáƒ–ე
+ Name[kk]=Қашықтағы файлдағы күнтізбе
+ Name[km]=ប្រážáž·áž‘ិន​នៅ​ក្នុង​ឯកសារ​នៅ​ឆ្ងាយ
+ Name[lt]=Kalendorius nutolusioje byloje
+Index: kresources/newexchange/kabc_newexchange.desktop
+===================================================================
+--- kresources/newexchange/kabc_newexchange.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/newexchange/kabc_newexchange.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=Vistfangaskrá Exchange þjóni (á tilraunarstigi)
+ Name[it]=Rubrica indirizzi su un server Exchange (sperimentale)
+ Name[ja]=Exchange サーãƒã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ (実験版)
++Name[ka]=წიგნáƒáƒ™áƒ˜ Exchange სერვერზე(ექსპერიმენტული)
+ Name[kk]=Exchange Ñерверіндегі адреÑтік кітапша (Ñынақтағы)
+ Name[km]=សៀវភៅ​អាសយដ្ឋាន​លើ​ម៉ាស៊ីន​បម្រើ Exchange (សម្រាប់​អ្នក​មាន​បទពិសោធនáŸ)
+ Name[lt]=Adresų knygelė Exchange serveryje (eksperimentine tvarka)
+Index: kresources/newexchange/kabc_newexchange_final.desktop
+===================================================================
+--- kresources/newexchange/kabc_newexchange_final.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/newexchange/kabc_newexchange_final.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -23,6 +23,7 @@
+ Name[is]=Vistfangaskrá á Exchange þjóni
+ Name[it]=Rubrica indirizzi su un server Exchange
+ Name[ja]=Exchange サーãƒã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³
++Name[ka]=წიგნáƒáƒ™áƒ˜ Exchange სერვერზე
+ Name[kk]=Exchange Ñерверіндегі адреÑтік кітапша
+ Name[km]=សៀវភៅ​អាសយដ្ឋាន​លើ​ម៉ាស៊ីន​បម្រើ Exchange
+ Name[lt]=Adresų knygelė Exchange serveryje
+Index: kresources/newexchange/kcal_newexchange.desktop
+===================================================================
+--- kresources/newexchange/kcal_newexchange.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/newexchange/kcal_newexchange.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=Dagatal á Exchange þjóni (á tilraunarstigi)
+ Name[it]=Calendario su un server Exchange (sperimentale)
+ Name[ja]=Exchange サーãƒã®ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼ (実験版)
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი Exchange სერვერზე (ექსპერიმენტული)
+ Name[kk]=Exchange Ñерверіндегі күнтізбе (Ñынақтағы)
+ Name[km]=ប្រážáž·áž‘ិន​លើ​ម៉ាស៊ីន​បម្រើ Exchange (សម្រាប់​អ្នក​មាន​បទពិសោធនáŸ)
+ Name[lt]=Kalendorius Exchange serveryje (eksperimentine tvarka)
+Index: kresources/newexchange/kcal_newexchange_final.desktop
+===================================================================
+--- kresources/newexchange/kcal_newexchange_final.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/newexchange/kcal_newexchange_final.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -23,6 +23,7 @@
+ Name[is]=Dagatal á Exchange þjóni
+ Name[it]=Calendario su un server Exchange
+ Name[ja]=Exchange サーãƒã®ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი Exchange სერვერზე
+ Name[kk]=Exchange Ñерверіндегі күнтізбе
+ Name[km]=ប្រážáž·áž‘ិន​លើ​ម៉ាស៊ីន​បម្រើ Exchange
+ Name[lt]=Kalendorius Exchange serveryje
+Index: kresources/lib/folderselectdialog.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kresources/lib/folderselectdialog.h 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,58 @@
++/*
++ This file is part of kdepim.
++
++ Copyright (c) 2008 Kevin Ottens <ervin at kde.org>
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++
++ In addition, as a special exception, the copyright holders give
++ permission to link the code of this program with any edition of
++ the Qt library by Trolltech AS, Norway (or with modified versions
++ of Qt that use the same license as Qt), and distribute linked
++ combinations including the two. You must obey the GNU General
++ Public License in all respects for all of the code used other than
++ Qt. If you modify this file, you may extend this exception to
++ your version of the file, but you are not obligated to do so. If
++ you do not wish to do so, delete this exception statement from
++ your version.
++*/
++
++#ifndef FOLDERSELECTDIALOG_H
++#define FOLDERSELECTDIALOG_H
++
++#include <kdialogbase.h>
++
++namespace KPIM {
++
++class FolderSelectDialog : public KDialogBase
++{
++private:
++ FolderSelectDialog( const QString& caption, const QString& label,
++ const QStringList& list );
++
++public:
++ static QString getItem( const QString& caption, const QString& label,
++ const QStringList& list );
++
++protected:
++ virtual void closeEvent(QCloseEvent *event);
++private:
++ KListBox* mListBox;
++};
++
++}
++
++#endif // FOLDERSELECTDIALOG_H
+Index: kresources/lib/Makefile.am
+===================================================================
+--- kresources/lib/Makefile.am.orig 2005-10-10 17:02:07.000000000 +0200
++++ kresources/lib/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ lib_LTLIBRARIES = libkgroupwarebase.la libkgroupwaredav.la
+
+-libkgroupwarebase_la_SOURCES = folderlister.cpp folderconfig.cpp folderlistview.cpp \
++libkgroupwarebase_la_SOURCES = folderlister.cpp folderconfig.cpp folderlistview.cpp folderselectdialog.cpp \
+ groupwaredataadaptor.cpp groupwaredownloadjob.cpp \
+ calendaradaptor.cpp addressbookadaptor.cpp groupwareresourcejob.cpp \
+ groupwareuploadjob.cpp kcal_resourcegroupwarebase.cpp kabc_resourcegroupwarebase.cpp \
+Index: kresources/lib/folderselectdialog.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kresources/lib/folderselectdialog.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,83 @@
++/*
++ This file is part of kdepim.
++
++ Copyright (c) 2008 Kevin Ottens <ervin at kde.org>
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++
++ In addition, as a special exception, the copyright holders give
++ permission to link the code of this program with any edition of
++ the Qt library by Trolltech AS, Norway (or with modified versions
++ of Qt that use the same license as Qt), and distribute linked
++ combinations including the two. You must obey the GNU General
++ Public License in all respects for all of the code used other than
++ Qt. If you modify this file, you may extend this exception to
++ your version of the file, but you are not obligated to do so. If
++ you do not wish to do so, delete this exception statement from
++ your version.
++*/
++
++#include "folderselectdialog.h"
++
++#include <qlayout.h>
++#include <qlabel.h>
++
++using namespace KPIM;
++
++FolderSelectDialog::FolderSelectDialog( const QString& caption, const QString& label,
++ const QStringList& list )
++ : KDialogBase(0, 0, true, caption, Ok, Ok, true)
++{
++ QFrame* frame = makeMainWidget();
++ QVBoxLayout* layout = new QVBoxLayout( frame, 0, spacingHint() );
++
++ QLabel* labelWidget = new QLabel( label, frame );
++ layout->addWidget( labelWidget );
++
++ mListBox = new KListBox( frame );
++ mListBox->insertStringList( list );
++ mListBox->setSelected( 0, true );
++ mListBox->ensureCurrentVisible();
++ layout->addWidget( mListBox, 10 );
++
++ connect( mListBox, SIGNAL( doubleClicked( QListBoxItem * ) ),
++ SLOT( slotOk() ) );
++ connect( mListBox, SIGNAL( returnPressed( QListBoxItem * ) ),
++ SLOT( slotOk() ) );
++
++ mListBox->setFocus();
++
++ layout->addStretch();
++
++ setMinimumWidth( 320 );
++}
++
++QString FolderSelectDialog::getItem( const QString &caption, const QString &label,
++ const QStringList& list )
++{
++ FolderSelectDialog dlg( caption, label, list );
++
++ QString result;
++ if ( dlg.exec() == Accepted )
++ result = dlg.mListBox->currentText();
++
++ return result;
++}
++
++void FolderSelectDialog::closeEvent(QCloseEvent *event)
++{
++ event->ignore();
++}
+Index: kresources/groupware/kabc_groupware.desktop
+===================================================================
+--- kresources/groupware/kabc_groupware.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/groupware/kabc_groupware.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=Groupware þjónn
+ Name[it]=Server Groupware
+ Name[ja]=グループウェアサーãƒ
++Name[ka]=სერვერი Groupware
+ Name[kk]=Groupware Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ​កម្មវិធី​ពហុ​អ្នកប្រើ
+ Name[lt]=Grupinio darbo serveris
+Index: kresources/groupware/kcal_groupware.desktop
+===================================================================
+--- kresources/groupware/kcal_groupware.desktop.orig 2007-05-14 09:54:32.000000000 +0200
++++ kresources/groupware/kcal_groupware.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+ Name[is]=Groupware þjónn
+ Name[it]=Server Groupware
+ Name[ja]=グループウェアサーãƒ
++Name[ka]=სერვერი Groupware
+ Name[kk]=Groupware Ñервері
+ Name[km]=ម៉ាស៊ីន​បម្រើ​កម្មវិធី​ពហុ​អ្នកប្រើ
+ Name[lt]=Grupinio darbo serveris
+Index: certmanager/conf/kleopatra_config_appear.desktop
+===================================================================
+--- certmanager/conf/kleopatra_config_appear.desktop.orig 2008-02-13 10:39:29.000000000 +0100
++++ certmanager/conf/kleopatra_config_appear.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -41,6 +41,7 @@
+ Name[is]=Útlit
+ Name[it]=Aspetto
+ Name[ja]=外観
++Name[ka]=იერსáƒáƒ®áƒ”
+ Name[kk]=Сыртқы көрініÑÑ–
+ Name[km]=រូបរាង
+ Name[ko]=모양
+@@ -67,7 +68,8 @@
+ Name[tg]=Ðамуди зоҳирӣ
+ Name[tr]=Görünüm
+ Name[uk]=ВиглÑд
+-Name[uz]=Кўриниши
++Name[uz]=Koʻrinishi
++Name[uz at cyrillic]=Кўриниши
+ Name[zh_CN]=外观
+ Comment=Colors & Fonts Configuration
+ Comment[af]=Kleur en skrif tipe opstelling
+@@ -96,6 +98,7 @@
+ Comment[is]=Stilling lita & leturgerða
+ Comment[it]=Configurazione tipi di carattere e colori
+ Comment[ja]=色ã¨ãƒ•ã‚©ãƒ³ãƒˆã®è¨å®š
++Comment[ka]=ფერთრდრშრიფტთრკáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=Ð¢Ò¯Ñ & Қаріп параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ពណ៌ & ពុម្ពអក្សរ
+ Comment[ko]=색과 글꼴 ì„¤ì •
+@@ -151,6 +154,7 @@
+ Keywords[is]=litir,letur, stillingar
+ Keywords[it]=colori, font, caratteri, configurazione
+ Keywords[ja]=色,フォント,è¨å®š
++Keywords[ka]=ფერები,შრიფტები, კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Keywords[km]=ពណ៌,ពុម្ពអក្សរ,ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ
+ Keywords[ko]=색,글꼴,ì„¤ì •
+ Keywords[lt]=color,font, configuration, spalvų, šriftų konfigūravimas
+Index: certmanager/conf/kleopatra_config_dnorder.desktop
+===================================================================
+--- certmanager/conf/kleopatra_config_dnorder.desktop.orig 2008-02-13 10:39:29.000000000 +0100
++++ certmanager/conf/kleopatra_config_dnorder.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -35,6 +35,7 @@
+ Name[is]=DN eiginleikaröðun
+ Name[it]=Attributi DN, ordine
+ Name[ja]=DN å±žæ€§é †ä½
++Name[ka]=DN áƒáƒ¢áƒ იბუტთრრიგი
+ Name[kk]=DN-атрибуттер реті
+ Name[km]=លំដាប់​គុណលក្ážážŽáŸˆ DN
+ Name[ko]=DN 분배 순서
+@@ -85,6 +86,7 @@
+ Comment[is]=Stilla röð DN eiginleikanna
+ Comment[it]=Configura l'ordine in cui sono mostrati gli attributi DN
+ Comment[ja]=DN 属性を表示ã™ã‚‹é †ä½ã‚’è¨å®š
++Comment[ka]=DN áƒáƒ¢áƒ იბუტთრჩვენების რიგის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=DN атрибуттерді көрÑету ретін баптау
+ Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​លំដាប់ ដែល​ážáŸ’រូវ​បង្ហាញ​គុណលក្ážážŽáŸˆ DN
+ Comment[lt]=Konfigūruoti DN savybių rodymo tvarką
+@@ -136,6 +138,7 @@
+ Keywords[is]=DN,röð,order,RDN,attribute
+ Keywords[it]=DN,ordine,RDN,attributi
+ Keywords[ja]=DN,é †ä½,RDN,属性
++Keywords[ka]=DN,რიგი,RDN,áƒáƒ¢áƒ იბუტი
+ Keywords[km]=DN,លំដាប់,RDN,គុណលក្ážážŽáŸˆ
+ Keywords[lt]=DN,order,RDN,attribute,savybÄ—,tvarka
+ Keywords[mk]=DN,order,RDN,attribute,редоÑлед,атрибут
+Index: certmanager/conf/kleopatra_config_dirserv.desktop
+===================================================================
+--- certmanager/conf/kleopatra_config_dirserv.desktop.orig 2008-02-13 10:39:29.000000000 +0100
++++ certmanager/conf/kleopatra_config_dirserv.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -37,6 +37,7 @@
+ Name[is]=Nafnaþjónustur
+ Name[it]=Servizi Directory
+ Name[ja]=ディレクトリサービス
++Name[ka]=სáƒáƒªáƒœáƒáƒ‘áƒáƒ რმáƒáƒ›áƒ¡áƒáƒ®áƒ£áƒ ებáƒ
+ Name[kk]=Каталог қызметтері
+ Name[km]=សáŸážœáž¶â€‹ážáž
+ Name[ko]=ë””ë ‰í„°ë¦¬ 서비스
+@@ -80,7 +81,7 @@
+ Comment[eu]=LDAP direktorio zerbitzuen konfigurazioa
+ Comment[fa]=پیکربندی خدمات Ùهرست راهنمای LDAP
+ Comment[fi]=Hakemistopalveluiden asetukset
+-Comment[fr]=Configuration des répertoires LDAP
++Comment[fr]=Configuration des services du répertoire LDAP
+ Comment[fy]=Konfiguraasje foar LDAP-tsjinsten
+ Comment[gl]=Configuración dos servicios de directorio LDAP
+ Comment[he]=תצורה של שירותי ספרייה עבור LDAP
+@@ -88,6 +89,7 @@
+ Comment[is]=Stillingar LDAP uppflettingaþjónustunnar
+ Comment[it]=Configurazione servizi LDAP
+ Comment[ja]=LDAP ディレクトリサービスã®è¨å®š
++Comment[ka]=LDAP სáƒáƒªáƒœáƒáƒ‘áƒáƒ რმáƒáƒ›áƒ¡áƒáƒ®áƒ£áƒ ების კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=LDAP каталог қызметтер параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​របស់​សáŸážœáž¶â€‹ážáž LDAP
+ Comment[ko]=LDAP ë””ë ‰í„°ë¦¬ 서비스 ì„¤ì •
+@@ -141,6 +143,7 @@
+ Keywords[is]=ldap,directory,services,nafnaþjónusta
+ Keywords[it]=ldap, servizi, directory
+ Keywords[ja]=ldap,ディレクトリ,サービス
++Keywords[ka]=ldap,ცნáƒáƒ‘áƒáƒ ი,მáƒáƒ›áƒ¡áƒáƒ®áƒ£áƒ ებáƒ
+ Keywords[km]=ldap,ážáž,សáŸážœáž¶
+ Keywords[ko]=ldap,ë””ë ‰í„°ë¦¬,서비스
+ Keywords[lt]=ldap,directory,services,aplankai,tarnybos
+@@ -150,7 +153,7 @@
+ Keywords[nds]=LDAP,Verteken,Deensten
+ Keywords[ne]=ldap,डाइरेकà¥à¤Ÿà¤°à¥€,कारà¥à¤¯
+ Keywords[nn]=ldap,katalog,tenester
+-Keywords[pl]=ldap,katalog,usługi katalogowe,usługi,LDAP
++Keywords[pl]=katalog,usługi katalogowe,usługi,LDAP
+ Keywords[pt]=ldap,directório,serviços
+ Keywords[pt_BR]=ldap,diretório,serviços
+ Keywords[ru]=LDAP,Ñлужбы каталогов
+Index: certmanager/lib/cryptplug.h
+===================================================================
+--- certmanager/lib/cryptplug.h.orig 2005-09-10 10:23:51.000000000 +0200
++++ certmanager/lib/cryptplug.h 2008-06-29 20:10:36.000000000 +0200
+@@ -408,7 +408,7 @@
+ \note This function <b>must</b> be implemented by each plug-in using
+ this API specification.
+ */
+-bool hasFeature( Feature );
++bool hasFeature( ::Feature );
+
+ /*! \ingroup groupSignCryptAct
+ \brief Information record returned by signing and by encrypting
+Index: certmanager/lib/cryptplugwrapper.h
+===================================================================
+--- certmanager/lib/cryptplugwrapper.h.orig 2008-02-13 10:39:29.000000000 +0100
++++ certmanager/lib/cryptplugwrapper.h 2008-06-29 20:10:36.000000000 +0200
+@@ -718,7 +718,7 @@
+
+ \return whether the relative feature is implemented or not
+ */
+- bool hasFeature( Feature );
++ bool hasFeature( ::Feature );
+
+
+ /* \ingroup groupSignAct
+Index: certmanager/lib/libkleopatrarc.desktop
+===================================================================
+--- certmanager/lib/libkleopatrarc.desktop.orig 2008-02-13 10:39:29.000000000 +0100
++++ certmanager/lib/libkleopatrarc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=Ekki staðfestur lykill
+ Name[it]=Chiave non convalidata
+ Name[ja]=èªè¨¼ã•ã‚Œã¦ã„ãªã„éµ
++Name[ka]=დáƒáƒ£áƒ›áƒáƒ¬áƒ›áƒ”ბელი გáƒáƒ¡áƒáƒ¦áƒ”ბი
+ Name[kk]=ТекÑерілмеген кілт
+ Name[km]=កូនសោ​គ្មាន​សុពលភាព
+ Name[ko]=ê²€ì¦ë˜ì§€ ì•Šì€ í‚¤
+@@ -76,6 +77,7 @@
+ Name[is]=Útrunninn lykill
+ Name[it]=Chiave scaduta
+ Name[ja]=期é™åˆ‡ã‚Œã®éµ
++Name[ka]=ვáƒáƒ“áƒáƒ’áƒáƒ¡áƒ£áƒšáƒ˜ გáƒáƒ¡áƒáƒ¦áƒ”ბი
+ Name[kk]=ЕÑкірген кілт
+ Name[km]=កូនសោ​បាន​ផុážáž€áŸ†ážŽážáŸ‹
+ Name[ko]=ë§Œë£Œëœ í‚¤
+@@ -128,6 +130,7 @@
+ Name[is]=Afturkallaður lykill
+ Name[it]=Chiave revocata
+ Name[ja]=ç ´æ£„ã•ã‚ŒãŸéµ
++Name[ka]=áƒáƒœáƒ£áƒšáƒ˜áƒ ებული გáƒáƒ¡áƒáƒ¦áƒ”ბი
+ Name[kk]=Күші жойылған кілт
+ Name[km]=កូនសោ​ážáŸ’រូវ​បាន​ដកហូáž
+ Name[ko]=ê±°ë¶€ëœ í‚¤
+@@ -180,6 +183,7 @@
+ Name[is]=Treyst rótarskilrÃki
+ Name[it]=Certificato radice affidabile
+ Name[ja]=ä¿¡é ¼ã•ã‚ŒãŸãƒ«ãƒ¼ãƒˆè¨¼æ˜Žæ›¸
++Name[ka]= რუტის სáƒáƒœáƒ“რსერთიფიკáƒáƒ¢áƒ˜
+ Name[kk]=Сенім артылған түбір куәлігі
+ Name[km]=វិញ្ញាបនបážáŸ’ážš Root ដែល​អាច​ជឿទុកចិážáŸ’áž
+ Name[lt]=Patikimas root sertifikatas
+@@ -232,6 +236,7 @@
+ Name[is]=Ekki traust rótarskilrÃki
+ Name[it]=Certificato radice non affidabile
+ Name[ja]=ä¿¡é ¼ã•ã‚Œã¦ãªã„ルート証明書
++Name[ka]=რუტის áƒáƒ áƒáƒ¡áƒáƒœáƒ“რსერტიფიკáƒáƒ¢áƒ˜
+ Name[kk]=Сенім артылмаған түбір куәлігі
+ Name[km]=វិញ្ញាបនបážáŸ’ážš Root ដែល​មិន​អាច​ជឿទុកចិážáŸ’áž
+ Name[lt]=Nepatikimas root sertifikatas
+@@ -285,6 +290,7 @@
+ Name[is]=Aðrir lyklar
+ Name[it]=Altre chiavi
+ Name[ja]=ä»–ã®éµ
++Name[ka]=სხვრგáƒáƒ¡áƒáƒ¦áƒ”ბები
+ Name[kk]=БаÑқа кілттер
+ Name[km]=កូនសោ​ផ្សáŸáž„​ទៀáž
+ Name[ko]=기타 키
+@@ -310,7 +316,8 @@
+ Name[ta]=மறà¯à®± விசைகளà¯
+ Name[tr]=DiÄŸer Anahtarlar
+ Name[uk]=Інші ключі
+-Name[uz]=Бошқа калитлар
++Name[uz]=Boshqa kalitlar
++Name[uz at cyrillic]=Бошқа калитлар
+ Name[zh_CN]=其它密钥
+ Name[zh_TW]=其他金鑰
+
+Index: libkmime/kmime_util.cpp
+===================================================================
+--- libkmime/kmime_util.cpp.orig 2007-05-14 09:54:33.000000000 +0200
++++ libkmime/kmime_util.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -235,6 +235,11 @@
+ return codec->toUnicode(result.data(), result.length());
+ }
+
++QString decodeRFC2047String(const QCString &src)
++{
++ const char *usedCS;
++ return decodeRFC2047String(src, &usedCS, "utf-8", false);
++}
+
+ QCString encodeRFC2047String(const QString &src, const char *charset,
+ bool addressHeader, bool allow8BitHeaders)
+Index: libkmime/kmime_util.h
+===================================================================
+--- libkmime/kmime_util.h.orig 2005-09-10 10:23:52.000000000 +0200
++++ libkmime/kmime_util.h 2008-06-29 20:10:36.000000000 +0200
+@@ -77,6 +77,13 @@
+ extern QString decodeRFC2047String(const QCString &src, const char **usedCS,
+ const QCString &defaultCS, bool forceCS) KDE_EXPORT;
+
++ /** Decode string @p src according to RFC2047 (ie. the
++ =?charset?[qb]?encoded?= construct).
++ @param src source string.
++ @return the decoded string.
++ */
++ extern QString decodeRFC2047String(const QCString &src) KDE_EXPORT;
++
+ /** Encode string @p src according to RFC2047 using charset
+ @p charset.
+ @param src source string.
+Index: karm/idletimedetector.cpp
+===================================================================
+--- karm/idletimedetector.cpp.orig 2007-05-14 09:54:33.000000000 +0200
++++ karm/idletimedetector.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -10,15 +10,18 @@
+ IdleTimeDetector::IdleTimeDetector(int maxIdle)
+ // Trigger a warning after maxIdle minutes
+ {
+- kdDebug(5970) << "IdleTimeDetector::IdleTimeDetector" << endl;
++ kdDebug(5970) << "Entering IdleTimeDetector::IdleTimeDetector" << endl;
+ _maxIdle = maxIdle;
+
+ #ifdef HAVE_LIBXSS
++ kdDebug(5970) << "IdleTimeDetector: LIBXSS detected @ compile time" << endl;
+ int event_base, error_base;
+- if(XScreenSaverQueryExtension(qt_xdisplay(), &event_base, &error_base)) {
++ if(XScreenSaverQueryExtension(qt_xdisplay(), &event_base, &error_base))
++ {
+ _idleDetectionPossible = true;
+ }
+- else {
++ else
++ {
+ _idleDetectionPossible = false;
+ }
+
+@@ -43,9 +46,9 @@
+ {
+ _mit_info = XScreenSaverAllocInfo ();
+ XScreenSaverQueryInfo(qt_xdisplay(), qt_xrootwin(), _mit_info);
+- int idleMinutes = (_mit_info->idle/1000)/secsPerMinute;
+- if (idleMinutes >= _maxIdle)
+- informOverrun(idleMinutes);
++ int idleSeconds = (_mit_info->idle/1000);
++ if (idleSeconds >= _maxIdle)
++ informOverrun(idleSeconds);
+ }
+ #endif // HAVE_LIBXSS
+ }
+@@ -56,38 +59,38 @@
+ }
+
+ #ifdef HAVE_LIBXSS
+-void IdleTimeDetector::informOverrun(int idleMinutes)
++void IdleTimeDetector::informOverrun(int idleSeconds)
+ {
++ kdDebug(5970) << "Entering IdleTimeDetector::informOverrun" << endl;
+ if (!_overAllIdleDetect)
+ return; // preferences say the user does not want idle detection.
+
+ _timer->stop();
+
+- QDateTime start = QDateTime::currentDateTime();
+- QDateTime idleStart = start.addSecs(-60 * _maxIdle);
+- QString backThen = KGlobal::locale()->formatTime(idleStart.time());
++ QDateTime idleStart = QDateTime::currentDateTime().addSecs(-idleSeconds);
++ QString idleStartQString = KGlobal::locale()->formatTime(idleStart.time());
+
+ int id = QMessageBox::warning( 0, i18n("Idle Detection"),
+ i18n("Desktop has been idle since %1."
+- " What should we do?").arg(backThen),
++ " What should we do?").arg(idleStartQString),
+ i18n("Revert && Stop"),
+ i18n("Revert && Continue"),
+ i18n("Continue Timing"),0,2);
+ QDateTime end = QDateTime::currentDateTime();
+- int diff = start.secsTo(end)/secsPerMinute;
++ int diff = idleStart.secsTo(end)/secsPerMinute;
+
+ if (id == 0)
+ {
+ // Revert And Stop
+ kdDebug(5970) << "Now it is " << QDateTime::currentDateTime() << endl;
+ kdDebug(5970) << "Reverting timer to " << KGlobal::locale()->formatTime(idleStart.time()).ascii() << endl;
+- emit(extractTime(idleMinutes+diff)); // we need to subtract the time that has been added during idleness.
++ emit(extractTime(idleSeconds/60+diff)); // we need to subtract the time that has been added during idleness.
+ emit(stopAllTimersAt(idleStart));
+ }
+ else if (id == 1)
+ {
+ // Revert and Continue
+- emit(extractTime(idleMinutes+diff));
++ emit(extractTime(idleSeconds/60+diff));
+ _timer->start(testInterval);
+ }
+ else
+Index: karm/taskview.cpp
+===================================================================
+--- karm/taskview.cpp.orig 2008-02-13 10:39:30.000000000 +0100
++++ karm/taskview.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -207,7 +207,8 @@
+
+ setSelected(first_child(), true);
+ setCurrentItem(first_child());
+- _desktopTracker->startTracking();
++ if ( _desktopTracker->startTracking() != QString() )
++ KMessageBox::error( 0, i18n("You are on a too high logical desktop, desktop tracking will not work") );
+ _isloading = false;
+ refresh();
+ }
+@@ -299,7 +300,8 @@
+ setSelected(first_child(), true);
+ setCurrentItem(first_child());
+
+- _desktopTracker->startTracking();
++ if ( _desktopTracker->startTracking() != QString() )
++ KMessageBox::error(0, i18n("You are on a too high logical desktop, desktop tracking will not work") );
+ }
+ }
+
+Index: karm/task.cpp
+===================================================================
+--- karm/task.cpp.orig 2008-02-13 10:39:30.000000000 +0100
++++ karm/task.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -62,13 +62,13 @@
+
+ if (icons == 0) {
+ icons = new QPtrVector<QPixmap>(8);
+- KIconLoader* kil = new KIconLoader("karm"); // always load icons from the KArm application
++ KIconLoader kil("karm"); // always load icons from the KArm application
+ for (int i=0; i<8; i++)
+ {
+ QPixmap *icon = new QPixmap();
+ QString name;
+ name.sprintf("watch-%d.xpm",i);
+- *icon = kil->loadIcon( name, KIcon::User );
++ *icon = kil.loadIcon( name, KIcon::User );
+ icons->insert(i,icon);
+ }
+ }
+Index: karm/desktoptracker.h
+===================================================================
+--- karm/desktoptracker.h.orig 2005-09-10 10:23:53.000000000 +0200
++++ karm/desktoptracker.h 2008-06-29 20:10:36.000000000 +0200
+@@ -11,7 +11,7 @@
+ class QTimer;
+
+ typedef std::vector<Task *> TaskVector;
+-const int maxDesktops = 16;
++const int maxDesktops = 20;
+
+ /** A utility to associate tasks with desktops
+ * As soon as a desktop is activated/left - an signal is emited for
+@@ -25,7 +25,7 @@
+ public:
+ DesktopTracker();
+ void printTrackers();
+- void startTracking();
++ QString startTracking();
+ void registerForDesktops( Task* task, DesktopList dl );
+ int desktopCount() const { return _desktopCount; };
+
+Index: karm/desktoptracker.cpp
+===================================================================
+--- karm/desktoptracker.cpp.orig 2005-09-10 10:23:53.000000000 +0200
++++ karm/desktoptracker.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -57,19 +57,25 @@
+ // emit updateButtons();
+ }
+
+-void DesktopTracker::startTracking()
++QString DesktopTracker::startTracking()
+ {
++ QString err;
+ int currentDesktop = kWinModule.currentDesktop() -1;
+ // TODO: removed? fixed by Lubos?
+ // currentDesktop will return 0 if no window manager is started
+ if ( currentDesktop < 0 ) currentDesktop = 0;
+-
+- TaskVector &tv = desktopTracker[ currentDesktop ];
+- TaskVector::iterator tit = tv.begin();
+- while(tit!=tv.end()) {
+- emit reachedtActiveDesktop(*tit);
+- tit++;
++ if ( currentDesktop < maxDesktops )
++ {
++ TaskVector &tv = desktopTracker[ currentDesktop ];
++ TaskVector::iterator tit = tv.begin();
++ while(tit!=tv.end())
++ {
++ emit reachedtActiveDesktop(*tit);
++ tit++;
++ }
+ }
++ else err="ETooHighDeskTopNumber";
++ return err;
+ }
+
+ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
+Index: karm/support/karm.desktop
+===================================================================
+--- karm/support/karm.desktop.orig 2008-02-13 10:39:30.000000000 +0100
++++ karm/support/karm.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -34,6 +34,7 @@
+ GenericName[id]=Tracker Waktu Pribadi
+ GenericName[is]=Fylgjast með à hvað tÃminn fer
+ GenericName[it]=Segnatempo personale
++GenericName[ka]=პერსáƒáƒœáƒáƒšáƒ£áƒ ი დრáƒáƒ˜áƒ¡ áƒáƒ¦áƒ›áƒ იცხველი
+ GenericName[kk]=Ð”ÐµÑ€Ð±ÐµÑ ÑƒÐ°Ò›Ñ‹Ñ‚ қадағалағышы
+ GenericName[km]=កម្មវិធី​ážáž¶áž˜ážŠáž¶áž“​ពáŸáž›ážœáŸáž›áž¶â€‹áž•áŸ’ទាល់​ážáŸ’លួន
+ GenericName[ko]=ì¼í•˜ëŠ” ì‹œê°„ì„ ìž´ 수 있습니다
+Index: kdgantt/KDGanttViewTaskItem.h
+===================================================================
+--- kdgantt/KDGanttViewTaskItem.h.orig 2005-09-10 10:23:53.000000000 +0200
++++ kdgantt/KDGanttViewTaskItem.h 2008-06-29 20:10:36.000000000 +0200
+@@ -60,8 +60,10 @@
+ void setStartTime( const QDateTime& start );
+ void setEndTime( const QDateTime& end );
+
+-private:
++protected:
+ void showItem( bool show = true, int coordY = 0 );
++
++private:
+ void initItem();
+ void hideMe();
+ QBrush myBrush, undefinedBrush;
+Index: kdgantt/KDGanttViewSubwidgets.cpp
+===================================================================
+--- kdgantt/KDGanttViewSubwidgets.cpp.orig 2008-02-13 10:39:30.000000000 +0100
++++ kdgantt/KDGanttViewSubwidgets.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1252,7 +1252,7 @@
+ computeTicks();
+ // Since we have disconnected autoupdate of scrollbars, we must do it ourselves
+ if (myGanttView && myGanttView->myCanvasView)
+- myGanttView->myCanvasView->updateScrollBars();
++ myGanttView->myCanvasView->updateHorScrollBar();
+ }
+
+
+Index: kmail/snippet_widget.h
+===================================================================
+--- kmail/snippet_widget.h 2008-02-13 10:39:37.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,95 +0,0 @@
+-/***************************************************************************
+- * snippet feature from kdevelop/plugins/snippet/ *
+- * *
+- * Copyright (C) 2007 by Robert Gruber *
+- * rgruber at users.sourceforge.net *
+- * *
+- * This program is free software; you can redistribute it and/or modify *
+- * it under the terms of the GNU General Public License as published by *
+- * the Free Software Foundation; either version 2 of the License, or *
+- * (at your option) any later version. *
+- * *
+- ***************************************************************************/
+-#ifndef __SNIPPET_WIDGET_H__
+-#define __SNIPPET_WIDGET_H__
+-
+-#include <qwidget.h>
+-#include <qstring.h>
+-#include <klistview.h>
+-#include <qtooltip.h>
+-#include <qrect.h>
+-
+-#include <ktexteditor/editinterface.h>
+-#include <ktexteditor/view.h>
+-#include "snippetconfig.h"
+-
+-class KDevProject;
+-class SnippetPart;
+-class QPushButton;
+-class KListView;
+-class QListViewItem;
+-class QPoint;
+-class SnippetDlg;
+-class SnippetItem;
+-class KTextEdit;
+-class KConfig;
+-class KMEdit;
+-class KActionCollection;
+-
+-/**
+-This is the widget which gets added to the right TreeToolView.
+-It inherits KListView and QToolTip which is needed for showing the
+-tooltips which contains the text of the snippet
+- at author Robert Gruber
+-*/
+-class SnippetWidget : public KListView, public QToolTip
+-{
+- Q_OBJECT
+-
+-public:
+- SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, QWidget* parent = 0);
+- ~SnippetWidget();
+- QPtrList<SnippetItem> * getList() { return (&_list); }
+- void writeConfig();
+- SnippetConfig * getSnippetConfig() { return (&_SnippetConfig); }
+-
+-
+-private slots:
+- void initConfig();
+-
+-protected:
+- void maybeTip( const QPoint & );
+- bool acceptDrag (QDropEvent *event) const;
+-
+-private:
+- void insertIntoActiveView( const QString &text );
+- QString parseText(QString text, QString del="$");
+- bool showMultiVarDialog(QMap<QString, QString> * map, QMap<QString, QString> * mapSave,
+- int & iWidth, int & iBasicHeight, int & iOneHeight);
+- QString showSingleVarDialog(QString var, QMap<QString, QString> * mapSave, QRect & dlgSize);
+- SnippetItem* makeItem( SnippetItem* parent, const QString& name, const QString& text, const KShortcut& shortcut );
+-
+- QPtrList<SnippetItem> _list;
+- QMap<QString, QString> _mapSaved;
+- KConfig * _cfg;
+- SnippetConfig _SnippetConfig;
+- KMEdit* mEditor;
+- KActionCollection* mActionCollection;
+-
+-public slots:
+- void slotRemove();
+- void slotEdit( QListViewItem* item_ = 0 );
+- void slotEditGroup();
+- void slotAdd();
+- void slotAddGroup();
+- void slotExecute();
+-
+-protected slots:
+- void showPopupMenu( QListViewItem * item, const QPoint & p, int );
+- void slotExecuted(QListViewItem * item = 0);
+- void slotDropped(QDropEvent *e, QListViewItem *after);
+- void startDrag();
+-};
+-
+-
+-#endif
+Index: kmail/snippet_widget.cpp
+===================================================================
+--- kmail/snippet_widget.cpp 2008-02-13 10:39:37.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,957 +0,0 @@
+-/***************************************************************************
+- * snippet feature from kdevelop/plugins/snippet/ *
+- * *
+- * Copyright (C) 2007 by Robert Gruber *
+- * rgruber at users.sourceforge.net *
+- * *
+- * This program is free software; you can redistribute it and/or modify *
+- * it under the terms of the GNU General Public License as published by *
+- * the Free Software Foundation; either version 2 of the License, or *
+- * (at your option) any later version. *
+- * *
+- ***************************************************************************/
+-
+-#include <kurl.h>
+-#include <kdebug.h>
+-#include <klocale.h>
+-#include <qlayout.h>
+-#include <kpushbutton.h>
+-#include <klistview.h>
+-#include <qheader.h>
+-#include <klineedit.h>
+-#include <ktextedit.h>
+-#include <kmessagebox.h>
+-#include <kconfig.h>
+-#include <qtooltip.h>
+-#include <kpopupmenu.h>
+-#include <qregexp.h>
+-#include <qinputdialog.h>
+-#include <qlabel.h>
+-#include <qcheckbox.h>
+-#include <qwhatsthis.h>
+-#include <qdragobject.h>
+-#include <qtimer.h>
+-#include <kcombobox.h>
+-#include <kmedit.h>
+-#include <kiconloader.h>
+-#include <kshortcut.h>
+-#include <kaction.h>
+-#include <kkeybutton.h>
+-
+-#include "snippetdlg.h"
+-#include "snippetitem.h"
+-#include "snippet_widget.h"
+-
+-#include <cassert>
+-
+-SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, QWidget* parent)
+- : KListView(parent, "snippet widget"), QToolTip( viewport() ),
+- mEditor( editor ), mActionCollection( actionCollection )
+-{
+- // init the QPtrList
+- _list.setAutoDelete(TRUE);
+-
+- // init the KListView
+- setSorting( -1 );
+- addColumn( "" );
+- setFullWidth(true);
+- header()->hide();
+- setAcceptDrops(true);
+- setDragEnabled(true);
+- setDropVisualizer(false);
+- setRootIsDecorated(true);
+-
+- //connect the signals
+- connect( this, SIGNAL( contextMenuRequested ( QListViewItem *, const QPoint & , int ) ),
+- this, SLOT( showPopupMenu(QListViewItem *, const QPoint & , int ) ) );
+-
+- connect( this, SIGNAL( doubleClicked (QListViewItem *) ),
+- this, SLOT( slotEdit( QListViewItem *) ) );
+- connect( this, SIGNAL( returnPressed (QListViewItem *) ),
+- this, SLOT( slotExecuted( QListViewItem *) ) );
+-
+- connect( this, SIGNAL( dropped(QDropEvent *, QListViewItem *) ),
+- this, SLOT( slotDropped(QDropEvent *, QListViewItem *) ) );
+-
+- connect( editor, SIGNAL( insertSnippet() ), this, SLOT( slotExecute() ));
+-
+- _cfg = 0;
+-
+- QTimer::singleShot(0, this, SLOT(initConfig()));
+-}
+-
+-SnippetWidget::~SnippetWidget()
+-{
+- writeConfig();
+- delete _cfg;
+-
+- /* We need to delete the child items before the parent items
+- otherwise KDevelop would crash on exiting */
+- SnippetItem * item;
+- while (_list.count() > 0) {
+- for (item=_list.first(); item; item=_list.next()) {
+- if (item->childCount() == 0)
+- _list.remove(item);
+- }
+- }
+-}
+-
+-
+-/*!
+- \fn SnippetWidget::slotAdd()
+- Opens the dialog to add a snippet
+- */
+-void SnippetWidget::slotAdd()
+-{
+- //kdDebug(5006) << "Ender slotAdd()" << endl;
+- SnippetDlg dlg( mActionCollection, this, "SnippetDlg");
+-
+- /*check if the user clicked a SnippetGroup
+- If not, we set the group variable to the SnippetGroup
+- which the selected item is a child of*/
+- SnippetGroup * group = dynamic_cast<SnippetGroup*>(selectedItem());
+- if ( !group && selectedItem() )
+- group = dynamic_cast<SnippetGroup*>(selectedItem()->parent());
+-
+- /* still no group, let's make a default one */
+- if (!group ) {
+- if ( _list.isEmpty() ) {
+- group = new SnippetGroup(this, i18n("General"), SnippetGroup::getMaxId() );
+- _list.append( group );
+- } else {
+- group = dynamic_cast<SnippetGroup*>( _list.first() );
+- }
+- }
+- assert( group );
+-
+- /*fill the combobox with the names of all SnippetGroup entries*/
+- for (SnippetItem *it=_list.first(); it; it=_list.next()) {
+- if (dynamic_cast<SnippetGroup*>(it)) {
+- dlg.cbGroup->insertItem(it->getName());
+- }
+- }
+- dlg.cbGroup->setCurrentText(group->getName());
+-
+- if (dlg.exec() == QDialog::Accepted) {
+- group = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
+- _list.append( makeItem( group, dlg.snippetName->text(), dlg.snippetText->text(), dlg.keyButton->shortcut() ) );
+- }
+-}
+-
+-/*!
+- \fn SnippetWidget::makeItem( SnippetItem* parent, const QString& name, const QString& text )
+- Helper factory method.
+- */
+-SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const QString& name, const QString& text, const KShortcut& shortcut )
+-{
+- SnippetItem * item = new SnippetItem(parent, name, text);
+- const QString actionName = i18n("Snippet %1").arg(name);
+- const QString normalizedName = QString(actionName).replace(" ", "_");
+- if ( !mActionCollection->action(normalizedName.utf8() ) ) {
+- KAction * action = new KAction( actionName, shortcut, item,
+- SLOT( slotExecute() ), mActionCollection,
+- normalizedName.utf8() );
+- item->setAction(action);
+- connect( item, SIGNAL( execute( QListViewItem* ) ),
+- this, SLOT( slotExecuted( QListViewItem* ) ) );
+- }
+- return item;
+-}
+-
+-/*!
+- \fn SnippetWidget::slotAddGroup()
+- Opens the didalog to add a snippet
+- */
+-void SnippetWidget::slotAddGroup()
+-{
+- //kdDebug(5006) << "Ender slotAddGroup()" << endl;
+- SnippetDlg dlg( mActionCollection, this, "SnippetDlg");
+- dlg.setShowShortcut( false );
+- dlg.snippetText->setEnabled(false);
+- dlg.snippetText->setText("GROUP");
+- dlg.setCaption(i18n("Add Group"));
+- dlg.cbGroup->insertItem(i18n("All"));
+- dlg.cbGroup->setCurrentText(i18n("All"));
+-
+- if (dlg.exec() == QDialog::Accepted) {
+- _list.append( new SnippetGroup(this, dlg.snippetName->text(), SnippetGroup::getMaxId() ) );
+- }
+-}
+-
+-
+-/*!
+- \fn SnippetWidget::slotRemove()
+- Removes the selected snippet
+- */
+-void SnippetWidget::slotRemove()
+-{
+- //get current data
+- QListViewItem * item = currentItem();
+- SnippetItem *snip = dynamic_cast<SnippetItem*>( item );
+- SnippetGroup *group = dynamic_cast<SnippetGroup*>( item );
+- if (!snip)
+- return;
+-
+- if (group) {
+- if (group->childCount() > 0 &&
+- KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),QString::null,KStdGuiItem::del())
+- == KMessageBox::Cancel)
+- return;
+-
+- SnippetItem *it=_list.first();
+- while ( it ) {
+- if (it->getParent() == group->getId()) {
+- SnippetItem *doomed = it;
+- it = _list.next();
+- //kdDebug(5006) << "remove " << doomed->getName() << endl;
+- _list.remove(doomed);
+- } else {
+- it = _list.next();
+- }
+- }
+- }
+-
+- //kdDebug(5006) << "remove " << snip->getName() << endl;
+- _list.remove(snip);
+-}
+-
+-
+-
+-/*!
+- \fn SnippetWidget::slotEdit()
+- Opens the dialog of editing the selected snippet
+- */
+-void SnippetWidget::slotEdit( QListViewItem* item )
+-{
+- if( item == 0 ) {
+- item = currentItem();
+- }
+-
+- SnippetGroup *pGroup = dynamic_cast<SnippetGroup*>(item);
+- SnippetItem *pSnippet = dynamic_cast<SnippetItem*>( item );
+- if (!pSnippet || pGroup) /*selected item must be a SnippetItem but MUST not be a SnippetGroup*/
+- return;
+-
+- //init the dialog
+- SnippetDlg dlg( mActionCollection, this, "SnippetDlg");
+- dlg.snippetName->setText(pSnippet->getName());
+- dlg.snippetText->setText(pSnippet->getText());
+- dlg.keyButton->setShortcut( pSnippet->getAction()->shortcut(), false );
+- dlg.btnAdd->setText(i18n("&Apply"));
+-
+- dlg.setCaption(i18n("Edit Snippet"));
+- /*fill the combobox with the names of all SnippetGroup entries*/
+- for (SnippetItem *it=_list.first(); it; it=_list.next()) {
+- if (dynamic_cast<SnippetGroup*>(it)) {
+- dlg.cbGroup->insertItem(it->getName());
+- }
+- }
+- dlg.cbGroup->setCurrentText(SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName());
+-
+- if (dlg.exec() == QDialog::Accepted) {
+- //update the KListView and the SnippetItem
+- item->setText( 0, dlg.snippetName->text() );
+- pSnippet->setName( dlg.snippetName->text() );
+- pSnippet->setText( dlg.snippetText->text() );
+- pSnippet->getAction()->setShortcut( dlg.keyButton->shortcut());
+-
+- /* if the user changed the parent we need to move the snippet */
+- if ( SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName() != dlg.cbGroup->currentText() ) {
+- SnippetGroup * newGroup = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
+- pSnippet->parent()->takeItem(pSnippet);
+- newGroup->insertItem(pSnippet);
+- pSnippet->resetParent();
+- }
+-
+- setSelected(item, TRUE);
+- }
+-}
+-
+-/*!
+- \fn SnippetWidget::slotEditGroup()
+- Opens the dialog of editing the selected snippet-group
+- */
+-void SnippetWidget::slotEditGroup()
+-{
+- //get current data
+- QListViewItem * item = currentItem();
+-
+- SnippetGroup *pGroup = dynamic_cast<SnippetGroup*>( item );
+- if (!pGroup) /*selected item MUST be a SnippetGroup*/
+- return;
+-
+- //init the dialog
+- SnippetDlg dlg( mActionCollection, this, "SnippetDlg" );
+- dlg.setShowShortcut( false );
+- dlg.snippetName->setText(pGroup->getName());
+- dlg.snippetText->setText(pGroup->getText());
+- dlg.btnAdd->setText(i18n("&Apply"));
+- dlg.snippetText->setEnabled(FALSE);
+- dlg.setCaption(i18n("Edit Group"));
+- dlg.cbGroup->insertItem(i18n("All"));
+-
+- if (dlg.exec() == QDialog::Accepted) {
+- //update the KListView and the SnippetGroup
+- item->setText( 0, dlg.snippetName->text() );
+- pGroup->setName( dlg.snippetName->text() );
+-
+- setSelected(item, TRUE);
+- }
+-}
+-
+-void SnippetWidget::slotExecuted(QListViewItem * item)
+-{
+- if( item == 0 )
+- {
+- item = currentItem();
+- }
+-
+- SnippetItem *pSnippet = dynamic_cast<SnippetItem*>( item );
+- if (!pSnippet || dynamic_cast<SnippetGroup*>(item))
+- return;
+-
+- //process variables if any, then insert into the active view
+- insertIntoActiveView( parseText(pSnippet->getText(), _SnippetConfig.getDelimiter()) );
+-}
+-
+-
+-/*!
+- \fn SnippetWidget::insertIntoActiveView(QString text)
+- Inserts the parameter text into the activ view
+- */
+-void SnippetWidget::insertIntoActiveView( const QString &text )
+-{
+- mEditor->insert( text );
+-}
+-
+-
+-/*!
+- \fn SnippetWidget::writeConfig()
+- Write the cofig file
+- */
+-void SnippetWidget::writeConfig()
+-{
+- if( !_cfg )
+- return;
+- _cfg->deleteGroup("SnippetPart"); //this is neccessary otherwise delete entries will stay in list until
+- //they get overwritten by a more recent entry
+- _cfg->setGroup("SnippetPart");
+-
+- QString strKeyName="";
+- QString strKeyText="";
+- QString strKeyId="";
+-
+- int iSnipCount = 0;
+- int iGroupCount = 0;
+-
+- SnippetItem* item=_list.first();
+- while ( item != 0) {
+-
+- //kdDebug(5006) << "-->ERROR " << item->getName() << endl;
+- //kdDebug(5006) << "SnippetWidget::writeConfig() " << item->getName() << endl;
+- SnippetGroup * group = dynamic_cast<SnippetGroup*>(item);
+- if (group) {
+- //kdDebug(5006) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl;
+- strKeyName=QString("snippetGroupName_%1").arg(iGroupCount);
+- strKeyId=QString("snippetGroupId_%1").arg(iGroupCount);
+-
+- _cfg->writeEntry(strKeyName, group->getName());
+- _cfg->writeEntry(strKeyId, group->getId());
+-
+- iGroupCount++;
+- } else if (dynamic_cast<SnippetItem*>(item)) {
+- //kdDebug(5006) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl;
+- strKeyName=QString("snippetName_%1").arg(iSnipCount);
+- strKeyText=QString("snippetText_%1").arg(iSnipCount);
+- strKeyId=QString("snippetParent_%1").arg(iSnipCount);
+-
+- _cfg->writeEntry(strKeyName, item->getName());
+- _cfg->writeEntry(strKeyText, item->getText());
+- _cfg->writeEntry(strKeyId, item->getParent());
+-
+- KAction * action = item->getAction();
+- assert( action );
+- const KShortcut& sc = action->shortcut();
+- if (!sc.isNull() ) {
+- _cfg->writeEntry( QString("snippetShortcut_%1").arg(iSnipCount), sc.toString() );
+- }
+- iSnipCount++;
+- } else {
+- //kdDebug(5006) << "-->ERROR " << item->getName() << endl;
+- }
+- item = _list.next();
+- }
+- _cfg->writeEntry("snippetCount", iSnipCount);
+- _cfg->writeEntry("snippetGroupCount", iGroupCount);
+-
+- int iCount = 1;
+- QMap<QString, QString>::Iterator it;
+- for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values
+- if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it
+-
+- strKeyName=QString("snippetSavedName_%1").arg(iCount);
+- strKeyText=QString("snippetSavedVal_%1").arg(iCount);
+-
+- _cfg->writeEntry(strKeyName, it.key());
+- _cfg->writeEntry(strKeyText, it.data());
+-
+- iCount++;
+- }
+- _cfg->writeEntry("snippetSavedCount", iCount-1);
+-
+-
+- _cfg->writeEntry( "snippetDelimiter", _SnippetConfig.getDelimiter() );
+- _cfg->writeEntry( "snippetVarInput", _SnippetConfig.getInputMethod() );
+- _cfg->writeEntry( "snippetToolTips", _SnippetConfig.useToolTips() );
+- _cfg->writeEntry( "snippetGroupAutoOpen", _SnippetConfig.getAutoOpenGroups() );
+-
+- _cfg->writeEntry("snippetSingleRect", _SnippetConfig.getSingleRect() );
+- _cfg->writeEntry("snippetMultiRect", _SnippetConfig.getMultiRect() );
+-
+- _cfg->sync();
+-}
+-
+-/*!
+- \fn SnippetWidget::initConfig()
+- Initial read the cofig file
+- */
+-void SnippetWidget::initConfig()
+-{
+- if (_cfg == NULL)
+- _cfg = new KConfig("kmailsnippetrc", false, false);
+-
+- _cfg->setGroup("SnippetPart");
+-
+- QString strKeyName="";
+- QString strKeyText="";
+- QString strKeyId="";
+- SnippetItem *item;
+- SnippetGroup *group;
+-
+- //kdDebug(5006) << "SnippetWidget::initConfig() " << endl;
+-
+- //if entry doesn't get found, this will return -1 which we will need a bit later
+- int iCount = _cfg->readNumEntry("snippetGroupCount", -1);
+-
+- for ( int i=0; i<iCount; i++) { //read the group-list
+- strKeyName=QString("snippetGroupName_%1").arg(i);
+- strKeyId=QString("snippetGroupId_%1").arg(i);
+-
+- QString strNameVal="";
+- int iIdVal=-1;
+-
+- strNameVal = _cfg->readEntry(strKeyName, "");
+- iIdVal = _cfg->readNumEntry(strKeyId, -1);
+- //kdDebug(5006) << "Read group " << " " << iIdVal << endl;
+-
+- if (strNameVal != "" && iIdVal != -1) {
+- group = new SnippetGroup(this, strNameVal, iIdVal);
+- //kdDebug(5006) << "Created group " << group->getName() << " " << group->getId() << endl;
+- _list.append(group);
+- }
+- }
+-
+- /* Check if the snippetGroupCount property has been found
+- if iCount is -1 this means, that the user has his snippets
+- stored without groups. Therefore we will call the
+- initConfigOldVersion() function below */
+- // should not happen since this function has been removed
+-
+- if (iCount != -1) {
+- iCount = _cfg->readNumEntry("snippetCount", 0);
+- for ( int i=0; i<iCount; i++) { //read the snippet-list
+- strKeyName=QString("snippetName_%1").arg(i);
+- strKeyText=QString("snippetText_%1").arg(i);
+- strKeyId=QString("snippetParent_%1").arg(i);
+-
+- QString strNameVal="";
+- QString strTextVal="";
+- int iParentVal = -1;
+-
+- strNameVal = _cfg->readEntry(strKeyName, "");
+- strTextVal = _cfg->readEntry(strKeyText, "");
+- iParentVal = _cfg->readNumEntry(strKeyId, -1);
+- //kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl;
+-
+- if (strNameVal != "" && strTextVal != "" && iParentVal != -1) {
+- KShortcut shortcut( _cfg->readEntry( QString("snippetShortcut_%1").arg(i), QString() ) );
+- item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut );
+- //kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl;
+- _list.append(item);
+- }
+- }
+- } else {
+- //kdDebug() << "iCount is not -1";
+- }
+-
+- iCount = _cfg->readNumEntry("snippetSavedCount", 0);
+-
+- for ( int i=1; i<=iCount; i++) { //read the saved-values and store in QMap
+- strKeyName=QString("snippetSavedName_%1").arg(i);
+- strKeyText=QString("snippetSavedVal_%1").arg(i);
+-
+- QString strNameVal="";
+- QString strTextVal="";
+-
+- strNameVal = _cfg->readEntry(strKeyName, "");
+- strTextVal = _cfg->readEntry(strKeyText, "");
+-
+- if (strNameVal != "" && strTextVal != "") {
+- _mapSaved[strNameVal] = strTextVal;
+- }
+- }
+-
+-
+- _SnippetConfig.setDelimiter( _cfg->readEntry("snippetDelimiter", "$") );
+- _SnippetConfig.setInputMethod( _cfg->readNumEntry("snippetVarInput", 0) );
+- _SnippetConfig.setToolTips( _cfg->readBoolEntry("snippetToolTips", true) );
+- _SnippetConfig.setAutoOpenGroups( _cfg->readNumEntry("snippetGroupAutoOpen", 1) );
+-
+- _SnippetConfig.setSingleRect( _cfg->readRectEntry("snippetSingleRect", 0L) );
+- _SnippetConfig.setMultiRect( _cfg->readRectEntry("snippetMultiRect", 0L) );
+-}
+-
+-/*!
+- \fn SnippetWidget::maybeTip( const QPoint & p )
+- Shows the Snippet-Text as ToolTip
+- */
+-void SnippetWidget::maybeTip( const QPoint & p )
+-{
+- SnippetItem * item = dynamic_cast<SnippetItem*>( itemAt( p ) );
+- if (!item)
+- return;
+-
+- QRect r = itemRect( item );
+-
+- if (r.isValid() &&
+- _SnippetConfig.useToolTips() )
+- {
+- tip( r, item->getText() ); //show the snippet's text
+- }
+-}
+-
+-/*!
+- \fn SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int )
+- Shows the Popup-Menu depending item is a valid pointer
+-*/
+-void SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int )
+-{
+- KPopupMenu popup;
+-
+- SnippetItem * selectedItem = static_cast<SnippetItem *>(item);
+- if ( item ) {
+- popup.insertTitle( selectedItem->getName() );
+- if (dynamic_cast<SnippetGroup*>(item)) {
+- popup.insertItem( i18n("Edit &group..."), this, SLOT( slotEditGroup() ) );
+- } else {
+- popup.insertItem( SmallIconSet("editpaste"), i18n("&Paste"), this, SLOT( slotExecuted() ) );
+- popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, SLOT( slotEdit() ) );
+- }
+- popup.insertItem( SmallIconSet("editdelete"), i18n("&Remove"), this, SLOT( slotRemove() ) );
+- popup.insertSeparator();
+- } else {
+- popup.insertTitle(i18n("Text Snippets"));
+- }
+- popup.insertItem( i18n("&Add Snippet..."), this, SLOT( slotAdd() ) );
+- popup.insertItem( i18n("Add G&roup..."), this, SLOT( slotAddGroup() ) );
+-
+- popup.exec(p);
+-}
+-
+-
+-// fn SnippetWidget::parseText(QString text, QString del)
+-/*!
+- This function is used to parse the given QString for variables. If found the user will be prompted
+- for a replacement value. It returns the string text with all replacements made
+- */
+-QString SnippetWidget::parseText(QString text, QString del)
+-{
+- QString str = text;
+- QString strName = "";
+- QString strNew = "";
+- QString strMsg="";
+- int iFound = -1;
+- int iEnd = -1;
+- QMap<QString, QString> mapVar;
+- int iInMeth = _SnippetConfig.getInputMethod();
+- QRect rSingle = _SnippetConfig.getSingleRect();
+- QRect rMulti = _SnippetConfig.getMultiRect();
+-
+- do {
+- iFound = text.find(QRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this QRegExp
+- if (iFound >= 0) {
+- iEnd = text.find(del, iFound+1)+1;
+- strName = text.mid(iFound, iEnd-iFound);
+-
+- if ( strName != del+del ) { //if not doubel-delimiter
+- if (iInMeth == 0) { //if input-method "single" is selected
+- if ( mapVar[strName].length() <= 0 ) { // and not already in map
+- strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName);
+- strNew = showSingleVarDialog( strName, &_mapSaved, rSingle );
+- if (strNew=="")
+- return ""; //user clicked Cancle
+- } else {
+- continue; //we have already handled this variable
+- }
+- } else {
+- strNew = ""; //for inputmode "multi" just reset new valaue
+- }
+- } else {
+- strNew = del; //if double-delimiter -> replace by single character
+- }
+-
+- if (iInMeth == 0) { //if input-method "single" is selected
+- str.replace(strName, strNew);
+- }
+-
+- mapVar[strName] = strNew;
+- }
+- } while (iFound != -1);
+-
+- if (iInMeth == 1) { //check config, if input-method "multi" is selected
+- int w, bh, oh;
+- w = rMulti.width();
+- bh = rMulti.height();
+- oh = rMulti.top();
+- if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) { //generate and show the dialog
+- QMap<QString, QString>::Iterator it;
+- for ( it = mapVar.begin(); it != mapVar.end(); ++it ) { //walk through the map and do the replacement
+- str.replace(it.key(), it.data());
+- }
+- } else {
+- return "";
+- }
+-
+- rMulti.setWidth(w); //this is a hack to save the dialog's dimensions in only one QRect
+- rMulti.setHeight(bh);
+- rMulti.setTop(oh);
+- rMulti.setLeft(0);
+- _SnippetConfig.setMultiRect(rMulti);
+- }
+-
+- _SnippetConfig.setSingleRect(rSingle);
+-
+- return str;
+-}
+-
+-
+-// fn SnippetWidget::showMultiVarDialog()
+-/*!
+- This function constructs a dialog which contains a label and a linedit for every
+- variable that is stored in the given map except the double-delimiter entry
+- It return true if everything was ok and false if the user hit cancel
+- */
+-bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QString, QString> * mapSave,
+- int & iWidth, int & iBasicHeight, int & iOneHeight)
+-{
+- //if no var -> no need to show
+- if (map->count() == 0)
+- return true;
+-
+- //if only var is the double-delimiter -> no need to show
+- QMap<QString, QString>::Iterator it = map->begin();
+- if ( map->count() == 1 && it.data()==_SnippetConfig.getDelimiter()+_SnippetConfig.getDelimiter() )
+- return true;
+-
+- QMap<QString, KTextEdit *> mapVar2Te; //this map will help keeping track which TEXTEDIT goes with which variable
+- QMap<QString, QCheckBox *> mapVar2Cb; //this map will help keeping track which CHECKBOX goes with which variable
+-
+- // --BEGIN-- building a dynamic dialog
+- QDialog dlg(this);
+- dlg.setCaption(i18n("Enter Values for Variables"));
+-
+- QGridLayout * layout = new QGridLayout( &dlg, 1, 1, 11, 6, "layout");
+- QGridLayout * layoutTop = new QGridLayout( 0, 1, 1, 0, 6, "layoutTop");
+- QGridLayout * layoutVar = new QGridLayout( 0, 1, 1, 0, 6, "layoutVar");
+- QGridLayout * layoutBtn = new QGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
+-
+- KTextEdit *te = NULL;
+- QLabel * labTop = NULL;
+- QCheckBox * cb = NULL;
+-
+- labTop = new QLabel( &dlg, "label" );
+- labTop->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0,
+- labTop->sizePolicy().hasHeightForWidth() ) );
+- labTop->setText(i18n("Enter the replacement values for these variables:"));
+- layoutTop->addWidget(labTop, 0, 0);
+- layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+-
+-
+- int i = 0; //walk through the variable map and add
+- for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout
+- if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
+- continue;
+-
+- cb = new QCheckBox( &dlg, "cbVar" );
+- cb->setChecked( FALSE );
+- cb->setText(it.key());
+- layoutVar->addWidget( cb, i ,0, Qt::AlignTop );
+-
+- te = new KTextEdit( &dlg, "teVar" );
+- layoutVar->addWidget( te, i, 1, Qt::AlignTop );
+-
+- if ((*mapSave)[it.key()].length() > 0) {
+- cb->setChecked( TRUE );
+- te->setText((*mapSave)[it.key()]);
+- }
+-
+- mapVar2Te[it.key()] = te;
+- mapVar2Cb[it.key()] = cb;
+-
+- QToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") );
+- QWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. "
+- "If you use the same variable later, even in another snippet, the value entered to the right "
+- "will be the default value for that variable.") );
+-
+- i++;
+- }
+- layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+-
+- KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
+- btn1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0,
+- btn1->sizePolicy().hasHeightForWidth() ) );
+- layoutBtn->addWidget( btn1, 0, 0 );
+-
+- KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
+- btn2->setDefault( TRUE );
+- btn2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0,
+- btn2->sizePolicy().hasHeightForWidth() ) );
+- layoutBtn->addWidget( btn2, 0, 1 );
+-
+- layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+- // --END-- building a dynamic dialog
+-
+- //connect the buttons to the QDialog default slots
+- connect(btn1, SIGNAL(clicked()), &dlg, SLOT(reject()) );
+- connect(btn2, SIGNAL(clicked()), &dlg, SLOT(accept()) );
+-
+- //prepare to execute the dialog
+- bool bReturn = false;
+- //resize the textedits
+- if (iWidth > 1) {
+- QRect r = dlg.geometry();
+- r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
+- r.setWidth(iWidth);
+- dlg.setGeometry(r);
+- }
+- if ( i > 0 && // only if there are any variables
+- dlg.exec() == QDialog::Accepted ) {
+-
+- QMap<QString, KTextEdit *>::Iterator it2;
+- for ( it2 = mapVar2Te.begin(); it2 != mapVar2Te.end(); ++it2 ) {
+- if (it2.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
+- continue;
+- (*map)[it2.key()] = it2.data()->text(); //copy the entered values back to the given map
+-
+- if (mapVar2Cb[it2.key()]->isChecked()) //if the checkbox is on; save the values for later
+- (*mapSave)[it2.key()] = it2.data()->text();
+- else
+- (*mapSave).erase(it2.key());
+- }
+- bReturn = true;
+-
+- iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height();
+- iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
+- iWidth = dlg.geometry().width();
+- }
+-
+- //do some cleanup
+- QMap<QString, KTextEdit *>::Iterator it1;
+- for (it1 = mapVar2Te.begin(); it1 != mapVar2Te.end(); ++it1)
+- delete it1.data();
+- mapVar2Te.clear();
+- QMap<QString, QCheckBox *>::Iterator it2;
+- for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
+- delete it2.data();
+- mapVar2Cb.clear();
+- delete layoutTop;
+- delete layoutVar;
+- delete layoutBtn;
+- delete layout;
+-
+- if (i==0) //if nothing happened this means, that there are no variables to translate
+- return true; //.. so just return OK
+-
+- return bReturn;
+-// return true;
+-}
+-
+-
+-// fn SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * mapSave)
+-/*!
+- This function constructs a dialog which contains a label and a linedit for the given variable
+- It return either the entered value or an empty string if the user hit cancel
+- */
+-QString SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * mapSave, QRect & dlgSize)
+-{
+- // --BEGIN-- building a dynamic dialog
+- QDialog dlg(this);
+- dlg.setCaption(i18n("Enter Values for Variables"));
+-
+- QGridLayout * layout = new QGridLayout( &dlg, 1, 1, 11, 6, "layout");
+- QGridLayout * layoutTop = new QGridLayout( 0, 1, 1, 0, 6, "layoutTop");
+- QGridLayout * layoutVar = new QGridLayout( 0, 1, 1, 0, 6, "layoutVar");
+- QGridLayout * layoutBtn = new QGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
+-
+- KTextEdit *te = NULL;
+- QLabel * labTop = NULL;
+- QCheckBox * cb = NULL;
+-
+- labTop = new QLabel( &dlg, "label" );
+- layoutTop->addWidget(labTop, 0, 0);
+- labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
+- layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+-
+-
+- cb = new QCheckBox( &dlg, "cbVar" );
+- cb->setChecked( FALSE );
+- cb->setText(i18n( "Make value &default" ));
+-
+- te = new KTextEdit( &dlg, "teVar" );
+- layoutVar->addWidget( te, 0, 1, Qt::AlignTop);
+- layoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
+- if ((*mapSave)[var].length() > 0) {
+- cb->setChecked( TRUE );
+- te->setText((*mapSave)[var]);
+- }
+-
+- QToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") );
+- QWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. "
+- "If you use the same variable later, even in another snippet, the value entered to the right "
+- "will be the default value for that variable.") );
+-
+- layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+-
+- KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
+- layoutBtn->addWidget( btn1, 0, 0 );
+-
+- KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
+- btn2->setDefault( TRUE );
+- layoutBtn->addWidget( btn2, 0, 1 );
+-
+- layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+- te->setFocus();
+- // --END-- building a dynamic dialog
+-
+- //connect the buttons to the QDialog default slots
+- connect(btn1, SIGNAL(clicked()), &dlg, SLOT(reject()) );
+- connect(btn2, SIGNAL(clicked()), &dlg, SLOT(accept()) );
+-
+- //execute the dialog
+- QString strReturn = "";
+- if (dlgSize.isValid())
+- dlg.setGeometry(dlgSize);
+- if ( dlg.exec() == QDialog::Accepted ) {
+- if (cb->isChecked()) //if the checkbox is on; save the values for later
+- (*mapSave)[var] = te->text();
+- else
+- (*mapSave).erase(var);
+-
+- strReturn = te->text(); //copy the entered values back the the given map
+-
+- dlgSize = dlg.geometry();
+- }
+-
+- //do some cleanup
+- delete cb;
+- delete te;
+- delete labTop;
+- delete btn1;
+- delete btn2;
+- delete layoutTop;
+- delete layoutVar;
+- delete layoutBtn;
+- delete layout;
+-
+- return strReturn;
+-}
+-
+-// fn SnippetWidget::acceptDrag (QDropEvent *event) const
+-/*!
+- Reimplementation from KListView.
+- Check here if the data the user is about to drop fits our restrictions.
+- We only accept dropps of plaintext, because from the dropped text
+- we will create a snippet.
+- */
+-bool SnippetWidget::acceptDrag (QDropEvent *event) const
+-{
+- //kdDebug(5006) << "Format: " << event->format() << "" << event->pos() << endl;
+-
+- QListViewItem * item = itemAt(event->pos());
+-
+- if (item &&
+- QString(event->format()).startsWith("text/plain") &&
+- static_cast<SnippetWidget *>(event->source()) != this) {
+- ///kdDebug(5006) << "returning TRUE " << endl;
+- return TRUE;
+- } else if(item &&
+- QString(event->format()).startsWith("x-kmailsnippet") &&
+- static_cast<SnippetWidget *>(event->source()) != this)
+- {
+- //kdDebug(5006) << "returning TRUE " << endl;
+- return TRUE;
+- } else {
+- //kdDebug(5006) << "returning FALSE" << endl;
+- event->acceptAction(FALSE);
+- return FALSE;
+- }
+-}
+-
+-// fn SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *after)
+-/*!
+- This slot is connected to the dropped signal.
+- If it is emitted, we need to construct a new snippet entry with
+- the data given
+- */
+-void SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *)
+-{
+- QListViewItem * item2 = itemAt(e->pos());
+-
+- SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2);
+- if (!group)
+- group = dynamic_cast<SnippetGroup *>(item2->parent());
+-
+- QCString dropped;
+- QByteArray data = e->encodedData("text/plain");
+- if ( e->provides("text/plain") && data.size()>0 ) {
+- //get the data from the event...
+- QString encData(data.data());
+- //kdDebug(5006) << "encData: " << encData << endl;
+-
+- //... then fill the dialog with the given data
+- SnippetDlg dlg( mActionCollection, this, "SnippetDlg" );
+- dlg.snippetName->clear();
+- dlg.snippetText->setText(encData);
+-
+- /*fill the combobox with the names of all SnippetGroup entries*/
+- for (SnippetItem *it=_list.first(); it; it=_list.next()) {
+- if (dynamic_cast<SnippetGroup*>(it)) {
+- dlg.cbGroup->insertItem(it->getName());
+- }
+- }
+- dlg.cbGroup->setCurrentText(group->getName());
+-
+- if (dlg.exec() == QDialog::Accepted) {
+- /* get the group that the user selected with the combobox */
+- group = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
+- _list.append( makeItem(group, dlg.snippetName->text(), dlg.snippetText->text(), dlg.keyButton->shortcut() ) );
+- }
+- }
+-}
+-
+-void SnippetWidget::startDrag()
+-{
+- QString text = dynamic_cast<SnippetItem*>( currentItem() )->getText();
+- QTextDrag *drag = new QTextDrag(text, this);
+- drag->setSubtype("x-textsnippet");
+- drag->drag();
+-}
+-
+-void SnippetWidget::slotExecute()
+-{
+- slotExecuted(currentItem());
+-}
+-
+-
+-#include "snippet_widget.moc"
+-
+Index: kmail/kmmainwin.cpp
+===================================================================
+--- kmail/kmmainwin.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmmainwin.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -40,7 +40,7 @@
+ actionCollection(), "new_mail_client" );
+
+ mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
+- mKMMainWidget->resize( 450, 600 );
++ mKMMainWidget->resize( 725, 700 );
+ setCentralWidget(mKMMainWidget);
+ setupStatusBar();
+ if (kmkernel->xmlGuiInstance())
+Index: kmail/kmailicalifaceimpl.cpp
+===================================================================
+--- kmail/kmailicalifaceimpl.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmailicalifaceimpl.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1301,7 +1301,8 @@
+
+ // French
+ folderNames[2][KFolderTreeItem::Calendar] = QString::fromLatin1("Calendrier");
+- folderNames[2][KFolderTreeItem::Tasks] = QString::fromLatin1("Tâches");
++ // Tasks = Tâches (â == 0xE2 in latin1)
++ folderNames[2][KFolderTreeItem::Tasks] = QString::fromLatin1("T\342ches");
+ folderNames[2][KFolderTreeItem::Journals] = QString::fromLatin1("Journal");
+ folderNames[2][KFolderTreeItem::Contacts] = QString::fromLatin1("Contacts");
+ folderNames[2][KFolderTreeItem::Notes] = QString::fromLatin1("Notes");
+Index: kmail/dcopimap.desktop
+===================================================================
+--- kmail/dcopimap.desktop.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/dcopimap.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Comment[is]=Póstforrit með DCOP viðmóti
+ Comment[it]=Programma di posta con un'interfaccia DCOP
+ Comment[ja]=DCOP インターフェース付ã®ãƒ¡ãƒ¼ãƒ«ãƒ—ãƒã‚°ãƒ©ãƒ
++Comment[ka]=სáƒáƒ¤áƒáƒ¡áƒ¢áƒ პრáƒáƒ’რáƒáƒ›áƒ DCOP ინტერფეისით
+ Comment[kk]=DCOP интерфейÑÑ‚Ñ– пошта бағдарламаÑÑ‹
+ Comment[km]=កម្មវិធី​អ៊ីមែល​ដែល​មាន​ចំណុច​ប្រទាក់ DCOP
+ Comment[lt]=Pašto programa su DCOP sąsaja
+Index: kmail/encodingdetector.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kmail/encodingdetector.h 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,166 @@
++/*
++ This file was taken from the KDE 4.x libraries and backported to Qt 3.
++
++ Copyright (C) 1999 Lars Knoll (knoll at mpi-hd.mpg.de)
++ Copyright (C) 2007 Nick Shaforostoff (shafff at ukr.net)
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++
++*/
++#ifndef ENCODINGDETECTOR_H
++#define ENCODINGDETECTOR_H
++
++#include <qstring.h>
++
++class QTextCodec;
++class QTextDecoder;
++class EncodingDetectorPrivate;
++
++/**
++ * @short Provides encoding detection capabilities.
++ *
++ * Searches for encoding declaration inside raw data -- meta and xml tags.
++ * In the case it can't find it, uses heuristics for specified language.
++ *
++ * If it finds unicode BOM marks, it changes encoding regardless of what the user has told
++ *
++ * Intended lifetime of the object: one instance per document.
++ *
++ * Typical use:
++ * \code
++ * QByteArray data;
++ * ...
++ * EncodingDetector detector;
++ * detector.setAutoDetectLanguage(EncodingDetector::Cyrillic);
++ * QString out=detector.decode(data);
++ * \endcode
++ *
++ *
++ * Do not mix decode() with decodeWithBuffering()
++ *
++ * @short Guess encoding of char array
++ *
++ */
++class EncodingDetector
++{
++public:
++ enum EncodingChoiceSource
++ {
++ DefaultEncoding,
++ AutoDetectedEncoding,
++ BOM,
++ EncodingFromXMLHeader,
++ EncodingFromMetaTag,
++ EncodingFromHTTPHeader,
++ UserChosenEncoding
++ };
++
++ enum AutoDetectScript
++ {
++ None,
++ SemiautomaticDetection,
++ Arabic,
++ Baltic,
++ CentralEuropean,
++ ChineseSimplified,
++ ChineseTraditional,
++ Cyrillic,
++ Greek,
++ Hebrew,
++ Japanese,
++ Korean,
++ NorthernSaami,
++ SouthEasternEurope,
++ Thai,
++ Turkish,
++ Unicode,
++ WesternEuropean
++ };
++
++ /**
++ * Default codec is latin1 (as html spec says), EncodingChoiceSource is default, AutoDetectScript=Semiautomatic
++ */
++ EncodingDetector();
++
++ /**
++ * Allows to set Default codec, EncodingChoiceSource, AutoDetectScript
++ */
++ EncodingDetector(QTextCodec* codec, EncodingChoiceSource source, AutoDetectScript script=None);
++ ~EncodingDetector();
++
++ //const QTextCodec* codec() const;
++
++ /**
++ * @returns true if specified encoding was recognized
++ */
++ bool setEncoding(const char *encoding, EncodingChoiceSource type);
++
++ /**
++ * Convenience method.
++ * @returns mime name of detected encoding
++ */
++ const char* encoding() const;
++
++ bool visuallyOrdered() const;
++
++// void setAutoDetectLanguage( const QString& );
++// const QString& autoDetectLanguage() const;
++
++ void setAutoDetectLanguage( AutoDetectScript );
++ AutoDetectScript autoDetectLanguage() const;
++
++ EncodingChoiceSource encodingChoiceSource() const;
++
++ /**
++ * Analyze text data.
++ * @returns true if there was enough data for accurate detection
++ */
++ bool analyze( const char *data, int len );
++
++ /**
++ * Analyze text data.
++ * @returns true if there was enough data for accurate detection
++ */
++ bool analyze( const QByteArray &data );
++
++ /**
++ * Takes lang name _after_ it were i18n()'ed
++ */
++ static AutoDetectScript scriptForName(const QString& lang);
++ static QString nameForScript(AutoDetectScript);
++ static AutoDetectScript scriptForLanguageCode(const QString &lang);
++ static bool hasAutoDetectionForScript(AutoDetectScript);
++
++protected:
++ /**
++ * Check if we are really utf8. Taken from kate
++ *
++ * @returns true if current encoding is utf8 and the text cannot be in this encoding
++ *
++ * Please somebody read http://de.wikipedia.org/wiki/UTF-8 and check this code...
++ */
++ bool errorsIfUtf8 (const char* data, int length);
++
++ /**
++ * @returns QTextDecoder for detected encoding
++ */
++ QTextDecoder* decoder();
++
++private:
++ EncodingDetectorPrivate* const d;
++};
++
++#endif
+Index: kmail/profiles/profile-high-contrast-rc.desktop
+===================================================================
+--- kmail/profiles/profile-high-contrast-rc.desktop.orig 2008-02-13 10:39:31.000000000 +0100
++++ kmail/profiles/profile-high-contrast-rc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=Mikil birtuskil
+ Name[it]=Alto contrasto
+ Name[ja]=ãƒã‚¤ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ
++Name[ka]=მáƒáƒ¦áƒáƒšáƒ˜ კáƒáƒœáƒ¢áƒ áƒáƒ¡áƒ¢áƒ˜
+ Name[kk]=КонтраÑÑ‚Ñ‹Ò“Ñ‹ жоғары
+ Name[km]=កម្រិážâ€‹áž–ណ៌​ážáŸ’ពស់
+ Name[lt]=Didelis kontrastas
+@@ -81,6 +82,7 @@
+ Comment[is]=Stærra letur fyrir notendur með slæma sjón
+ Comment[it]=Dimensioni più grandi dei caratteri per chi ha problemi di vista
+ Comment[ja]=視力障害者ã®ãŸã‚ã«å¤§ããªãƒ•ã‚©ãƒ³ãƒˆã‚’使用ã—ã¾ã™
++Comment[ka]=შრიფტის გáƒáƒ–რდილი ზáƒáƒ›áƒ მხედველáƒáƒ‘áƒáƒ¨áƒ”ზღუდული მáƒáƒ›áƒ®áƒ›áƒáƒ ებლებისთვის
+ Comment[kk]=Көру қабілеті нашарларға арналған ірі қаріпті көрініÑ
+ Comment[km]=បង្កើន​ទំហំពុម្ពអក្សរ ដើម្បី​បង្ក​លក្ážážŽáŸˆâ€‹áž„ាយស្រួល​ដល់​ជន​ពិការ​ភ្នែក
+ Comment[lt]=Padidinti šriftų dydžiai blogai matantiems naudotojams
+Index: kmail/profiles/profile-default-rc.desktop
+===================================================================
+--- kmail/profiles/profile-default-rc.desktop.orig 2007-05-14 09:54:34.000000000 +0200
++++ kmail/profiles/profile-default-rc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -31,6 +31,7 @@
+ Name[is]=Sjálfgefið
+ Name[it]=Predefinito
+ Name[ja]=標準
++Name[ka]=ნáƒáƒ’ულისხმევი
+ Name[kk]=Әдетті
+ Name[km]=លំនាំដើម
+ Name[lt]=Numatytasis
+@@ -61,7 +62,8 @@
+ Name[th]=ค่าปริยาย
+ Name[tr]=Öntanımlı
+ Name[uk]=Типовий
+-Name[uz]=Ðндоза
++Name[uz]=Andoza
++Name[uz at cyrillic]=Ðндоза
+ Name[ven]=Zwi si zwavhudi
+ Name[vi]=Mặc định
+ Name[xh]=Engagqibekanga
+@@ -97,6 +99,7 @@
+ Comment[is]=Venjulegt snið
+ Comment[it]=Profilo standard
+ Comment[ja]=標準プãƒãƒ•ã‚¡ã‚¤ãƒ«
++Comment[ka]=სტáƒáƒœáƒ“áƒáƒ ტული პრáƒáƒ¤áƒ˜áƒšáƒ˜
+ Comment[kk]=Стандартты профилі
+ Comment[km]=ទម្រង់​ážáŸ’នាážâ€‹áž‚ំរូ
+ Comment[lt]=Standartinis profilis
+@@ -124,7 +127,8 @@
+ Comment[th]=โปรไฟล์มาตรà¸à¸²à¸™
+ Comment[tr]=Standart profil
+ Comment[uk]=Типовий профіль
+-Comment[uz]=Ðндоза профили
++Comment[uz]=Andoza profili
++Comment[uz at cyrillic]=Ðндоза профили
+ Comment[ven]=Zwithu zwo doweleaho
+ Comment[vi]=Hồ sơ chuẩn
+ Comment[xh]=Imboniselo yabucala esezantsi
+Index: kmail/profiles/profile-html-rc.desktop
+===================================================================
+--- kmail/profiles/profile-html-rc.desktop.orig 2008-02-13 10:39:31.000000000 +0100
++++ kmail/profiles/profile-html-rc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -30,6 +30,7 @@
+ Comment[is]=Staðlað snið með HTML forsýn - minna öryggi!
+ Comment[it]=Profilo standard con l'anteprima HTML abilitata - meno sicuro!
+ Comment[ja]=HTML プレビューを有効ã«ã—ãŸæ¨™æº–プãƒãƒ•ã‚¡ã‚¤ãƒ« - 安全度ã¯ä¸‹ãŒã‚Šã¾ã™!
++Comment[ka]=სტáƒáƒœáƒ“áƒáƒ ტული პრáƒáƒ¤áƒ˜áƒšáƒ˜ HTML ესკიზით - ნáƒáƒ™áƒšáƒ”ბáƒáƒ“ უსáƒáƒ¤áƒ თხáƒ!
+ Comment[kk]=Стандартты, HTML көрініÑÑ– бар профилі - қауіпÑізігі төмен!
+ Comment[km]=ទម្រង់​ážáŸ’នាážâ€‹áž‚ំរូ​ដែល​អាច​មើល HTML ជាមុន - មិន​សូវ​មាន​សុវážáŸ’ážáž·áž—ាព​ឡើយ !
+ Comment[lt]=Standartinis profilis su HTML peržiūra – mažiau saugus!
+Index: kmail/profiles/profile-purist-rc.desktop
+===================================================================
+--- kmail/profiles/profile-purist-rc.desktop.orig 2007-05-14 09:54:34.000000000 +0200
++++ kmail/profiles/profile-purist-rc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -18,6 +18,7 @@
+ Name[hu]=EgyszerűsÃtett
+ Name[it]=Purista
+ Name[ja]=ç´”æ£
++Name[ka]=პურისტი
+ Name[kk]=ПуриÑÑ‚
+ Name[km]=បរិសុទ្ធ
+ Name[lt]=Itin paprastas
+@@ -71,6 +72,7 @@
+ Comment[is]=Slökkt á flestum aukahlutum, notast við vÃðværar stillingar KDE
+ Comment[it]=La maggior parte delle funzioni sono disabilitate, vengono usate le impostazioni globali di KDE
+ Comment[ja]=ã»ã¨ã‚“ã©ã®æ©Ÿèƒ½ã‚’無効ã«ã—ã€KDE ã®å…¨ä½“è¨å®šã‚’使用ã—ã¾ã™
++Comment[ka]=უმეტესáƒáƒ‘რშესáƒáƒ«áƒšáƒ”ბლáƒáƒ‘ებისრáƒáƒ›áƒáƒ თულიáƒ, გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრKDE-ს ზáƒáƒ’áƒáƒ“ი პáƒáƒ áƒáƒ›áƒ”ტრები
+ Comment[kk]=Мүмкіндіктердің көбі, KDE жалпылары ғана қалдырып, өшірілген
+ Comment[km]=លក្ážážŽáŸˆâ€‹áž–ិសáŸážŸâ€‹áž—ាគ​ច្រើន​ážáŸ’រូវ​បាន​បិទ ដោយ​ប្រើ​ážáŸ‚​ការ​កំណážáŸ‹â€‹ážŸáž€áž›â€‹ážšáž”ស់ KDE ប៉ុណ្ណោះ
+ Comment[lt]=Dauguma savybių išjungta, naudojami globalūs KDE nustatymai
+Index: kmail/profiles/profile-secure-rc.desktop
+===================================================================
+--- kmail/profiles/profile-secure-rc.desktop.orig 2008-02-13 10:39:31.000000000 +0100
++++ kmail/profiles/profile-secure-rc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -26,6 +26,7 @@
+ Name[is]=Öruggast
+ Name[it]=Massima sicurezza
+ Name[ja]=最も安全
++Name[ka]=ყველáƒáƒ–ე უსáƒáƒ¤áƒ თხáƒ
+ Name[kk]=Ең қауіпÑіз
+ Name[km]=សុវážáŸ’ážáž·áž—ាព​បំផុáž
+ Name[lt]=Saugiausias
+@@ -51,7 +52,8 @@
+ Name[tg]=Ðз ҳама бехавфнокаш
+ Name[tr]=En Güvenli
+ Name[uk]=Ðайбільш безпечний
+-Name[uz]=Жуда хавфÑиз
++Name[uz]=Juda xavfsiz
++Name[uz at cyrillic]=Жуда хавфÑиз
+ Name[zh_CN]=最安全
+ Name[zh_TW]=最安全
+ Comment=Sets all necessary options to achieve maximum security
+@@ -79,6 +81,7 @@
+ Comment[is]=Setur allar stillingar þannig að öryggið sé mest
+ Comment[it]=Imposta tutte le opzioni necessario per ottenere la massima sicurezza
+ Comment[ja]=最大ã®ã‚»ã‚ュリティ確ä¿ã®ãŸã‚ã«å¿…è¦ãªã™ã¹ã¦ã®ã‚ªãƒ—ションをè¨å®šã—ã¾ã™
++Comment[ka]=áƒáƒ§áƒ”ნებს ყველრსáƒáƒáƒ˜áƒ რáƒáƒžáƒªáƒ˜áƒáƒ¡ მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ ი უსáƒáƒ¤áƒ თხáƒáƒ”ბის მისáƒáƒ¦áƒ¬áƒ”ვáƒáƒ“
+ Comment[kk]=ҚауіпÑіздігі мейілінше арттырып бапталғаны
+ Comment[km]=កំណážáŸ‹â€‹áž‡áž˜áŸ’រើស​ចាំបាច់​ទាំងអស់ ដើម្បី​ទទួល​បាន​សុវážáŸ’ážáž·áž—ាព​ážáŸ’ពស់​បំផុáž
+ Comment[lt]=Nustato visas būtinas maksimaliam saugumui parinktis
+Index: kmail/application_octetstream.desktop
+===================================================================
+--- kmail/application_octetstream.desktop.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/application_octetstream.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -15,6 +15,7 @@
+ Name[gl]=Aplicación Octetstream
+ Name[hu]=Alkalmazás-adatfolyam
+ Name[ja]=アプリケーション オクテット ストリーãƒ
++Name[ka]=რვáƒáƒ“ინებიáƒáƒœáƒ˜ პრáƒáƒ’რáƒáƒ›áƒ
+ Name[kk]=Қолданбаның бинарлы ағымы
+ Name[km]=Octetstream កម្មវិធី
+ Name[ms]=Aliran Oktet Aplikasi
+@@ -55,6 +56,7 @@
+ Comment[is]=Sniðmátstól fyrir application/octet-stream
+ Comment[it]=Un plugin per formattare application/octet-stream
+ Comment[ja]=application/octet-stream 㮠Bodypart フォーマッタプラグイン
++Comment[ka]=ნáƒáƒ¬áƒ˜áƒšáƒ˜áƒ‘რივი დáƒáƒ›áƒ¤áƒáƒ მáƒáƒ¢áƒ”ბელი მáƒáƒ“ული პრáƒáƒ’რáƒáƒ›áƒ˜áƒ¡áƒ—ვის/octet-stream
+ Comment[kk]=Application/octet-stream үшін пішімдегіш модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​កម្មវិធី​ធ្វើ​ទ្រង់ទ្រាយ​ផ្នែក​ážáž½ សម្រាប់​កម្មវិធី/octet-stream
+ Comment[lt]=application/octet-stream formatavimo priedas
+Index: kmail/kmmessage.h
+===================================================================
+--- kmail/kmmessage.h.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmmessage.h 2008-06-29 20:10:36.000000000 +0200
+@@ -627,9 +627,6 @@
+ /** Delete all body parts. */
+ void deleteBodyParts();
+
+- /** Removes the given body part. */
+- void removeBodyPart( DwBodyPart * dwPart );
+-
+ /** Set "Status" and "X-Status" fields of the message from the
+ * internal message status. */
+ void setStatusFields();
+Index: kmail/kmail_config_misc.desktop
+===================================================================
+--- kmail/kmail_config_misc.desktop.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmail_config_misc.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -37,6 +37,7 @@
+ Name[is]=Ãmislegt
+ Name[it]=Varie
+ Name[ja]=ãã®ä»–
++Name[ka]=სხვáƒáƒ“áƒáƒ¡áƒ®áƒ•áƒ
+ Name[kk]=БаÑқалары
+ Name[km]=ផ្សáŸáž„ៗ
+ Name[lt]=Įvairūs
+@@ -62,7 +63,8 @@
+ Name[tg]=Ғайра
+ Name[tr]=Çeşitli
+ Name[uk]=Різне
+-Name[uz]=Ҳар хил
++Name[uz]=Har xil
++Name[uz at cyrillic]=Ҳар хил
+ Name[zh_CN]=æ‚项
+ Name[zh_TW]=其他
+ Comment=Settings that don't fit elsewhere
+@@ -88,6 +90,7 @@
+ Comment[is]=Stillingar sem passa ekki annars staðar
+ Comment[it]=Impostazioni che non rientrano in altre categorie
+ Comment[ja]=ãã®ä»–ã®è¨å®š
++Comment[ka]=პáƒáƒ áƒáƒ›áƒ”ტრები,რáƒáƒ›áƒšáƒ”ბიც სხვáƒáƒ¡ áƒáƒ ერგებáƒ
+ Comment[kk]=БаÑқа параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážŠáŸ‚ល​មិន​ážáŸ’រូវ​នឹង​កន្លែង​ផ្សáŸáž„
+ Comment[lt]=Kiti nustatymai
+@@ -136,6 +139,7 @@
+ Keywords[is]=kmail,ýmislegt
+ Keywords[it]=kmail,varie
+ Keywords[ja]=kmail,ãã®ä»–
++Keywords[ka]=kmail,სხვáƒáƒ“áƒáƒ¡áƒ®áƒ•áƒ
+ Keywords[km]=kmail,ផ្សáŸáž„ៗ
+ Keywords[lt]=kmail,misc,įvairūs
+ Keywords[mk]=kmail,misc,кпошта,разно
+@@ -158,5 +162,6 @@
+ Keywords[tg]=kmail,misc,ғайра,дигар
+ Keywords[tr]=kmail,çeşitli
+ Keywords[uk]=kmail,різне
+-Keywords[uz]=kmail,ҳар хил
++Keywords[uz]=kmail,har xil
++Keywords[uz at cyrillic]=kmail,ҳар хил
+ Keywords[zh_CN]=kmail,misc,æ‚项
+Index: kmail/newfolderdialog.cpp
+===================================================================
+--- kmail/newfolderdialog.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/newfolderdialog.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -148,7 +148,7 @@
+ }
+ if ( mFolder->folderType() == KMFolderTypeCachedImap ) {
+ ImapAccountBase* ai = static_cast<KMFolderCachedImap*>(mFolder->storage())->account();
+- if ( mFolder->storage() == ai->rootFolder() ) {
++ if ( ai && mFolder->storage() == ai->rootFolder() ) {
+ rootFolder = true;
+ namespaces = ai->namespaces()[ImapAccountBase::PersonalNS];
+ }
+@@ -212,10 +212,12 @@
+ QString delimiter;
+ if ( mFolder->folderType() == KMFolderTypeImap ) {
+ KMAcctImap* ai = static_cast<KMFolderImap*>( mFolder->storage() )->account();
+- delimiter = ai->delimiterForFolder( mFolder->storage() );
++ if ( ai )
++ delimiter = ai->delimiterForFolder( mFolder->storage() );
+ } else {
+ KMAcctCachedImap* ai = static_cast<KMFolderCachedImap*>( mFolder->storage() )->account();
+- delimiter = ai->delimiterForFolder( mFolder->storage() );
++ if ( ai )
++ delimiter = ai->delimiterForFolder( mFolder->storage() );
+ }
+ if ( !delimiter.isEmpty() && fldName.find( delimiter ) != -1 ) {
+ KMessageBox::error( this, i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter ) );
+Index: kmail/kmreadermainwin.cpp
+===================================================================
+--- kmail/kmreadermainwin.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmreadermainwin.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -496,6 +496,7 @@
+ f.setFamily( font );
+ mReaderWin->cssHelper()->setBodyFont( f );
+ mReaderWin->cssHelper()->setPrintFont( f );
++ mReaderWin->saveRelativePosition();
+ mReaderWin->update();
+ }
+
+@@ -505,6 +506,7 @@
+ f.setPointSize( size );
+ mReaderWin->cssHelper()->setBodyFont( f );
+ mReaderWin->cssHelper()->setPrintFont( f );
++ mReaderWin->saveRelativePosition();
+ mReaderWin->update();
+ }
+
+Index: kmail/encodingdetector_ja_p.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kmail/encodingdetector_ja_p.h 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,126 @@
++/*
++ * This file is part of the KDE libraries
++ *
++ * Copyright 2000-2003 Shiro Kawai <shiro at acm.org>, All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * 3. Neither the name of the authors nor the names of its contributors
++ * may be used to endorse or promote products derived from this
++ * software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
++ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ */
++/*
++ * original code is here.
++ * http://cvs.sourceforge.net/viewcvs.py/gauche/Gauche/ext/charconv/guess.c?view=markup
++ */
++#ifndef GUESS_JA_H
++#define GUESS_JA_H
++
++#include <qglobal.h>
++#ifdef Q_WS_WIN
++#undef UNICODE
++#endif
++namespace khtml {
++ class guess_arc {
++ public:
++ unsigned int next; /* next state */
++ double score; /* score */
++ };
++}
++
++using namespace khtml;
++
++typedef signed char dfa_table[256];
++
++/* DFA tables declared in guess_ja.cpp */
++extern const dfa_table guess_eucj_st[];
++extern guess_arc guess_eucj_ar[7];
++extern const dfa_table guess_sjis_st[];
++extern guess_arc guess_sjis_ar[6];
++extern const dfa_table guess_utf8_st[];
++extern guess_arc guess_utf8_ar[11];
++
++namespace khtml {
++
++ class guess_dfa {
++ public:
++ const dfa_table *states;
++ const guess_arc *arcs;
++ int state;
++ double score;
++
++ guess_dfa (const dfa_table stable[], const guess_arc *atable) :
++ states(stable), arcs(atable)
++ {
++ state = 0;
++ score = 1.0;
++ }
++ };
++
++ class JapaneseCode
++ {
++ public:
++ enum Type {ASCII, JIS, EUC, SJIS, UNICODE, UTF8 };
++ enum Type guess_jp(const char* buf, int buflen);
++
++ JapaneseCode () {
++ eucj = new guess_dfa(guess_eucj_st, guess_eucj_ar);
++ sjis = new guess_dfa(guess_sjis_st, guess_sjis_ar);
++ utf8 = new guess_dfa(guess_utf8_st, guess_utf8_ar);
++ last_JIS_escape = false;
++ }
++
++ ~JapaneseCode () {
++ if (eucj) delete eucj;
++ if (sjis) delete sjis;
++ if (utf8) delete utf8;
++ }
++
++ protected:
++ guess_dfa *eucj;
++ guess_dfa *sjis;
++ guess_dfa *utf8;
++
++ bool last_JIS_escape;
++ };
++}
++
++#define DFA_NEXT(dfa, ch) \
++ do { \
++ int arc__; \
++ if (dfa->state >= 0) { \
++ arc__ = dfa->states[dfa->state][ch]; \
++ if (arc__ < 0) { \
++ dfa->state = -1; \
++ } else { \
++ dfa->state = dfa->arcs[arc__].next; \
++ dfa->score *= dfa->arcs[arc__].score; \
++ } \
++ } \
++ } while (0)
++
++#define DFA_ALIVE(dfa) (dfa->state >= 0)
++
++#endif /* GUESS_JA_H */
+Index: kmail/Makefile.am
+===================================================================
+--- kmail/Makefile.am.orig 2008-06-29 20:06:30.000000000 +0200
++++ kmail/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -69,7 +69,8 @@
+ kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
+ kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
+ kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \
+- filterimporterexporter.cpp \
++ filterimporterexporter.cpp \
++ encodingdetector.cpp encodingdetector_ja.cpp \
+ kmfilteraction.cpp kmsearchpattern.cpp \
+ kmfolderseldlg.cpp kmfilter.cpp kmfilterdlg.cpp \
+ kmmsgbase.cpp kmmsglist.cpp kmaddrbook.cpp \
+@@ -141,7 +142,7 @@
+ favoritefolderview.cpp \
+ foldertreebase.cpp \
+ snippetdlgbase.ui \
+- snippet_widget.cpp \
++ snippetwidget.cpp \
+ snippetconfig.cpp \
+ snippetdlg.cpp \
+ snippetitem.cpp \
+Index: kmail/kmail_config_composer.desktop
+===================================================================
+--- kmail/kmail_config_composer.desktop.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmail_config_composer.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -36,6 +36,7 @@
+ Name[hu]=Szerkesztő
+ Name[it]=Compositore
+ Name[ja]=メール作æˆ
++Name[ka]=წერილების რედáƒáƒ¥áƒ¢áƒáƒ ი
+ Name[kk]=ҚұраÑтарғыш
+ Name[km]=កម្មវិធី​ážáŸ‚áž„
+ Name[lt]=Redaktorius
+@@ -122,6 +123,7 @@
+ Keywords[hu]=kmail,szerkesztő
+ Keywords[is]=kmail,ritill
+ Keywords[it]=kmail,compositore
++Keywords[ka]=kmail,წერილების რედáƒáƒ¥áƒ¢áƒáƒ ი
+ Keywords[km]=kmail កម្មវិធី​ážáŸ‚áž„
+ Keywords[lt]=kmail,composer,redaktorius
+ Keywords[mk]=kmail,composer,кпошта,ÑоÑтавувач
+Index: kmail/kmreaderwin.cpp
+===================================================================
+--- kmail/kmreaderwin.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmreaderwin.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -764,10 +764,9 @@
+ void KMReaderWin::slotLevelQuote( int l )
+ {
+ kdDebug( 5006 ) << "Old Level: " << mLevelQuote << " New Level: " << l << endl;
+- mLevelQuote = l;
+- QScrollView * scrollview = static_cast<QScrollView *>(mViewer->widget());
+- mSavedRelativePosition = (float)scrollview->contentsY() / scrollview->contentsHeight();
+
++ mLevelQuote = l;
++ saveRelativePosition();
+ update(true);
+ }
+
+@@ -1461,7 +1460,8 @@
+ if (mSavedRelativePosition)
+ {
+ QScrollView * scrollview = static_cast<QScrollView *>(mViewer->widget());
+- scrollview->setContentsPos ( 0, qRound( scrollview->contentsHeight() * mSavedRelativePosition ) );
++ scrollview->setContentsPos( 0,
++ qRound( scrollview->contentsHeight() * mSavedRelativePosition ) );
+ mSavedRelativePosition = 0;
+ }
+ }
+@@ -2049,10 +2049,8 @@
+ //-----------------------------------------------------------------------------
+ void KMReaderWin::slotToggleFixedFont()
+ {
+- QScrollView * scrollview = static_cast<QScrollView *>(mViewer->widget());
+- mSavedRelativePosition = (float)scrollview->contentsY() / scrollview->contentsHeight();
+-
+ mUseFixedFont = !mUseFixedFont;
++ saveRelativePosition();
+ update(true);
+ }
+
+@@ -2419,6 +2417,15 @@
+
+
+ //-----------------------------------------------------------------------------
++void KMReaderWin::saveRelativePosition()
++{
++ const QScrollView * scrollview = static_cast<QScrollView *>( mViewer->widget() );
++ mSavedRelativePosition =
++ static_cast<float>( scrollview->contentsY() ) / scrollview->contentsHeight();
++}
++
++
++//-----------------------------------------------------------------------------
+ void KMReaderWin::update( bool force )
+ {
+ KMMessage* msg = message();
+Index: kmail/kmmessage.cpp
+===================================================================
+--- kmail/kmmessage.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmmessage.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1875,7 +1875,12 @@
+ QString KMMessage::to() const
+ {
+ // handle To same as Cc below, bug 80747
+- return KPIM::normalizeAddressesAndDecodeIDNs( headerFields( "To" ).join( ", " ) );
++ QValueList<QCString> rawHeaders = rawHeaderFields( "To" );
++ QStringList headers;
++ for ( QValueList<QCString>::Iterator it = rawHeaders.begin(); it != rawHeaders.end(); ++it ) {
++ headers << *it;
++ }
++ return KPIM::normalizeAddressesAndDecodeIDNs( headers.join( ", " ) );
+ }
+
+
+@@ -1894,7 +1899,7 @@
+ //-----------------------------------------------------------------------------
+ QString KMMessage::replyTo() const
+ {
+- return KPIM::normalizeAddressesAndDecodeIDNs( headerField("Reply-To") );
++ return KPIM::normalizeAddressesAndDecodeIDNs( rawHeaderField("Reply-To") );
+ }
+
+
+@@ -1917,7 +1922,12 @@
+ {
+ // get the combined contents of all Cc headers (as workaround for invalid
+ // messages with multiple Cc headers)
+- return KPIM::normalizeAddressesAndDecodeIDNs( headerFields( "Cc" ).join( ", " ) );
++ QValueList<QCString> rawHeaders = rawHeaderFields( "Cc" );
++ QStringList headers;
++ for ( QValueList<QCString>::Iterator it = rawHeaders.begin(); it != rawHeaders.end(); ++it ) {
++ headers << *it;
++ }
++ return KPIM::normalizeAddressesAndDecodeIDNs( headers.join( ", " ) );
+ }
+
+
+@@ -1938,7 +1948,7 @@
+ //-----------------------------------------------------------------------------
+ QString KMMessage::bcc() const
+ {
+- return KPIM::normalizeAddressesAndDecodeIDNs( headerField("Bcc") );
++ return KPIM::normalizeAddressesAndDecodeIDNs( rawHeaderField("Bcc") );
+ }
+
+
+@@ -1977,7 +1987,7 @@
+ QString KMMessage::who() const
+ {
+ if (mParent)
+- return KPIM::normalizeAddressesAndDecodeIDNs( headerField(mParent->whoField().utf8()) );
++ return KPIM::normalizeAddressesAndDecodeIDNs( rawHeaderField(mParent->whoField().utf8()) );
+ return from();
+ }
+
+@@ -1985,7 +1995,7 @@
+ //-----------------------------------------------------------------------------
+ QString KMMessage::from() const
+ {
+- return KPIM::normalizeAddressesAndDecodeIDNs( headerField("From") );
++ return KPIM::normalizeAddressesAndDecodeIDNs( rawHeaderField("From") );
+ }
+
+
+@@ -3126,12 +3136,6 @@
+ mMsg->Body().DeleteBodyParts();
+ }
+
+-void KMMessage::removeBodyPart(DwBodyPart * dwPart)
+-{
+- mMsg->Body().RemoveBodyPart( dwPart );
+- mNeedsAssembly = true;
+-}
+-
+ //-----------------------------------------------------------------------------
+ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart)
+ {
+Index: kmail/snippetwidget.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kmail/snippetwidget.h 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,95 @@
++/***************************************************************************
++ * snippet feature from kdevelop/plugins/snippet/ *
++ * *
++ * Copyright (C) 2007 by Robert Gruber *
++ * rgruber at users.sourceforge.net *
++ * *
++ * This program is free software; you can redistribute it and/or modify *
++ * it under the terms of the GNU General Public License as published by *
++ * the Free Software Foundation; either version 2 of the License, or *
++ * (at your option) any later version. *
++ * *
++ ***************************************************************************/
++#ifndef __SNIPPET_WIDGET_H__
++#define __SNIPPET_WIDGET_H__
++
++#include <qwidget.h>
++#include <qstring.h>
++#include <klistview.h>
++#include <qtooltip.h>
++#include <qrect.h>
++
++#include <ktexteditor/editinterface.h>
++#include <ktexteditor/view.h>
++#include "snippetconfig.h"
++
++class KDevProject;
++class SnippetPart;
++class QPushButton;
++class KListView;
++class QListViewItem;
++class QPoint;
++class SnippetDlg;
++class SnippetItem;
++class KTextEdit;
++class KConfig;
++class KMEdit;
++class KActionCollection;
++
++/**
++This is the widget which gets added to the right TreeToolView.
++It inherits KListView and QToolTip which is needed for showing the
++tooltips which contains the text of the snippet
++ at author Robert Gruber
++*/
++class SnippetWidget : public KListView, public QToolTip
++{
++ Q_OBJECT
++
++public:
++ SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, QWidget* parent = 0);
++ ~SnippetWidget();
++ QPtrList<SnippetItem> * getList() { return (&_list); }
++ void writeConfig();
++ SnippetConfig * getSnippetConfig() { return (&_SnippetConfig); }
++
++
++private slots:
++ void initConfig();
++
++protected:
++ void maybeTip( const QPoint & );
++ bool acceptDrag (QDropEvent *event) const;
++
++private:
++ void insertIntoActiveView( const QString &text );
++ QString parseText(QString text, QString del="$");
++ bool showMultiVarDialog(QMap<QString, QString> * map, QMap<QString, QString> * mapSave,
++ int & iWidth, int & iBasicHeight, int & iOneHeight);
++ QString showSingleVarDialog(QString var, QMap<QString, QString> * mapSave, QRect & dlgSize);
++ SnippetItem* makeItem( SnippetItem* parent, const QString& name, const QString& text, const KShortcut& shortcut );
++
++ QPtrList<SnippetItem> _list;
++ QMap<QString, QString> _mapSaved;
++ KConfig * _cfg;
++ SnippetConfig _SnippetConfig;
++ KMEdit* mEditor;
++ KActionCollection* mActionCollection;
++
++public slots:
++ void slotRemove();
++ void slotEdit( QListViewItem* item_ = 0 );
++ void slotEditGroup();
++ void slotAdd();
++ void slotAddGroup();
++ void slotExecute();
++
++protected slots:
++ void showPopupMenu( QListViewItem * item, const QPoint & p, int );
++ void slotExecuted(QListViewItem * item = 0);
++ void slotDropped(QDropEvent *e, QListViewItem *after);
++ void startDrag();
++};
++
++
++#endif
+Index: kmail/messageactions.cpp
+===================================================================
+--- kmail/messageactions.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/messageactions.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -70,7 +70,7 @@
+ this, SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" );
+
+
+- mCreateTodoAction = new KAction( i18n("Create Task..."), "mail_todo",
++ mCreateTodoAction = new KAction( i18n("Create Task/Reminder..."), "mail_todo",
+ 0, this, SLOT(slotCreateTodo()), mActionCollection,
+ "create_todo" );
+
+Index: kmail/kmail_config_identity.desktop
+===================================================================
+--- kmail/kmail_config_identity.desktop.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmail_config_identity.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -38,6 +38,7 @@
+ Name[is]=Auðkenni
+ Name[it]=IdentitÃ
+ Name[ja]=å€‹äººæƒ…å ±
++Name[ka]=პრáƒáƒ¤áƒ˜áƒšáƒ”ბი
+ Name[kk]=ІÑ-әлпеттері
+ Name[km]=អážáŸ’ážážŸáž‰áŸ’ញាណ
+ Name[lt]=TapatybÄ—s
+@@ -62,7 +63,8 @@
+ Name[tg]=Профилҳо
+ Name[tr]=Kimlikler
+ Name[uk]=Профілі
+-Name[uz]=ШахÑиÑтлар
++Name[uz]=Shaxsiyatlar
++Name[uz at cyrillic]=ШахÑиÑтлар
+ Name[zh_CN]=身份
+ Name[zh_TW]=身份
+ Comment=Manage Identities
+@@ -91,6 +93,7 @@
+ Comment[is]=Stjórna auðkennum
+ Comment[it]=Gestisce le identitÃ
+ Comment[ja]=å€‹äººæƒ…å ±ã®ç®¡ç†
++Comment[ka]=პრáƒáƒ¤áƒ˜áƒšáƒ”ბის მáƒáƒ თვáƒ
+ Comment[kk]=ІÑ-әлпеттерді баÑқару
+ Comment[km]=គ្រប់គ្រង​អážáŸ’ážážŸáž‰áŸ’ញាណ
+ Comment[lt]=Tvarkyti tapatybes
+@@ -141,6 +144,7 @@
+ Keywords[is]=kmail,auðkenni
+ Keywords[it]=kmail,identitÃ
+ Keywords[ja]=kmail,å€‹äººæƒ…å ±
++Keywords[ka]=kmail,პრáƒáƒ¤áƒ˜áƒšáƒ˜
+ Keywords[km]=kmail,អážáŸ’ážážŸáž‰áŸ’ញាណ
+ Keywords[lt]=kmail,identity,tapatybÄ—
+ Keywords[mk]=kmail,identity,кпошта,идентитет,идентитети
+@@ -162,5 +166,6 @@
+ Keywords[tg]=kmail,identity,профил
+ Keywords[tr]=kmail,kimlikler
+ Keywords[uk]=kmail,профіль
+-Keywords[uz]=kmail,шахÑиÑÑ‚
++Keywords[uz]=kmail,shaxsiyat
++Keywords[uz at cyrillic]=kmail,шахÑиÑÑ‚
+ Keywords[zh_CN]=kmail,identity, 身份
+Index: kmail/kmcommands.cpp
+===================================================================
+--- kmail/kmcommands.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmcommands.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -3369,6 +3369,28 @@
+ deleteLater();
+ }
+
++DwBodyPart * AttachmentModifyCommand::findPart(KMMessage* msg, int index)
++{
++ int accu = 0;
++ return findPartInternal( msg->getTopLevelPart(), index, accu );
++}
++
++DwBodyPart * AttachmentModifyCommand::findPartInternal(DwEntity * root, int index, int & accu)
++{
++ accu++;
++ if ( index < accu ) // should not happen
++ return 0;
++ DwBodyPart *current = dynamic_cast<DwBodyPart*>( root );
++ if ( index == accu )
++ return current;
++ DwBodyPart *rv = 0;
++ if ( root->Body().FirstBodyPart() )
++ rv = findPartInternal( root->Body().FirstBodyPart(), index, accu );
++ if ( !rv && current && current->Next() )
++ rv = findPartInternal( current->Next(), index, accu );
++ return rv;
++}
++
+
+ KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, QWidget * parent) :
+ AttachmentModifyCommand( node, msg, parent )
+@@ -3385,14 +3407,17 @@
+ {
+ KMMessage *msg = retrievedMessage();
+ KMMessagePart part;
+- // -2 because partNode counts root and body of the message as well
+- DwBodyPart *dwpart = msg->dwBodyPart( mPartIndex - 2 );
++ DwBodyPart *dwpart = findPart( msg, mPartIndex );
+ if ( !dwpart )
+ return Failed;
+ KMMessage::bodyPart( dwpart, &part, true );
+ if ( !part.isComplete() )
+ return Failed;
+- msg->removeBodyPart( dwpart );
++
++ DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
++ if ( !parentNode )
++ return Failed;
++ parentNode->RemoveBodyPart( dwpart );
+
+ // add dummy part to show that a attachment has been deleted
+ KMMessagePart dummyPart;
+@@ -3409,7 +3434,9 @@
+ } else if ( cd.isEmpty() ) {
+ dummyPart.setContentDisposition( "attachment" );
+ }
+- msg->addBodyPart( &dummyPart );
++ DwBodyPart* newDwPart = msg->createDWBodyPart( &dummyPart );
++ parentNode->AddBodyPart( newDwPart );
++ msg->getTopLevelPart()->Assemble();
+
+ KMMessage *newMsg = new KMMessage();
+ newMsg->fromDwString( msg->asDwString() );
+@@ -3435,14 +3462,16 @@
+ {
+ KMMessage *msg = retrievedMessage();
+ KMMessagePart part;
+- // -2 because partNode counts root and body of the message as well
+- DwBodyPart *dwpart = msg->dwBodyPart( mPartIndex - 2 );
++ DwBodyPart *dwpart = findPart( msg, mPartIndex );
+ if ( !dwpart )
+ return Failed;
+ KMMessage::bodyPart( dwpart, &part, true );
+ if ( !part.isComplete() )
+ return Failed;
+
++ if( !dynamic_cast<DwBody*>( dwpart->Parent() ) )
++ return Failed;
++
+ mTempFile.file()->writeBlock( part.bodyDecodedBinary() );
+ mTempFile.file()->flush();
+
+@@ -3472,15 +3501,20 @@
+ // build the new message
+ KMMessage *msg = retrievedMessage();
+ KMMessagePart part;
+- // -2 because partNode counts root and body of the message as well
+- DwBodyPart *dwpart = msg->dwBodyPart( mPartIndex - 2 );
++ DwBodyPart *dwpart = findPart( msg, mPartIndex );
+ KMMessage::bodyPart( dwpart, &part, true );
+- msg->removeBodyPart( dwpart );
++
++ DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
++ assert( parentNode );
++ parentNode->RemoveBodyPart( dwpart );
+
+ KMMessagePart att;
+ att.duplicate( part );
+ att.setBodyEncodedBinary( data );
+- msg->addBodyPart( &att );
++
++ DwBodyPart* newDwPart = msg->createDWBodyPart( &att );
++ parentNode->AddBodyPart( newDwPart );
++ msg->getTopLevelPart()->Assemble();
+
+ KMMessage *newMsg = new KMMessage();
+ newMsg->fromDwString( msg->asDwString() );
+Index: kmail/kmfoldercachedimap.cpp
+===================================================================
+--- kmail/kmfoldercachedimap.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmfoldercachedimap.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -484,8 +484,15 @@
+ uidMapDirty = true;
+ }
+
++ KMFolderOpener openThis(folder(), "KMFolderCachedImap::addMsgInternal");
++ int rc = openThis.openResult();
++ if ( rc ) {
++ kdDebug(5006) << k_funcinfo << "open: " << rc << " of folder: " << label() << endl;
++ return rc;
++ }
++
+ // Add the message
+- int rc = KMFolderMaildir::addMsg(msg, index_return);
++ rc = KMFolderMaildir::addMsg(msg, index_return);
+
+ if( newMail && ( imapPath() == "/INBOX/" || ( !GlobalSettings::self()->filterOnlyDIMAPInbox()
+ && (userRights() <= 0 || userRights() & ACLJobs::Administer )
+Index: kmail/eventsrc
+===================================================================
+--- kmail/eventsrc.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/eventsrc 2008-06-29 20:10:36.000000000 +0200
+@@ -34,6 +34,7 @@
+ Name[is]=Nýr póstur
+ Name[it]=Nuova posta arrivata
+ Name[ja]=æ–°è¦ãƒ¡ãƒ¼ãƒ«ç€ä¿¡
++Name[ka]=მიღებულირáƒáƒ®áƒáƒšáƒ˜ ფáƒáƒ¡áƒ¢áƒ
+ Name[kk]=Жаңа пошта келді
+ Name[km]=មាន​អ៊ីមែល​ážáŸ’មី​មក​ដល់
+ Name[lt]=Atėjo naujas paštas
+@@ -59,7 +60,8 @@
+ Name[tg]=Почтаи нав қабул шуд
+ Name[tr]=Yeni E-posta Geldi
+ Name[uk]=Отримана нова пошта
+-Name[uz]=Янги хат келди
++Name[uz]=Yangi xat keldi
++Name[uz at cyrillic]=Янги хат келди
+ Name[zh_CN]=新邮件到达
+ Name[zh_TW]=您有新郵件
+ Comment=New mail arrived
+@@ -88,6 +90,7 @@
+ Comment[is]=Nýr póstur
+ Comment[it]=Nuova posta
+ Comment[ja]=æ–°è¦ãƒ¡ãƒ¼ãƒ«ç€ä¿¡
++Comment[ka]=მიღებულირáƒáƒ®áƒáƒšáƒ˜ ფáƒáƒ¡áƒ¢áƒ
+ Comment[kk]=Жаңа пошта келді
+ Comment[km]=មាន​អ៊ីមែល​ážáŸ’មី​មក​ដល់
+ Comment[lt]=Atėjo naujas paštas
+@@ -113,7 +116,8 @@
+ Comment[tg]=Почтаи нав қабул шуд
+ Comment[tr]=Yeni e-posta geldi
+ Comment[uk]=Ðадійшла нова пошта
+-Comment[uz]=Янги хат келди
++Comment[uz]=Yangi xat keldi
++Comment[uz at cyrillic]=Янги хат келди
+ Comment[zh_CN]=新邮件到达
+ Comment[zh_TW]=您有新郵件
+ default_sound=
+Index: kmail/headerstyle.cpp
+===================================================================
+--- kmail/headerstyle.cpp.orig 2008-06-29 20:07:14.000000000 +0200
++++ kmail/headerstyle.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -290,7 +290,7 @@
+ if ( fromStr.isEmpty() ) // no valid email in from, maybe just a name
+ fromStr = message->fromStrip(); // let's use that
+ headerStr.append(i18n("From: ") +
+- KMMessage::emailAddrAsAnchor( fromStr, "", false) );
++ KMMessage::emailAddrAsAnchor( fromStr, false, "", true ) );
+ if ( !vCardName.isEmpty() )
+ headerStr.append(" <a href=\"" + vCardName +
+ "\">" + i18n("[vCard]") + "</a>" );
+@@ -908,7 +908,7 @@
+ // kmail icon
+ if(topLevel) {
+ headerStr +=
+- "<div class=\"noprint\" style=\"position: absolute; top: -14px; left: 0px; width: 95%; height: 200px;\">\n"
++ "<div class=\"noprint\" style=\"position: absolute; top: -14px; left: 0px; width: 95%; height: 135px;\">\n"
+ "<img style=\"float: right;\" src=\""+imgpath+"icon.png\">\n"
+ "</div>\n";
+
+Index: kmail/composercryptoconfiguration.ui
+===================================================================
+--- kmail/composercryptoconfiguration.ui.orig 2005-09-10 10:24:02.000000000 +0200
++++ kmail/composercryptoconfiguration.ui 2008-06-29 20:10:36.000000000 +0200
+@@ -56,7 +56,7 @@
+ <cstring>mEncToSelf</cstring>
+ </property>
+ <property name="text">
+- <string>Always encr&ypt to self</string>
++ <string>When encrypting emails, always also encr&ypt to the certificate of my own identity</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>When this option is enabled, the message/file will not only be encrypted with the receiver's public key, but also with your key. This will enable you to decrypt the message/file at a later time. This is generally a good idea.</string>
+Index: kmail/kmmainwidget.cpp
+===================================================================
+--- kmail/kmmainwidget.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmmainwidget.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -152,6 +152,7 @@
+ mQuickSearchLine( 0 ),
+ mShowBusySplashTimer( 0 ),
+ mShowingOfflineScreen( false ),
++ mMsgActions( 0 ),
+ mVacationIndicatorActive( false )
+ {
+ // must be the first line of the constructor:
+@@ -642,6 +643,9 @@
+
+ if (mReaderWindowActive) {
+ mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 );
++ if ( mMsgActions ) {
++ mMsgActions->setMessageView( mMsgView );
++ }
+
+ connect(mMsgView, SIGNAL(replaceMsgByUnencryptedVersion()),
+ this, SLOT(slotReplaceMsgByUnencryptedVersion()));
+Index: kmail/encodingdetector_ja.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kmail/encodingdetector_ja.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,376 @@
++/*
++ * This file is part of the KDE libraries
++ *
++ * Copyright 2000-2003 Shiro Kawai <shiro at acm.org>, All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * 3. Neither the name of the authors nor the names of its contributors
++ * may be used to endorse or promote products derived from this
++ * software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
++ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ */
++/*
++ * original code is here.
++ * http://cvs.sourceforge.net/viewcvs.py/gauche/Gauche/ext/charconv/guess.c?view=markup
++ */
++
++/*
++ * Maybe we should use QTextCodec::heuristicContentMatch()
++ * But it fails detection. It's not useful.
++ */
++#include "encodingdetector_ja_p.h"
++
++/* DFA tables */
++const dfa_table guess_eucj_st[] = {
++ { /* state init */
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 2,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
++ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
++ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
++ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
++ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
++ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -1,
++ },
++ { /* state jis0201_kana */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
++ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
++ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
++ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ },
++ { /* state jis0213_1 */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, -1,
++ },
++ { /* state jis0213_2 */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, -1,
++ },
++};
++
++guess_arc guess_eucj_ar[7] = {
++ { 0, 1.0 }, /* init -> init */
++ { 1, 0.8 }, /* init -> jis0201_kana */
++ { 3, 0.95 }, /* init -> jis0213_2 */
++ { 2, 1.0 }, /* init -> jis0213_1 */
++ { 0, 1.0 }, /* jis0201_kana -> init */
++ { 0, 1.0 }, /* jis0213_1 -> init */
++ { 0, 1.0 }, /* jis0213_2 -> init */
++};
++
++const dfa_table guess_sjis_st[] = {
++ { /* state init */
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
++ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
++ -1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
++ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4,
++ },
++ { /* state jis0213 */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, -1,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, -1, -1, -1,
++ },
++};
++
++guess_arc guess_sjis_ar[6] = {
++ { 0, 1.0 }, /* init -> init */
++ { 1, 1.0 }, /* init -> jis0213 */
++ { 0, 0.8 }, /* init -> init */
++ { 1, 0.95 }, /* init -> jis0213 */
++ { 0, 0.8 }, /* init -> init */
++ { 0, 1.0 }, /* jis0213 -> init */
++};
++
++const dfa_table guess_utf8_st[] = {
++ { /* state init */
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
++ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
++ 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, -1, -1,
++ },
++ { /* state 1byte_more */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ },
++ { /* state 2byte_more */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
++ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
++ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
++ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ },
++ { /* state 3byte_more */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
++ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
++ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
++ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ },
++ { /* state 4byte_more */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
++ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
++ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
++ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ },
++ { /* state 5byte_more */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
++ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
++ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
++ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ },
++};
++
++guess_arc guess_utf8_ar[11] = {
++ { 0, 1.0 }, /* init -> init */
++ { 1, 1.0 }, /* init -> 1byte_more */
++ { 2, 1.0 }, /* init -> 2byte_more */
++ { 3, 1.0 }, /* init -> 3byte_more */
++ { 4, 1.0 }, /* init -> 4byte_more */
++ { 5, 1.0 }, /* init -> 5byte_more */
++ { 0, 1.0 }, /* 1byte_more -> init */
++ { 1, 1.0 }, /* 2byte_more -> 1byte_more */
++ { 2, 1.0 }, /* 3byte_more -> 2byte_more */
++ { 3, 1.0 }, /* 4byte_more -> 3byte_more */
++ { 4, 1.0 }, /* 5byte_more -> 4byte_more */
++};
++
++/* Guessing Routine */
++enum JapaneseCode::Type JapaneseCode::guess_jp(const char *buf, int buflen)
++{
++ int i;
++ guess_dfa *top = 0;
++
++ for (i=0; i<buflen; i++) {
++ int c = (unsigned char)buf[i];
++
++ /* special treatment of jis escape sequence */
++ if (c == 0x1b || last_JIS_escape) {
++ if (i < buflen-1) {
++ if (last_JIS_escape)
++ c = (unsigned char)buf[i];
++ else
++ c = (unsigned char)buf[++i];
++ last_JIS_escape = false;
++
++ if (c == '$' || c == '(') {
++ return JapaneseCode::JIS;
++ }
++ } else {
++ last_JIS_escape = true;
++ }
++ }
++
++ if (DFA_ALIVE(eucj)) {
++ if (!DFA_ALIVE(sjis) && !DFA_ALIVE(utf8)) return JapaneseCode::EUC;
++ DFA_NEXT(eucj, c);
++ }
++ if (DFA_ALIVE(sjis)) {
++ if (!DFA_ALIVE(eucj) && !DFA_ALIVE(utf8)) return JapaneseCode::SJIS;
++ DFA_NEXT(sjis, c);
++ }
++ if (DFA_ALIVE(utf8)) {
++ if (!DFA_ALIVE(sjis) && !DFA_ALIVE(eucj)) return JapaneseCode::UTF8;
++ DFA_NEXT(utf8, c);
++ }
++
++ if (!DFA_ALIVE(eucj) && !DFA_ALIVE(sjis) && !DFA_ALIVE(utf8)) {
++ /* we ran out the possibilities */
++ return JapaneseCode::ASCII;
++ }
++ }
++
++ /* ascii code check */
++ if (eucj->score == 1.0 && sjis->score == 1.0 && utf8->score == 1.0)
++ return JapaneseCode::ASCII;
++
++ /* Now, we have ambigous code. Pick the highest score. If more than
++ one candidate tie, pick the default encoding. */
++ if (DFA_ALIVE(eucj)) top = eucj;
++ if (DFA_ALIVE(utf8)) {
++ if (top) {
++ if (top->score < utf8->score) top = utf8;
++ } else {
++ top = utf8;
++ }
++ }
++ if (DFA_ALIVE(sjis)) {
++ if (top) {
++ if (top->score <= sjis->score) top = sjis;
++ } else {
++ top = sjis;
++ }
++ }
++
++ if (top == eucj) return JapaneseCode::EUC;
++ if (top == utf8) return JapaneseCode::UTF8;
++ if (top == sjis) return JapaneseCode::SJIS;
++
++ return JapaneseCode::ASCII;
++}
+Index: kmail/kmcomposewin.h
+===================================================================
+--- kmail/kmcomposewin.h.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmcomposewin.h 2008-06-29 20:10:36.000000000 +0200
+@@ -348,7 +348,7 @@
+ /**
+ * Read settings from app's config file.
+ */
+- void readConfig(void);
++ void readConfig( bool reload = false );
+ /**
+ * Change window title to given string.
+ */
+Index: kmail/kmcommands.h
+===================================================================
+--- kmail/kmcommands.h.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmcommands.h 2008-06-29 20:10:36.000000000 +0200
+@@ -32,6 +32,8 @@
+ class KMMsgBase;
+ class KMReaderWin;
+ class partNode;
++class DwBodyPart;
++class DwEntity;
+ namespace KIO { class Job; }
+ namespace KMail {
+ class Composer;
+@@ -1038,6 +1040,7 @@
+
+ protected:
+ void storeChangedMessage( KMMessage* msg );
++ DwBodyPart* findPart( KMMessage* msg, int index );
+ virtual Result doAttachmentModify() = 0;
+
+ protected:
+@@ -1046,6 +1049,7 @@
+
+ private:
+ Result execute();
++ DwBodyPart* findPartInternal( DwEntity* root, int index, int &accu );
+
+ private slots:
+ void messageStoreResult( KMFolderImap* folder, bool success );
+Index: kmail/kmcomposewin.cpp
+===================================================================
+--- kmail/kmcomposewin.cpp.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmcomposewin.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include "kmcommands.h"
+ #include "kcursorsaver.h"
+ #include "partNode.h"
++#include "encodingdetector.h"
+ #include "attachmentlistview.h"
+ #include "transportmanager.h"
+ using KMail::AttachmentListView;
+@@ -142,7 +143,7 @@
+
+ #include "kmcomposewin.moc"
+
+-#include "snippet_widget.h"
++#include "snippetwidget.h"
+
+ KMail::Composer * KMail::makeComposer( KMMessage * msg, uint identitiy ) {
+ return KMComposeWin::create( msg, identitiy );
+@@ -646,7 +647,7 @@
+ }
+
+ //-----------------------------------------------------------------------------
+-void KMComposeWin::readConfig(void)
++void KMComposeWin::readConfig( bool reload /* = false */ )
+ {
+ mDefCharset = KMMessage::defaultCharset();
+ mBtnIdentity->setChecked( GlobalSettings::self()->stickyIdentity() );
+@@ -689,20 +690,21 @@
+ }
+ mEdtSubject->setFont(mBodyFont);
+
+- QSize siz = GlobalSettings::self()->composerSize();
+- if (siz.width() < 200) siz.setWidth(200);
+- if (siz.height() < 200) siz.setHeight(200);
+- resize(siz);
++ if ( !reload ) {
++ QSize siz = GlobalSettings::self()->composerSize();
++ if (siz.width() < 200) siz.setWidth(200);
++ if (siz.height() < 200) siz.setHeight(200);
++ resize(siz);
+
+- if ( !GlobalSettings::self()->snippetSplitterPosition().isEmpty() ) {
+- mSnippetSplitter->setSizes( GlobalSettings::self()->snippetSplitterPosition() );
+- } else {
+- QValueList<int> defaults;
+- defaults << (int)(width() * 0.8) << (int)(width() * 0.2);
+- mSnippetSplitter->setSizes( defaults );
++ if ( !GlobalSettings::self()->snippetSplitterPosition().isEmpty() ) {
++ mSnippetSplitter->setSizes( GlobalSettings::self()->snippetSplitterPosition() );
++ } else {
++ QValueList<int> defaults;
++ defaults << (int)(width() * 0.8) << (int)(width() * 0.2);
++ mSnippetSplitter->setSizes( defaults );
++ }
+ }
+
+-
+ mIdentity->setCurrentIdentity( mId );
+
+ kdDebug(5006) << "KMComposeWin::readConfig. " << mIdentity->currentIdentityName() << endl;
+@@ -2749,9 +2751,18 @@
+ emit attachmentAdded(attachURL, true);
+ return;
+ }
+- const QCString partCharset = (*it).url.fileEncoding().isEmpty()
+- ? mCharset
+- : QCString((*it).url.fileEncoding().latin1());
++ QCString partCharset;
++ if ( !( *it ).url.fileEncoding().isEmpty() ) {
++ partCharset = QCString( ( *it ).url.fileEncoding().latin1() );
++ } else {
++ EncodingDetector ed;
++ KLocale *loc = KGlobal::locale();
++ ed.setAutoDetectLanguage( EncodingDetector::scriptForLanguageCode ( loc->language() ) );
++ ed.analyze( (*it).data );
++ partCharset = ed.encoding();
++ if ( partCharset.isEmpty() ) //shouldn't happen
++ partCharset = mCharset;
++ }
+
+ KMMessagePart* msgPart;
+
+@@ -2785,7 +2796,8 @@
+
+ QCString encoding = KMMsgBase::autoDetectCharset(partCharset,
+ KMMessage::preferredCharsets(), name);
+- if (encoding.isEmpty()) encoding = "utf-8";
++ if ( encoding.isEmpty() )
++ encoding = "utf-8";
+
+ QCString encName;
+ if ( GlobalSettings::self()->outlookCompatibleAttachments() )
+@@ -4358,9 +4370,10 @@
+ {
+ mEditor->sync();
+ if ( append ) {
+- mEditor->append(mOldSigText);
++ mEditor->setText( mEditor->text() + mOldSigText );
+ } else {
+- mEditor->insertAt(mOldSigText, pos, 0);
++ mOldSigText = "\n\n"+mOldSigText+"\n";
++ mEditor->insertAt(mOldSigText, pos, 0);
+ }
+ mEditor->update();
+ mEditor->setModified(mod);
+@@ -4917,9 +4930,10 @@
+
+ void KMComposeWin::slotConfigChanged()
+ {
+- readConfig();
++ readConfig( true /*reload*/);
+ updateAutoSave();
+ rethinkFields();
++ slotWordWrapToggled( mWordWrapAction->isChecked() );
+ }
+
+ /*
+Index: kmail/kmreaderwin.h
+===================================================================
+--- kmail/kmreaderwin.h.orig 2008-02-13 10:39:37.000000000 +0100
++++ kmail/kmreaderwin.h 2008-06-29 20:10:36.000000000 +0200
+@@ -162,6 +162,10 @@
+ /** Clear the reader and discard the current message. */
+ void clear(bool force = false) { setMsg(0, force); }
+
++ /** Saves the relative position of the scroll view. Call this before calling update()
++ if you want to preserve the current view. */
++ void saveRelativePosition();
++
+ /** Re-parse the current message. */
+ void update(bool force = false);
+
+Index: kmail/popaccount.h
+===================================================================
+--- kmail/popaccount.h.orig 2007-10-08 11:50:38.000000000 +0200
++++ kmail/popaccount.h 2008-06-29 20:10:36.000000000 +0200
+@@ -150,6 +150,7 @@
+ QMap<QString, int> mTimeOfNextSeenMsgsMap; // map of uid to times of seen messages
+ QDict<int> mSizeOfNextSeenMsgsDict;
+ QStringList idsOfMsgsToDelete;
++ QStringList idsOfForcedDeletes;
+ int indexOfCurrentMsg;
+
+ QValueList<KMMessage*> msgsAwaitingProcessing;
+Index: kmail/popaccount.cpp
+===================================================================
+--- kmail/popaccount.cpp.orig 2008-02-13 10:39:38.000000000 +0100
++++ kmail/popaccount.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -389,6 +389,8 @@
+ idsOfMsgs.clear();
+ mUidForIdMap.clear();
+ idsOfMsgsToDelete.clear();
++ idsOfForcedDeletes.clear();
++
+ //delete any headers if there are some this have to be done because of check again
+ headersOnServer.clear();
+ headers = false;
+@@ -735,6 +737,12 @@
+ idsOfMsgsToDelete.remove( it.key().second );
+ }
+ }
++
++ if ( !idsOfForcedDeletes.isEmpty() ) {
++ idsOfMsgsToDelete += idsOfForcedDeletes;
++ idsOfForcedDeletes.clear();
++ }
++
+ // If there are messages to delete then delete them
+ if ( !idsOfMsgsToDelete.isEmpty() ) {
+ stage = Dele;
+@@ -923,8 +931,8 @@
+ QString qdata = data;
+ qdata = qdata.simplifyWhiteSpace(); // Workaround for Maillennium POP3/UNIBOX
+ int spc = qdata.find( ' ' );
+- if (spc > 0) {
+- if (stage == List) {
++ if ( stage == List ) {
++ if ( spc > 0 ) {
+ QString length = qdata.mid(spc+1);
+ if (length.find(' ') != -1) length.truncate(length.find(' '));
+ int len = length.toInt();
+@@ -933,46 +941,76 @@
+ idsOfMsgs.append( id );
+ mMsgsPendingDownload.insert( id, len );
+ }
+- else { // stage == Uidl
+- const QString id = qdata.left(spc);
+- const QString uid = qdata.mid(spc + 1);
+- int *size = new int; //malloc(size_of(int));
+- *size = mMsgsPendingDownload[id];
+- mSizeOfNextSeenMsgsDict.insert( uid, size );
+- if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
++ else {
++ stage = Idle;
++ if ( job ) job->kill();
++ job = 0;
++ mSlave = 0;
++ KMessageBox::error( 0, i18n( "Unable to complete LIST operation." ),
++ i18n( "Invalid Response From Server") );
++ return;
++ }
++ }
++ else { // stage == Uidl
++ Q_ASSERT ( stage == Uidl);
++
++ QString id;
++ QString uid;
++
++ if ( spc <= 0 ) {
++ // an invalid uidl line. we might just need to skip it, but
++ // some servers generate invalid uids with valid ids. in that
++ // case we will just make up a uid - which will cause us to
++ // not cache the document, but we will be able to interoperate
++
++ int testid = atoi ( qdata.ascii() );
++ if ( testid < 1 ) {
++ // we'll just have to skip this
++ kdDebug(5006) << "PopAccount::slotData skipping UIDL entry due to parse error "
++ << endl << qdata.ascii() << endl;
++ return;
++ }
++ id.setNum (testid, 10);
+
+- if ( mMsgsPendingDownload.contains( id ) ) {
+- mMsgsPendingDownload.remove( id );
+- }
+- else
+- kdDebug(5006) << "PopAccount::slotData synchronization failure." << endl;
+- idsOfMsgsToDelete.append( id );
+- mUidsOfNextSeenMsgsDict.insert( uid, (const int *)1 );
+- if ( mTimeOfSeenMsgsVector.empty() ) {
+- mTimeOfNextSeenMsgsMap.insert( uid, time(0) );
+- }
+- else {
+- // cast the int* with a long to can convert it to a int, BTW
+- // works with g++-4.0 and amd64
+- mTimeOfNextSeenMsgsMap.insert( uid,
+- mTimeOfSeenMsgsVector[(int)( long )mUidsOfSeenMsgsDict[uid] - 1] );
+- }
++ QString datestring, serialstring;
++
++ serialstring.setNum ( ++dataCounter, 10 );
++ datestring.setNum ( time(NULL),10 );
++ uid = QString( "uidlgen" ) + datestring + QString( "." ) + serialstring;
++ kdDebug(5006) << "PopAccount::slotData message " << id.ascii()
++ << "%d has bad UIDL, cannot keep a copy on server" << endl;
++ idsOfForcedDeletes.append( id );
++ }
++ else {
++ id = qdata.left( spc );
++ uid = qdata.mid( spc + 1 );
++ }
++
++ int *size = new int; //malloc(size_of(int));
++ *size = mMsgsPendingDownload[id];
++ mSizeOfNextSeenMsgsDict.insert( uid, size );
++ if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
++ if ( mMsgsPendingDownload.contains( id ) ) {
++ mMsgsPendingDownload.remove( id );
++ }
++ else
++ kdDebug(5006) << "PopAccount::slotData synchronization failure." << endl;
++ idsOfMsgsToDelete.append( id );
++ mUidsOfNextSeenMsgsDict.insert( uid, (const int *)1 );
++ if ( mTimeOfSeenMsgsVector.empty() ) {
++ mTimeOfNextSeenMsgsMap.insert( uid, time(0) );
++ }
++ else {
++ // cast the int* with a long to can convert it to a int, BTW
++ // works with g++-4.0 and amd64
++ mTimeOfNextSeenMsgsMap.insert( uid, mTimeOfSeenMsgsVector[(int)( long )
++ mUidsOfSeenMsgsDict[uid] - 1] );
+ }
+- mUidForIdMap.insert( id, uid );
+ }
+- }
+- else {
+- stage = Idle;
+- if (job) job->kill();
+- job = 0;
+- mSlave = 0;
+- KMessageBox::error(0, i18n( "Unable to complete LIST operation." ),
+- i18n("Invalid Response From Server"));
+- return;
++ mUidForIdMap.insert( id, uid );
+ }
+ }
+
+-
+ //-----------------------------------------------------------------------------
+ void PopAccount::slotResult( KIO::Job* )
+ {
+Index: kmail/kmail_config_appearance.desktop
+===================================================================
+--- kmail/kmail_config_appearance.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ kmail/kmail_config_appearance.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -40,6 +40,7 @@
+ Name[is]=Útlit
+ Name[it]=Aspetto
+ Name[ja]=外観
++Name[ka]=იერსáƒáƒ®áƒ”
+ Name[kk]=Сыртқы көрініÑÑ–
+ Name[km]=រូបរាង
+ Name[ko]=모양
+@@ -66,7 +67,8 @@
+ Name[tg]=Ðамуди зоҳирӣ
+ Name[tr]=Görünüm
+ Name[uk]=ВиглÑд
+-Name[uz]=Кўриниши
++Name[uz]=Koʻrinishi
++Name[uz at cyrillic]=Кўриниши
+ Name[zh_CN]=外观
+ Comment=Customize Visual Appearance
+ Comment[af]=Pasmaak die visuele voorkoms
+@@ -92,6 +94,7 @@
+ Comment[is]=Stilla útlit
+ Comment[it]=Personalizza l'aspetto
+ Comment[ja]=外観をカスタマイズ
++Comment[ka]=ვიზუáƒáƒšáƒ£áƒ ი იერსáƒáƒ®áƒ˜áƒ¡ დáƒáƒ§áƒ”ნებáƒ
+ Comment[kk]=Сыртқы көрініÑін ыңғайлау
+ Comment[km]=ប្ដូរ​រូបរាង​មើល​ឃើញ​ážáž¶áž˜â€‹áž”ំណង
+ Comment[lt]=Derinti vizualinę išvaizdą
+@@ -141,6 +144,7 @@
+ Keywords[is]=kmail,útlit
+ Keywords[it]=kmail,aspetto
+ Keywords[ja]=kmail,外観
++Keywords[ka]=kmail,იერსáƒáƒ®áƒ”
+ Keywords[km]=kmail,រូបរាង
+ Keywords[lt]=kmail,appearance,išvaizda
+ Keywords[mk]=kmail,appearance,кпошта,појава,изглед,визуелно
+Index: kmail/encodingdetector.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kmail/encodingdetector.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,1377 @@
++/*
++ This file was taken from the KDE 4.x libraries and backported to Qt 3.
++
++ Copyright (C) 1999 Lars Knoll (knoll at kde.org)
++ Copyright (C) 2003 Dirk Mueller (mueller at kde.org)
++ Copyright (C) 2003 Apple Computer, Inc.
++ Copyright (C) 2007 Nick Shaforostoff (shafff at ukr.net)
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++*/
++//----------------------------------------------------------------------------
++//
++// decoder for input stream
++
++#include "encodingdetector.h"
++
++#undef DECODE_DEBUG
++//#define DECODE_DEBUG
++
++#define MAX_BUFFER 16*1024
++
++#include <assert.h>
++#include <stdlib.h>
++
++#include "encodingdetector_ja_p.h"
++
++#include <qregexp.h>
++#include <qtextcodec.h>
++
++#include <kglobal.h>
++#include <kcharsets.h>
++#include <kdebug.h>
++#include <klocale.h>
++
++#include <ctype.h>
++
++// The following table was taken from libpango 1.19.3 and slightly modified.
++// Multiple scripts per language were removed and the entries were reordered so
++// that simple substring matching will work. For example, bam was put before ba
++// so that the first match will be likely the right match. Otherwise "ba" would
++// match "bam" but we would have to search on to find "bam" which is what we want.
++// The original file is called pango-script-lang-table.h
++
++/* pango-script-lang-table.h:
++ *
++ * Generated by gen-script-for-lang-new.c
++ * Date: 2007-10-26
++ * Source: fontconfig-2.4.91
++ *
++ * Do not edit. // I did. Sue me ;)
++ */
++typedef struct _PangoScriptForLang {
++ const char lang[6];
++ EncodingDetector::AutoDetectScript scripts[1];
++} PangoScriptForLang;
++
++//Unfortunately EncodingDetector does not know all scripts that Pango knows.
++//Also, using EncodingDetector::CentralEuropean for the appropriate countries
++//might give better results in some cases.
++//One especially important (many speakers/literates) omission is the lack of
++//Indian scripts.
++
++#define PANGO_SCRIPT_ARMENIAN EncodingDetector::None
++#define PANGO_SCRIPT_BENGALI EncodingDetector::None
++#define PANGO_SCRIPT_CANADIAN_ABORIGINAL EncodingDetector::None
++#define PANGO_SCRIPT_CHEROKEE EncodingDetector::None
++#define PANGO_SCRIPT_DEVANAGARI EncodingDetector::None
++#define PANGO_SCRIPT_ETHIOPIC EncodingDetector::None
++#define PANGO_SCRIPT_GUJARATI EncodingDetector::None
++#define PANGO_SCRIPT_GURMUKHI EncodingDetector::None
++#define PANGO_SCRIPT_KANNADA EncodingDetector::None
++#define PANGO_SCRIPT_KHMER EncodingDetector::None
++#define PANGO_SCRIPT_LAO EncodingDetector::None
++#define PANGO_SCRIPT_MALAYALAM EncodingDetector::None
++#define PANGO_SCRIPT_MONGOLIAN EncodingDetector::None
++#define PANGO_SCRIPT_MYANMAR EncodingDetector::None
++#define PANGO_SCRIPT_ORIYA EncodingDetector::None
++#define PANGO_SCRIPT_SINHALA EncodingDetector::None
++#define PANGO_SCRIPT_SYRIAC EncodingDetector::None
++#define PANGO_SCRIPT_TAGALOG EncodingDetector::None
++#define PANGO_SCRIPT_TAMIL EncodingDetector::None
++#define PANGO_SCRIPT_TIBETAN EncodingDetector::None
++#define PANGO_SCRIPT_TELUGU EncodingDetector::None
++
++//Instead of changing the table even more...
++#define PANGO_SCRIPT_ARABIC EncodingDetector::Arabic
++#define PANGO_SCRIPT_CYRILLIC EncodingDetector::Cyrillic
++#define PANGO_SCRIPT_GEORGIAN EncodingDetector::SouthEasternEurope
++#define PANGO_SCRIPT_GREEK EncodingDetector::Greek
++#define PANGO_SCRIPT_HEBREW EncodingDetector::Hebrew
++#define PANGO_SCRIPT_LATIN EncodingDetector::WesternEuropean
++#define PANGO_SCRIPT_THAI EncodingDetector::Thai
++
++
++static const PangoScriptForLang pango_script_for_lang[] = {
++ { "aa", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "ab", { PANGO_SCRIPT_CYRILLIC/*90*/ } },
++ { "af", { PANGO_SCRIPT_LATIN/*69*/ } },
++ { "am", { PANGO_SCRIPT_ETHIOPIC/*218*/ } },
++ { "ar", { PANGO_SCRIPT_ARABIC/*125*/ } },
++ { "as", { PANGO_SCRIPT_BENGALI/*89*/ } },
++ { "ast", { PANGO_SCRIPT_LATIN/*66*/ } },
++ { "ava", { PANGO_SCRIPT_CYRILLIC/*67*/ } },
++ { "ay", { PANGO_SCRIPT_LATIN/*60*/ } },
++ { "az-ir", { PANGO_SCRIPT_ARABIC/*129*/ } },
++ { "az", { PANGO_SCRIPT_CYRILLIC/*80*/ } }, //, PANGO_SCRIPT_LATIN/*68*/ } },
++ { "bam", { PANGO_SCRIPT_LATIN/*60*/ } },
++ { "ba", { PANGO_SCRIPT_CYRILLIC/*82*/ } },
++ { "be", { PANGO_SCRIPT_CYRILLIC/*68*/ } },
++ { "bg", { PANGO_SCRIPT_CYRILLIC/*60*/ } },
++ { "bh", { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
++ { "bho", { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
++ { "bi", { PANGO_SCRIPT_LATIN/*58*/ } },
++ { "bin", { PANGO_SCRIPT_LATIN/*76*/ } },
++ { "bn", { PANGO_SCRIPT_BENGALI/*89*/ } },
++ { "bo", { PANGO_SCRIPT_TIBETAN/*95*/ } },
++ { "br", { PANGO_SCRIPT_LATIN/*64*/ } },
++ { "bs", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "bua", { PANGO_SCRIPT_CYRILLIC/*70*/ } },
++ { "ca", { PANGO_SCRIPT_LATIN/*74*/ } },
++ { "ce", { PANGO_SCRIPT_CYRILLIC/*67*/ } },
++ { "chm", { PANGO_SCRIPT_CYRILLIC/*76*/ } },
++ { "chr", { PANGO_SCRIPT_CHEROKEE/*85*/ } },
++ { "ch", { PANGO_SCRIPT_LATIN/*58*/ } },
++ { "co", { PANGO_SCRIPT_LATIN/*84*/ } },
++ { "cs", { PANGO_SCRIPT_LATIN/*82*/ } },
++ { "cu", { PANGO_SCRIPT_CYRILLIC/*103*/ } },
++ { "cv", { PANGO_SCRIPT_CYRILLIC/*72*/ } }, //, PANGO_SCRIPT_LATIN/*2*/ } },
++ { "cy", { PANGO_SCRIPT_LATIN/*78*/ } },
++ { "da", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "de", { PANGO_SCRIPT_LATIN/*59*/ } },
++ { "dz", { PANGO_SCRIPT_TIBETAN/*95*/ } },
++ { "el", { PANGO_SCRIPT_GREEK/*69*/ } },
++ { "en", { PANGO_SCRIPT_LATIN/*72*/ } },
++ { "eo", { PANGO_SCRIPT_LATIN/*64*/ } },
++ { "es", { PANGO_SCRIPT_LATIN/*66*/ } },
++// { "et", { PANGO_SCRIPT_LATIN/*64*/ } },
++ { "et", { EncodingDetector::Baltic } },
++ { "eu", { PANGO_SCRIPT_LATIN/*56*/ } },
++ { "fa", { PANGO_SCRIPT_ARABIC/*129*/ } },
++ { "fi", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "fj", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "fo", { PANGO_SCRIPT_LATIN/*68*/ } },
++ { "fr", { PANGO_SCRIPT_LATIN/*84*/ } },
++ { "ful", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "fur", { PANGO_SCRIPT_LATIN/*66*/ } },
++ { "fy", { PANGO_SCRIPT_LATIN/*75*/ } },
++ { "ga", { PANGO_SCRIPT_LATIN/*80*/ } },
++ { "gd", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "gez", { PANGO_SCRIPT_ETHIOPIC/*218*/ } },
++ { "gl", { PANGO_SCRIPT_LATIN/*66*/ } },
++ { "gn", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "gu", { PANGO_SCRIPT_GUJARATI/*78*/ } },
++ { "gv", { PANGO_SCRIPT_LATIN/*54*/ } },
++ { "ha", { PANGO_SCRIPT_LATIN/*60*/ } },
++ { "haw", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "he", { PANGO_SCRIPT_HEBREW/*27*/ } },
++ { "hi", { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
++ { "ho", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "hr", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "hu", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "hy", { PANGO_SCRIPT_ARMENIAN/*77*/ } },
++ { "ia", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "ibo", { PANGO_SCRIPT_LATIN/*58*/ } },
++ { "id", { PANGO_SCRIPT_LATIN/*54*/ } },
++ { "ie", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "ik", { PANGO_SCRIPT_CYRILLIC/*68*/ } },
++ { "io", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "is", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "it", { PANGO_SCRIPT_LATIN/*72*/ } },
++ { "iu", { PANGO_SCRIPT_CANADIAN_ABORIGINAL/*161*/ } },
++// { "ja", { PANGO_SCRIPT_HAN/*6356*/, PANGO_SCRIPT_KATAKANA/*88*/, PANGO_SCRIPT_HIRAGANA/*85*/ } },
++ { "ja", { EncodingDetector::Japanese } },
++ { "kaa", { PANGO_SCRIPT_CYRILLIC/*78*/ } },
++ { "ka", { PANGO_SCRIPT_GEORGIAN/*33*/ } },
++ { "ki", { PANGO_SCRIPT_LATIN/*56*/ } },
++ { "kk", { PANGO_SCRIPT_CYRILLIC/*77*/ } },
++ { "kl", { PANGO_SCRIPT_LATIN/*81*/ } },
++ { "km", { PANGO_SCRIPT_KHMER/*70*/ } },
++ { "kn", { PANGO_SCRIPT_KANNADA/*80*/ } },
++// { "ko", { PANGO_SCRIPT_HANGUL/*2443*/ } },
++ { "ko", { EncodingDetector::Korean } },
++ { "kok", { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
++ { "ks", { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
++ { "ku-ir", { PANGO_SCRIPT_ARABIC/*32*/ } },
++ { "ku", { PANGO_SCRIPT_CYRILLIC/*60*/ } }, //, PANGO_SCRIPT_LATIN/*4*/ } },
++ { "kum", { PANGO_SCRIPT_CYRILLIC/*66*/ } },
++ { "kv", { PANGO_SCRIPT_CYRILLIC/*70*/ } },
++ { "kw", { PANGO_SCRIPT_LATIN/*64*/ } },
++ { "ky", { PANGO_SCRIPT_CYRILLIC/*70*/ } },
++ { "la", { PANGO_SCRIPT_LATIN/*68*/ } },
++ { "lb", { PANGO_SCRIPT_LATIN/*75*/ } },
++ { "lez", { PANGO_SCRIPT_CYRILLIC/*67*/ } },
++ { "ln", { PANGO_SCRIPT_LATIN/*78*/ } },
++ { "lo", { PANGO_SCRIPT_LAO/*65*/ } },
++// { "lt", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "lt", { EncodingDetector::Baltic } },
++// { "lv", { PANGO_SCRIPT_LATIN/*78*/ } },
++ { "lv", { EncodingDetector::Baltic } },
++ { "mg", { PANGO_SCRIPT_LATIN/*56*/ } },
++ { "mh", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "mi", { PANGO_SCRIPT_LATIN/*64*/ } },
++ { "mk", { PANGO_SCRIPT_CYRILLIC/*42*/ } },
++ { "ml", { PANGO_SCRIPT_MALAYALAM/*78*/ } },
++ { "mn", { PANGO_SCRIPT_MONGOLIAN/*130*/ } },
++ { "mo", { PANGO_SCRIPT_CYRILLIC/*66*/ } }, //, PANGO_SCRIPT_LATIN/*62*/ } },
++ { "mr", { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
++ { "mt", { PANGO_SCRIPT_LATIN/*72*/ } },
++ { "my", { PANGO_SCRIPT_MYANMAR/*48*/ } },
++ { "nb", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "nds", { PANGO_SCRIPT_LATIN/*59*/ } },
++ { "ne", { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
++ { "nl", { PANGO_SCRIPT_LATIN/*82*/ } },
++ { "nn", { PANGO_SCRIPT_LATIN/*76*/ } },
++ { "no", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "nr", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "nso", { PANGO_SCRIPT_LATIN/*58*/ } },
++ { "ny", { PANGO_SCRIPT_LATIN/*54*/ } },
++ { "oc", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "om", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "or", { PANGO_SCRIPT_ORIYA/*79*/ } },
++ { "os", { PANGO_SCRIPT_CYRILLIC/*66*/ } },
++ { "pa", { PANGO_SCRIPT_GURMUKHI/*63*/ } },
++ { "pl", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "ps-af", { PANGO_SCRIPT_ARABIC/*49*/ } },
++ { "ps-pk", { PANGO_SCRIPT_ARABIC/*49*/ } },
++ { "pt", { PANGO_SCRIPT_LATIN/*82*/ } },
++ { "rm", { PANGO_SCRIPT_LATIN/*66*/ } },
++ { "ro", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "ru", { PANGO_SCRIPT_CYRILLIC/*66*/ } },
++ { "sah", { PANGO_SCRIPT_CYRILLIC/*76*/ } },
++ { "sa", { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
++ { "sco", { PANGO_SCRIPT_LATIN/*56*/ } },
++ { "sel", { PANGO_SCRIPT_CYRILLIC/*66*/ } },
++ { "se", { PANGO_SCRIPT_LATIN/*66*/ } },
++ { "sh", { PANGO_SCRIPT_CYRILLIC/*76*/ } },
++ { "si", { PANGO_SCRIPT_SINHALA/*77*/ } },
++ { "sk", { PANGO_SCRIPT_LATIN/*86*/ } },
++ { "sl", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "sma", { PANGO_SCRIPT_LATIN/*60*/ } },
++ { "smj", { PANGO_SCRIPT_LATIN/*60*/ } },
++ { "smn", { PANGO_SCRIPT_LATIN/*68*/ } },
++ { "sms", { PANGO_SCRIPT_LATIN/*80*/ } },
++ { "sm", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "so", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "sq", { PANGO_SCRIPT_LATIN/*56*/ } },
++ { "sr", { PANGO_SCRIPT_CYRILLIC/*76*/ } },
++ { "ss", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "st", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "sv", { PANGO_SCRIPT_LATIN/*68*/ } },
++ { "sw", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "syr", { PANGO_SCRIPT_SYRIAC/*45*/ } },
++ { "ta", { PANGO_SCRIPT_TAMIL/*48*/ } },
++ { "te", { PANGO_SCRIPT_TELUGU/*80*/ } },
++ { "tg", { PANGO_SCRIPT_CYRILLIC/*78*/ } },
++ { "th", { PANGO_SCRIPT_THAI/*86*/ } },
++ { "ti-er", { PANGO_SCRIPT_ETHIOPIC/*255*/ } },
++ { "ti-et", { PANGO_SCRIPT_ETHIOPIC/*255*/ } },
++ { "tig", { PANGO_SCRIPT_ETHIOPIC/*221*/ } },
++ { "tk", { PANGO_SCRIPT_CYRILLIC/*74*/ } },
++ { "tl", { PANGO_SCRIPT_TAGALOG/*19*/ } },
++ { "tn", { PANGO_SCRIPT_LATIN/*58*/ } },
++ { "to", { PANGO_SCRIPT_LATIN/*52*/ } },
++// { "tr", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "tr", { EncodingDetector::Turkish } },
++ { "ts", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "tt", { PANGO_SCRIPT_CYRILLIC/*76*/ } },
++ { "tw", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "tyv", { PANGO_SCRIPT_CYRILLIC/*70*/ } },
++ { "ug", { PANGO_SCRIPT_ARABIC/*125*/ } },
++ { "uk", { PANGO_SCRIPT_CYRILLIC/*72*/ } },
++ { "ur", { PANGO_SCRIPT_ARABIC/*145*/ } },
++ { "uz", { PANGO_SCRIPT_CYRILLIC/*68*/ } },
++ { "ven", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "vi", { PANGO_SCRIPT_LATIN/*186*/ } },
++ { "vot", { PANGO_SCRIPT_LATIN/*62*/ } },
++ { "vo", { PANGO_SCRIPT_LATIN/*54*/ } },
++ { "wa", { PANGO_SCRIPT_LATIN/*70*/ } },
++ { "wen", { PANGO_SCRIPT_LATIN/*76*/ } },
++ { "wo", { PANGO_SCRIPT_LATIN/*66*/ } },
++ { "xh", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "yap", { PANGO_SCRIPT_LATIN/*58*/ } },
++ { "yi", { PANGO_SCRIPT_HEBREW/*27*/ } },
++ { "yo", { PANGO_SCRIPT_LATIN/*114*/ } },
++// { "zh-cn", { PANGO_SCRIPT_HAN/*6763*/ } },
++ { "zh-cn", { EncodingDetector::ChineseSimplified } },
++// { "zh-hk", { PANGO_SCRIPT_HAN/*2213*/ } },
++ { "zh-hk", { EncodingDetector::ChineseTraditional } },
++// { "zh-mo", { PANGO_SCRIPT_HAN/*2213*/ } },
++ { "zh-mo", { EncodingDetector::ChineseTraditional } },
++// { "zh-sg", { PANGO_SCRIPT_HAN/*6763*/ } },
++ { "zh-sg", { EncodingDetector::ChineseSimplified } },
++// { "zh-tw", { PANGO_SCRIPT_HAN/*13063*/ } },
++ { "zh-tw", { EncodingDetector::ChineseTraditional } },
++ { "zu", { PANGO_SCRIPT_LATIN/*52*/ } },
++ { "\x00", { EncodingDetector::None } } //end mark
++};
++
++enum MIB
++{
++ MibLatin1 = 4,
++ Mib8859_8 = 85,
++ MibUtf8 = 106,
++ MibUcs2 = 1000,
++ MibUtf16 = 1015,
++ MibUtf16BE = 1013,
++ MibUtf16LE = 1014
++};
++
++static bool is16Bit(QTextCodec* codec)
++{
++ switch (codec->mibEnum())
++ {
++ case MibUtf16:
++ case MibUtf16BE:
++ case MibUtf16LE:
++ case MibUcs2:
++ return true;
++ default:
++ return false;
++ }
++}
++
++class EncodingDetectorPrivate
++{
++public:
++ QTextCodec *m_codec;
++ QTextDecoder *m_decoder; // utf16
++ QTextCodec *m_defaultCodec;
++ QCString m_storeDecoderName;
++
++ EncodingDetector::EncodingChoiceSource m_source;
++ EncodingDetector::AutoDetectScript m_autoDetectLanguage;
++
++ bool m_visualRTL : 1;
++ bool m_seenBody : 1;
++ bool m_writtingHappened : 1;
++ bool m_analyzeCalled : 1; //for decode()
++ int m_multiByte;
++
++ QCString m_bufferForDefferedEncDetection;
++
++ EncodingDetectorPrivate()
++ : m_codec(QTextCodec::codecForMib(MibLatin1))
++ , m_decoder(m_codec->makeDecoder())
++ , m_defaultCodec(m_codec)
++ , m_source(EncodingDetector::DefaultEncoding)
++ , m_autoDetectLanguage(EncodingDetector::SemiautomaticDetection)
++ , m_visualRTL(false)
++ , m_seenBody(false)
++ , m_writtingHappened(false)
++ , m_analyzeCalled(false)
++ , m_multiByte(0)
++ {
++ }
++
++ EncodingDetectorPrivate(QTextCodec* codec,EncodingDetector::EncodingChoiceSource source, EncodingDetector::AutoDetectScript script)
++ : m_codec(codec)
++ , m_decoder(m_codec->makeDecoder())
++ , m_defaultCodec(m_codec)
++ , m_source(source)
++ , m_autoDetectLanguage(script)
++ , m_visualRTL(false)
++ , m_seenBody(false)
++ , m_writtingHappened(false)
++ , m_analyzeCalled(false)
++ , m_multiByte(0)
++ {
++ }
++
++ ~EncodingDetectorPrivate()
++ {
++ delete m_decoder;
++ }
++};
++
++
++static QCString automaticDetectionForArabic( const unsigned char* ptr, int size )
++{
++ for ( int i = 0; i < size; ++i ) {
++ if ( ( ptr[ i ] >= 0x80 && ptr[ i ] <= 0x9F ) || ptr[ i ] == 0xA1 || ptr[ i ] == 0xA2 || ptr[ i ] == 0xA3
++ || ( ptr[ i ] >= 0xA5 && ptr[ i ] <= 0xAB ) || ( ptr[ i ] >= 0xAE && ptr[ i ] <= 0xBA )
++ || ptr[ i ] == 0xBC || ptr[ i ] == 0xBD || ptr[ i ] == 0xBE || ptr[ i ] == 0xC0
++ || ( ptr[ i ] >= 0xDB && ptr[ i ] <= 0xDF ) || ( ptr[ i ] >= 0xF3 ) ) {
++ return "cp1256";
++ }
++ }
++
++ return "iso-8859-6";
++}
++
++static QCString automaticDetectionForBaltic( const unsigned char* ptr, int size )
++{
++ for ( int i = 0; i < size; ++i ) {
++ if ( ( ptr[ i ] >= 0x80 && ptr[ i ] <= 0x9E ) )
++ return "cp1257";
++
++ if ( ptr[ i ] == 0xA1 || ptr[ i ] == 0xA5 )
++ return "iso-8859-13";
++ }
++
++ return "iso-8859-13";
++}
++
++static QCString automaticDetectionForCentralEuropean(const unsigned char* ptr, int size )
++{
++ QCString charset;
++ for ( int i = 0; i < size; ++i ) {
++ if ( ptr[ i ] >= 0x80 && ptr[ i ] <= 0x9F ) {
++ if ( ptr[ i ] == 0x81 || ptr[ i ] == 0x83 || ptr[ i ] == 0x90 || ptr[ i ] == 0x98 )
++ return "ibm852";
++
++ if ( i + 1 > size )
++ return "cp1250";
++ else { // maybe ibm852 ?
++ charset = "cp1250";
++ continue;
++ }
++ }
++ if ( ptr[ i ] == 0xA5 || ptr[ i ] == 0xAE || ptr[ i ] == 0xBE || ptr[ i ] == 0xC3 || ptr[ i ] == 0xD0 || ptr[ i ] == 0xE3 || ptr[ i ] == 0xF0 ) {
++ if ( i + 1 > size )
++ return "iso-8859-2";
++ else { // maybe ibm852 ?
++ if ( charset.isNull() )
++ charset = "iso-8859-2";
++ continue;
++ }
++ }
++ }
++
++ if ( charset.isNull() )
++ charset = "iso-8859-3";
++
++ return charset.data();
++}
++
++static QCString automaticDetectionForCyrillic( const unsigned char* ptr, int size)
++{
++#ifdef DECODE_DEBUG
++ kWarning() << "EncodingDetector: Cyr heuristics";
++#endif
++
++// if (ptr[0]==0xef && ptr[1]==0xbb && ptr[2]==0xbf)
++// return "utf8";
++ int utf8_mark=0;
++ int koi_score=0;
++ int cp1251_score=0;
++
++ int koi_st=0;
++ int cp1251_st=0;
++
++// int koi_na=0;
++// int cp1251_na=0;
++
++ int koi_o_capital=0;
++ int koi_o=0;
++ int cp1251_o_capital=0;
++ int cp1251_o=0;
++
++ int koi_a_capital=0;
++ int koi_a=0;
++ int cp1251_a_capital=0;
++ int cp1251_a=0;
++
++ int koi_s_capital=0;
++ int koi_s=0;
++ int cp1251_s_capital=0;
++ int cp1251_s=0;
++
++ int koi_i_capital=0;
++ int koi_i=0;
++ int cp1251_i_capital=0;
++ int cp1251_i=0;
++
++ int cp1251_small_range=0;
++ int koi_small_range=0;
++ int ibm866_small_range=0;
++
++ int i;
++ for (i=1; (i<size) && (cp1251_small_range+koi_small_range<1000) ;++i)
++ {
++ if (ptr[i]>0xdf)
++ {
++ ++cp1251_small_range;
++
++ if (ptr[i]==0xee)//small o
++ ++cp1251_o;
++ else if (ptr[i]==0xe0)//small a
++ ++cp1251_a;
++ else if (ptr[i]==0xe8)//small i
++ ++cp1251_i;
++ else if (ptr[i]==0xf1)//small s
++ ++cp1251_s;
++ else if (ptr[i]==0xf2 && ptr[i-1]==0xf1)//small st
++ ++cp1251_st;
++
++ else if (ptr[i]==0xef)
++ ++koi_o_capital;
++ else if (ptr[i]==0xe1)
++ ++koi_a_capital;
++ else if (ptr[i]==0xe9)
++ ++koi_i_capital;
++ else if (ptr[i]==0xf3)
++ ++koi_s_capital;
++
++ }
++ else if (ptr[i]>0xbf)
++ {
++ ++koi_small_range;
++
++ if (ptr[i]==0xd0||ptr[i]==0xd1)//small o
++ ++utf8_mark;
++ else if (ptr[i]==0xcf)//small o
++ ++koi_o;
++ else if (ptr[i]==0xc1)//small a
++ ++koi_a;
++ else if (ptr[i]==0xc9)//small i
++ ++koi_i;
++ else if (ptr[i]==0xd3)//small s
++ ++koi_s;
++ else if (ptr[i]==0xd4 && ptr[i-1]==0xd3)//small st
++ ++koi_st;
++
++ else if (ptr[i]==0xce)
++ ++cp1251_o_capital;
++ else if (ptr[i]==0xc0)
++ ++cp1251_a_capital;
++ else if (ptr[i]==0xc8)
++ ++cp1251_i_capital;
++ else if (ptr[i]==0xd1)
++ ++cp1251_s_capital;
++ }
++ else if (ptr[i]>0x9f && ptr[i]<0xb0) //first 16 letterz is 60%
++ ++ibm866_small_range;
++
++ }
++
++ //cannot decide?
++ if (cp1251_small_range+koi_small_range+ibm866_small_range<8)
++ {
++ return "";
++ }
++
++ if (3*utf8_mark>cp1251_small_range+koi_small_range+ibm866_small_range)
++ {
++#ifdef DECODE_DEBUG
++ kWarning() << "Cyr Enc Detection: UTF8";
++#endif
++ return "UTF-8";
++ }
++
++ if (ibm866_small_range>cp1251_small_range+koi_small_range)
++ return "ibm866";
++
++// QCString koi_string = "koi8-u";
++// QCString cp1251_string = "cp1251";
++
++ if (cp1251_st==0 && koi_st>1)
++ koi_score+=10;
++ else if (koi_st==0 && cp1251_st>1)
++ cp1251_score+=10;
++
++ if (cp1251_st && koi_st)
++ {
++ if (cp1251_st/koi_st>2)
++ cp1251_score+=20;
++ else if (koi_st/cp1251_st>2)
++ koi_score+=20;
++ }
++
++ if (cp1251_a>koi_a)
++ cp1251_score+=10;
++ else if (cp1251_a || koi_a)
++ koi_score+=10;
++
++ if (cp1251_o>koi_o)
++ cp1251_score+=10;
++ else if (cp1251_o || koi_o)
++ koi_score+=10;
++
++ if (cp1251_i>koi_i)
++ cp1251_score+=10;
++ else if (cp1251_i || koi_i)
++ koi_score+=10;
++
++ if (cp1251_s>koi_s)
++ cp1251_score+=10;
++ else if (cp1251_s || koi_s)
++ koi_score+=10;
++
++ if (cp1251_a_capital>koi_a_capital)
++ cp1251_score+=9;
++ else if (cp1251_a_capital || koi_a_capital)
++ koi_score+=9;
++
++ if (cp1251_o_capital>koi_o_capital)
++ cp1251_score+=9;
++ else if (cp1251_o_capital || koi_o_capital)
++ koi_score+=9;
++
++ if (cp1251_i_capital>koi_i_capital)
++ cp1251_score+=9;
++ else if (cp1251_i_capital || koi_i_capital)
++ koi_score+=9;
++
++ if (cp1251_s_capital>koi_s_capital)
++ cp1251_score+=9;
++ else if (cp1251_s_capital || koi_s_capital)
++ koi_score+=9;
++#ifdef DECODE_DEBUG
++ kWarning()<<"koi_score " << koi_score << " cp1251_score " << cp1251_score;
++#endif
++ if (abs(koi_score-cp1251_score)<10)
++ {
++ //fallback...
++ cp1251_score=cp1251_small_range;
++ koi_score=koi_small_range;
++ }
++ if (cp1251_score>koi_score)
++ return "cp1251";
++ else
++ return "koi8-u";
++
++
++// if (cp1251_score>koi_score)
++// setEncoding("cp1251",AutoDetectedEncoding);
++// else
++// setEncoding("koi8-u",AutoDetectedEncoding);
++// return true;
++
++}
++
++static QCString automaticDetectionForGreek( const unsigned char* ptr, int size )
++{
++ for ( int i = 0; i < size; ++i ) {
++ if ( ptr[ i ] == 0x80 || ( ptr[ i ] >= 0x82 && ptr[ i ] <= 0x87 ) || ptr[ i ] == 0x89 || ptr[ i ] == 0x8B
++ || ( ptr[ i ] >= 0x91 && ptr[ i ] <= 0x97 ) || ptr[ i ] == 0x99 || ptr[ i ] == 0x9B || ptr[ i ] == 0xA4
++ || ptr[ i ] == 0xA5 || ptr[ i ] == 0xAE ) {
++ return "cp1253";
++ }
++ }
++
++ return "iso-8859-7";
++}
++
++static QCString automaticDetectionForHebrew( const unsigned char* ptr, int size )
++{
++ for ( int i = 0; i < size; ++i ) {
++ if ( ptr[ i ] == 0x80 || ( ptr[ i ] >= 0x82 && ptr[ i ] <= 0x89 ) || ptr[ i ] == 0x8B
++ || ( ptr[ i ] >= 0x91 && ptr[ i ] <= 0x99 ) || ptr[ i ] == 0x9B || ptr[ i ] == 0xA1 || ( ptr[ i ] >= 0xBF && ptr[ i ] <= 0xC9 )
++ || ( ptr[ i ] >= 0xCB && ptr[ i ] <= 0xD8 ) ) {
++ return "cp1255";
++ }
++
++ if ( ptr[ i ] == 0xDF )
++ return "iso-8859-8-i";
++ }
++
++ return "iso-8859-8-i";
++}
++
++static QCString automaticDetectionForJapanese( const unsigned char* ptr, int size )
++{
++ JapaneseCode kc;
++
++ switch ( kc.guess_jp( (const char*)ptr, size ) ) {
++ case JapaneseCode::JIS:
++ return "jis7";
++ case JapaneseCode::EUC:
++ return "eucjp";
++ case JapaneseCode::SJIS:
++ return "sjis";
++ case JapaneseCode::UTF8:
++ return "utf8";
++ default:
++ break;
++ }
++
++ return "";
++}
++
++static QCString automaticDetectionForTurkish( const unsigned char* ptr, int size )
++{
++ for ( int i = 0; i < size; ++i ) {
++ if ( ptr[ i ] == 0x80 || ( ptr[ i ] >= 0x82 && ptr[ i ] <= 0x8C ) || ( ptr[ i ] >= 0x91 && ptr[ i ] <= 0x9C ) || ptr[ i ] == 0x9F ) {
++ return "cp1254";
++ }
++ }
++
++ return "iso-8859-9";
++}
++
++static QCString automaticDetectionForWesternEuropean( const unsigned char* ptr, int size )
++{
++ uint nonansi_count=0;
++ for (int i=0; i<size; ++i)
++ {
++ if (ptr[i]>0x79)
++ {
++ ++nonansi_count;
++ if ( ptr[i]>0xc1 && ptr[i]<0xf0 && i+1<size && ptr[i+1]>0x7f && ptr[i+1]<0xc0)
++ {
++ return "UTF-8";
++ }
++ if (ptr[i] >= 0x78 && ptr[i] <= 0x9 )
++ {
++ return "cp1252";
++ }
++ }
++
++ }
++
++ if (nonansi_count>0)
++ return "iso-8859-15";
++
++ return "";
++}
++
++// Other browsers allow comments in the head section, so we need to also.
++// It's important not to look for tags inside the comments.
++static void skipComment(const char *&ptr, const char *pEnd)
++{
++ const char *p = ptr;
++ // Allow <!-->; other browsers do.
++ if (*p=='>')
++ {
++ p++;
++ }
++ else
++ {
++ while (p!=pEnd)
++ {
++ if (*p=='-')
++ {
++ // This is the real end of comment, "-->".
++ if (p[1]=='-' && p[2]=='>')
++ {
++ p += 3;
++ break;
++ }
++ // This is the incorrect end of comment that other browsers allow, "--!>".
++ if (p[1] == '-' && p[2] == '!' && p[3] == '>')
++ {
++ p += 4;
++ break;
++ }
++ }
++ p++;
++ }
++ }
++ ptr=p;
++}
++
++// Returns the position of the encoding string.
++static int findXMLEncoding(const QCString &str, int &encodingLength)
++{
++ int len = str.length();
++ int pos = str.find("encoding");
++ if (pos == -1)
++ return -1;
++ pos += 8;
++
++ // Skip spaces and stray control characters.
++ while (pos<len && str[pos]<=' ')
++ ++pos;
++
++ //Bail out if nothing after
++ // Skip equals sign.
++ if (pos>=len || str[pos] != '=')
++ return -1;
++ ++pos;
++
++ // Skip spaces and stray control characters.
++ while (pos<len && str[pos]<=' ')
++ ++pos;
++
++ //Bail out if nothing after
++ if (pos >= len)
++ return -1;
++
++ // Skip quotation mark.
++ char quoteMark = str[pos];
++ if (quoteMark != '"' && quoteMark != '\'')
++ return -1;
++ ++pos;
++
++ // Find the trailing quotation mark.
++ int end=pos;
++ while (end<len && str[end]!=quoteMark)
++ ++end;
++
++ if (end>=len)
++ return -1;
++
++ encodingLength = end-pos;
++ return pos;
++}
++
++
++bool EncodingDetector::errorsIfUtf8 (const char* data, int length)
++{
++ if (d->m_codec->mibEnum()!=MibUtf8)
++ return false; //means no errors
++// #define highest1Bits (unsigned char)0x80
++// #define highest2Bits (unsigned char)0xC0
++// #define highest3Bits (unsigned char)0xE0
++// #define highest4Bits (unsigned char)0xF0
++// #define highest5Bits (unsigned char)0xF8
++static const unsigned char highest1Bits = 0x80;
++static const unsigned char highest2Bits = 0xC0;
++static const unsigned char highest3Bits = 0xE0;
++static const unsigned char highest4Bits = 0xF0;
++static const unsigned char highest5Bits = 0xF8;
++
++ for (int i=0; i<length; ++i)
++ {
++ unsigned char c = data[i];
++
++ if (d->m_multiByte>0)
++ {
++ if ((c & highest2Bits) == 0x80)
++ {
++ --(d->m_multiByte);
++ continue;
++ }
++#ifdef DECODE_DEBUG
++ kWarning() << "EncDetector: Broken UTF8";
++#endif
++ return true;
++ }
++
++ // most significant bit zero, single char
++ if ((c & highest1Bits) == 0x00)
++ continue;
++
++ // 110xxxxx => init 1 following bytes
++ if ((c & highest3Bits) == 0xC0)
++ {
++ d->m_multiByte = 1;
++ continue;
++ }
++
++ // 1110xxxx => init 2 following bytes
++ if ((c & highest4Bits) == 0xE0)
++ {
++ d->m_multiByte = 2;
++ continue;
++ }
++
++ // 11110xxx => init 3 following bytes
++ if ((c & highest5Bits) == 0xF0)
++ {
++ d->m_multiByte = 3;
++ continue;
++ }
++#ifdef DECODE_DEBUG
++ kWarning() << "EncDetector:_Broken UTF8";
++#endif
++ return true;
++ }
++ return false;
++}
++
++EncodingDetector::EncodingDetector() : d(new EncodingDetectorPrivate)
++{
++}
++
++EncodingDetector::EncodingDetector(QTextCodec* codec, EncodingChoiceSource source, AutoDetectScript script) :
++ d(new EncodingDetectorPrivate(codec,source,script))
++{
++}
++
++EncodingDetector::~EncodingDetector()
++{
++ delete d;
++}
++
++void EncodingDetector::setAutoDetectLanguage( EncodingDetector::AutoDetectScript lang)
++{
++ d->m_autoDetectLanguage=lang;
++}
++EncodingDetector::AutoDetectScript EncodingDetector::autoDetectLanguage() const
++{
++ return d->m_autoDetectLanguage;
++}
++
++EncodingDetector::EncodingChoiceSource EncodingDetector::encodingChoiceSource() const
++{
++ return d->m_source;
++}
++
++const char* EncodingDetector::encoding() const
++{
++ d->m_storeDecoderName = d->m_codec->name();
++ return d->m_storeDecoderName.data();
++}
++
++bool EncodingDetector::visuallyOrdered() const
++{
++ return d->m_visualRTL;
++}
++
++// const QTextCodec* EncodingDetector::codec() const
++// {
++// return d->m_codec;
++// }
++
++QTextDecoder* EncodingDetector::decoder()
++{
++ return d->m_decoder;
++}
++
++bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource type)
++{
++ QTextCodec *codec;
++ QCString enc(_encoding);
++ if(/*enc.isNull() || */enc.isEmpty())
++ {
++ if (type==DefaultEncoding)
++ codec=d->m_defaultCodec;
++ else
++ return false;
++ }
++ else
++ {
++ //QString->QTextCodec
++
++ enc = enc.lower();
++ // hebrew visually ordered
++ if(enc=="visual")
++ enc="iso8859-8";
++ bool b;
++ codec = KGlobal::charsets()->codecForName(enc, b);
++ if (!b)
++ return false;
++ }
++
++ if (d->m_codec->mibEnum()==codec->mibEnum())
++ return true;
++
++ if ((type==EncodingFromMetaTag || type==EncodingFromXMLHeader) && is16Bit(codec))
++ {
++ //Sometimes the codec specified is absurd, i.e. UTF-16 despite
++ //us decoding a meta tag as ASCII. In that case, ignore it.
++ return false;
++ }
++
++ if (codec->mibEnum() == Mib8859_8)
++ {
++ //We do NOT want to use Qt's QHebrewCodec, since it tries to reorder itself.
++ codec = QTextCodec::codecForName("iso8859-8-i");
++
++ // visually ordered unless one of the following
++ if(!(enc=="iso-8859-8-i"||enc=="iso_8859-8-i"||enc=="csiso88598i"||enc=="logical"))
++ d->m_visualRTL = true;
++ }
++
++ d->m_codec = codec;
++ d->m_source = type;
++ delete d->m_decoder;
++ d->m_decoder = d->m_codec->makeDecoder();
++#ifdef DECODE_DEBUG
++ kDebug(6005) << "EncodingDetector::encoding used is" << d->m_codec->name();
++#endif
++ return true;
++}
++
++bool EncodingDetector::analyze(const QByteArray &data)
++{
++ return analyze( data.data(), data.size() );
++}
++
++bool EncodingDetector::analyze(const char *data, int len)
++{
++ // Check for UTF-16 or UTF-8 BOM mark at the beginning, which is a sure sign of a Unicode encoding.
++ // maximumBOMLength = 10
++ // Even if the user has chosen utf16 we still need to auto-detect the endianness
++ if (len >= 10 && ((d->m_source != UserChosenEncoding) || is16Bit(d->m_codec)))
++ {
++ // Extract the first three bytes.
++ const uchar *udata = (const uchar *)data;
++ uchar c1 = *udata++;
++ uchar c2 = *udata++;
++ uchar c3 = *udata++;
++
++ // Check for the BOM
++ const char *autoDetectedEncoding;
++ if ((c1 == 0xFE && c2 == 0xFF) || (c1 == 0xFF && c2 == 0xFE))
++ {
++ autoDetectedEncoding = "ISO-10646-UCS-2";
++ }
++ else if (c1 == 0xEF && c2 == 0xBB && c3 == 0xBF)
++ {
++ autoDetectedEncoding = "UTF-8";
++ }
++ else if (c1 == 0x00 || c2 == 0x00)
++ {
++ uchar c4 = *udata++;
++ uchar c5 = *udata++;
++ uchar c6 = *udata++;
++ uchar c7 = *udata++;
++ uchar c8 = *udata++;
++ uchar c9 = *udata++;
++ uchar c10 = *udata++;
++
++ int nul_count_even = (c2 != 0) + (c4 != 0) + (c6 != 0) + (c8 != 0) + (c10 != 0);
++ int nul_count_odd = (c1 != 0) + (c3 != 0) + (c5 != 0) + (c7 != 0) + (c9 != 0);
++ if ((nul_count_even==0 && nul_count_odd==5) || (nul_count_even==5 && nul_count_odd==0))
++ autoDetectedEncoding = "ISO-10646-UCS-2";
++ else
++ autoDetectedEncoding = 0;
++ }
++ else
++ {
++ autoDetectedEncoding = 0;
++ }
++
++ // If we found a BOM, use the encoding it implies.
++ if (autoDetectedEncoding != 0)
++ {
++ d->m_source = BOM;
++ d->m_codec = QTextCodec::codecForName(autoDetectedEncoding);
++ assert(d->m_codec);
++ //enc = d->m_codec->name();
++ delete d->m_decoder;
++ d->m_decoder = d->m_codec->makeDecoder();
++#ifdef DECODE_DEBUG
++ kWarning() << "Detection by BOM";
++#endif
++ if (is16Bit(d->m_codec) && c2==0x00)
++ {
++ // utf16LE, we need to put the decoder in LE mode
++ char reverseUtf16[3] = {(char)0xFF, (char)0xFE, 0x00};
++ d->m_decoder->toUnicode(reverseUtf16, 2);
++ }
++ return true;
++ }
++ }
++
++ //exit from routine in case it was called to only detect byte order for utf-16
++ if (d->m_source==UserChosenEncoding)
++ {
++#ifdef DECODE_DEBUG
++ kWarning() << "EncodingDetector: UserChosenEncoding exit ";
++#endif
++
++ if (errorsIfUtf8(data, len))
++ setEncoding("",DefaultEncoding);
++ return true;
++ }
++#if 0 //This is for plaintext, so don't try to parse HTML headers -- ahartmetz
++ if (!d->m_seenBody)
++ {
++ // we still don't have an encoding, and are in the head
++ // the following tags are allowed in <head>:
++ // SCRIPT|STYLE|META|LINK|OBJECT|TITLE|BASE
++ const char *ptr = data;
++ const char *pEnd = data+len;
++
++ while(ptr != pEnd)
++ {
++ if(*ptr!='<')
++ {
++ ++ptr;
++ continue;
++ }
++ ++ptr;
++ // Handle comments.
++ if (ptr[0] == '!' && ptr[1] == '-' && ptr[2] == '-')
++ {
++ ptr += 3;
++ skipComment(ptr, pEnd);
++ continue;
++ }
++
++ // Handle XML header, which can have encoding in it.
++ if (ptr[0]=='?' && ptr[1]=='x' && ptr[2]=='m' && ptr[3]=='l')
++ {
++ const char *end = ptr;
++ while (*end != '>' && end < pEnd)
++ end++;
++ if (*end == '\0' || end == pEnd)
++ break;
++ QCString str(ptr, end - ptr + 1);
++ int length;
++ int pos = findXMLEncoding(str, length);
++ // also handles the case when specified encoding aint correct
++ if (pos!=-1 && setEncoding(str.mid(pos, length), EncodingFromXMLHeader))
++ {
++ return true;
++ }
++ }
++
++ //look for <meta>, stop if we reach <body>
++ while (
++ !((*ptr >= 'a') && (*ptr <= 'z') ||
++ (*ptr >= 'A') && (*ptr <= 'Z'))
++ && ptr < pEnd
++ )
++ ++ptr;
++
++ char tmp[5];
++ int length=0;
++ const char* max=ptr+4;
++ if (pEnd<max)
++ max=pEnd;
++ while (
++ ((*ptr >= 'a') && (*ptr <= 'z') ||
++ (*ptr >= 'A') && (*ptr <= 'Z') ||
++ (*ptr >= '0') && (*ptr <= '9'))
++ && ptr < max
++ )
++ {
++ tmp[length] = tolower( *ptr );
++ ++ptr;
++ ++length;
++ }
++ tmp[length] = 0;
++ if (tmp[0]=='m'&&tmp[1]=='e'&&tmp[2]=='t'&&tmp[3]=='a')
++ {
++ // found a meta tag...
++ const char* end = ptr;
++ while(*end != '>' && *end != '\0' && end<pEnd)
++ end++;
++ //if ( *end == '\0' ) break;
++ QCString str( ptr, (end-ptr)+1);
++ str = str.lower();
++ int pos=0;
++ //if( (pos = str.find("http-equiv", pos)) == -1) break;
++ //if( (pos = str.find("content-type", pos)) == -1) break;
++ if( (pos = str.find("charset")) == -1)
++ continue;
++ pos+=6;
++ // skip to '='
++ if( (pos = str.find('=', pos)) == -1)
++ continue;
++
++ // skip whitespace before encoding itself
++ while (pos < (int)str.length() && str[pos] <= ' ')
++ ++pos;
++ if ( pos == (int)str.length())
++ continue;
++
++ int endpos = pos;
++ while( endpos < str.length() &&
++ (str[endpos] != ' ' && str[endpos] != '"' && str[endpos] != '\''
++ && str[endpos] != ';' && str[endpos] != '>') )
++ ++endpos;
++ #ifdef DECODE_DEBUG
++ kDebug( 6005 ) << "EncodingDetector: found charset in <meta>: " << str.mid(pos,endpos-pos).data();
++ #endif
++ if (setEncoding(str.mid(pos,endpos-pos), EncodingFromMetaTag))
++ return true;
++ }
++ else if (tmp[0]=='b'&&tmp[1]=='o'&&tmp[2]=='d'&&tmp[3]=='y')
++ {
++ d->m_seenBody=true;
++ break;
++ }
++ }
++ }
++
++ if (d->m_source==EncodingFromHTTPHeader)
++ return true;
++#endif
++ //if (len<20) //make a guess even if the file is short -- ahartmetz
++ if (len < 1)
++ {
++ setEncoding("",DefaultEncoding);
++ return false;
++ }
++#ifdef DECODE_DEBUG
++ kDebug( 6005 ) << "EncodingDetector: using heuristics (" << strlen(data) << ")";
++#endif
++
++ switch ( d->m_autoDetectLanguage )
++ {
++ case EncodingDetector::Arabic:
++ return setEncoding(automaticDetectionForArabic( (const unsigned char*) data, len ), AutoDetectedEncoding);
++// break;
++ case EncodingDetector::Baltic:
++ return setEncoding(automaticDetectionForBaltic( (const unsigned char*) data, len ), AutoDetectedEncoding);
++// break;
++ case EncodingDetector::CentralEuropean:
++ return setEncoding(automaticDetectionForCentralEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding);
++ break;
++ case EncodingDetector::Cyrillic:
++ return setEncoding(automaticDetectionForCyrillic( (const unsigned char*) data, len), AutoDetectedEncoding);
++// break;
++ case EncodingDetector::Greek:
++ return setEncoding(automaticDetectionForGreek( (const unsigned char*) data, len ), AutoDetectedEncoding);
++// break;
++ case EncodingDetector::Hebrew:
++ return setEncoding(automaticDetectionForHebrew( (const unsigned char*) data, len ), AutoDetectedEncoding);
++// break;
++ case EncodingDetector::Japanese:
++ return setEncoding(automaticDetectionForJapanese( (const unsigned char*) data, len ), AutoDetectedEncoding);
++// break;
++ case EncodingDetector::Turkish:
++ return setEncoding(automaticDetectionForTurkish( (const unsigned char*) data, len ), AutoDetectedEncoding);
++// break;
++ case EncodingDetector::WesternEuropean:
++ if (setEncoding(automaticDetectionForWesternEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding))
++ return true;
++ else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for khtml
++ {
++ return setEncoding("iso-8859-15",AutoDetectedEncoding);
++ }
++ else //use default provided by eg katepart
++ {
++ return setEncoding("",DefaultEncoding);
++ }
++// break;
++ case EncodingDetector::SemiautomaticDetection:
++ case EncodingDetector::ChineseSimplified:
++ case EncodingDetector::ChineseTraditional:
++ case EncodingDetector::Korean:
++ case EncodingDetector::Thai:
++ case EncodingDetector::Unicode:
++ case EncodingDetector::NorthernSaami:
++ case EncodingDetector::SouthEasternEurope:
++ case EncodingDetector::None:
++ // huh. somethings broken in this code ### FIXME
++ //enc = 0; //Reset invalid codec we tried, so we get back to latin1 fallback.
++ break;
++ }
++
++ setEncoding("",DefaultEncoding);
++ return true;
++}
++
++
++EncodingDetector::AutoDetectScript EncodingDetector::scriptForName(const QString& lang)
++{
++ if (lang.isEmpty())
++ return EncodingDetector::None;
++ else if (lang==i18n("@item Text character set", "Unicode"))
++ return EncodingDetector::Unicode;
++ else if (lang==i18n("@item Text character set", "Cyrillic"))
++ return EncodingDetector::Cyrillic;
++ else if (lang==i18n("@item Text character set", "Western European"))
++ return EncodingDetector::WesternEuropean;
++ else if (lang==i18n("@item Text character set", "Central European"))
++ return EncodingDetector::CentralEuropean;
++ else if (lang==i18n("@item Text character set", "Greek"))
++ return EncodingDetector::Greek;
++ else if (lang==i18n("@item Text character set", "Hebrew"))
++ return EncodingDetector::Hebrew;
++ else if (lang==i18n("@item Text character set", "Turkish"))
++ return EncodingDetector::Turkish;
++ else if (lang==i18n("@item Text character set", "Japanese"))
++ return EncodingDetector::Japanese;
++ else if (lang==i18n("@item Text character set", "Baltic"))
++ return EncodingDetector::Baltic;
++ else if (lang==i18n("@item Text character set", "Arabic"))
++ return EncodingDetector::Arabic;
++
++ return EncodingDetector::None;
++}
++
++bool EncodingDetector::hasAutoDetectionForScript(EncodingDetector::AutoDetectScript script)
++{
++ switch (script)
++ {
++ case EncodingDetector::Arabic:
++ return true;
++ case EncodingDetector::Baltic:
++ return true;
++ case EncodingDetector::CentralEuropean:
++ return true;
++ case EncodingDetector::Cyrillic:
++ return true;
++ case EncodingDetector::Greek:
++ return true;
++ case EncodingDetector::Hebrew:
++ return true;
++ case EncodingDetector::Japanese:
++ return true;
++ case EncodingDetector::Turkish:
++ return true;
++ case EncodingDetector::WesternEuropean:
++ return true;
++ case EncodingDetector::ChineseTraditional:
++ return true;
++ case EncodingDetector::ChineseSimplified:
++ return true;
++ case EncodingDetector::Unicode:
++ return true;
++ break;
++ default:
++ return false;
++ }
++}
++
++QString EncodingDetector::nameForScript(EncodingDetector::AutoDetectScript script)
++{
++ switch (script)
++ {
++ case EncodingDetector::Arabic:
++ return i18n("@item Text character set", "Arabic");
++ break;
++ case EncodingDetector::Baltic:
++ return i18n("@item Text character set", "Baltic");
++ break;
++ case EncodingDetector::CentralEuropean:
++ return i18n("@item Text character set", "Central European");
++ break;
++ case EncodingDetector::Cyrillic:
++ return i18n("@item Text character set", "Cyrillic");
++ break;
++ case EncodingDetector::Greek:
++ return i18n("@item Text character set", "Greek");
++ break;
++ case EncodingDetector::Hebrew:
++ return i18n("@item Text character set", "Hebrew");
++ break;
++ case EncodingDetector::Japanese:
++ return i18n("@item Text character set", "Japanese");
++ break;
++ case EncodingDetector::Turkish:
++ return i18n("@item Text character set", "Turkish");
++ break;
++ case EncodingDetector::WesternEuropean:
++ return i18n("@item Text character set", "Western European");
++ break;
++ case EncodingDetector::ChineseTraditional:
++ return i18n("@item Text character set", "Chinese Traditional");
++ break;
++ case EncodingDetector::ChineseSimplified:
++ return i18n("@item Text character set", "Chinese Simplified");
++ break;
++ case EncodingDetector::Korean:
++ return i18n("@item Text character set", "Korean");
++ break;
++ case EncodingDetector::Thai:
++ return i18n("@item Text character set", "Thai");
++ break;
++ case EncodingDetector::Unicode:
++ return i18n("@item Text character set", "Unicode");
++ break;
++ //case EncodingDetector::SemiautomaticDetection:
++ default:
++ return QString();
++
++ }
++}
++
++EncodingDetector::AutoDetectScript EncodingDetector::scriptForLanguageCode(const QString &lc)
++{
++ // It might make sense to do something special if the locale ends with
++ // ".UTF-8" or "@utf8"
++ const char *langStr = pango_script_for_lang[0].lang;
++ // There is obvious optimization potential...
++ for ( int i = 0; langStr; i++ ) {
++ langStr = pango_script_for_lang[i].lang;
++ // startsWith() works for empty strings: every string "starts with" an empty string.
++ if ( lc.startsWith( QString::fromAscii( langStr ) ) )
++ return pango_script_for_lang[i].scripts[0];
++ }
++ return None;
++}
++
++#undef DECODE_DEBUG
++
+Index: kmail/KMail.desktop
+===================================================================
+--- kmail/KMail.desktop.orig 2007-10-08 11:50:38.000000000 +0200
++++ kmail/KMail.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -47,6 +47,7 @@
+ GenericName[is]=Póstforrit
+ GenericName[it]=Programma di posta elettronica
+ GenericName[ja]=メールクライアント
++GenericName[ka]=ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ კლიენტი
+ GenericName[kk]=Ðл.пошта клиент бағдарламаÑÑ‹
+ GenericName[km]=កម្មវិធី​អ៊ីមែល
+ GenericName[lt]=Pašto klientas
+@@ -77,7 +78,8 @@
+ GenericName[th]=ไคลเà¸à¸™à¸•à¹Œà¸ˆà¸”หมายà¸à¸´à¹€à¸¥à¹‡à¸à¸—รà¸à¸™à¸´à¸à¸ªà¹Œ
+ GenericName[tr]=E-posta Ä°stemcisi
+ GenericName[uk]=Поштовий клієнт
+-GenericName[uz]=Хат-хабар клиенти
++GenericName[uz]=Xat-xabar klienti
++GenericName[uz at cyrillic]=Хат-хабар клиенти
+ GenericName[ven]=Mushumisani na poso
+ GenericName[xh]=Umxhasi Weposi
+ GenericName[zh_CN]=邮件客户程åº
+Index: kmail/snippetwidget.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kmail/snippetwidget.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,957 @@
++/***************************************************************************
++ * snippet feature from kdevelop/plugins/snippet/ *
++ * *
++ * Copyright (C) 2007 by Robert Gruber *
++ * rgruber at users.sourceforge.net *
++ * *
++ * This program is free software; you can redistribute it and/or modify *
++ * it under the terms of the GNU General Public License as published by *
++ * the Free Software Foundation; either version 2 of the License, or *
++ * (at your option) any later version. *
++ * *
++ ***************************************************************************/
++
++#include <kurl.h>
++#include <kdebug.h>
++#include <klocale.h>
++#include <qlayout.h>
++#include <kpushbutton.h>
++#include <klistview.h>
++#include <qheader.h>
++#include <klineedit.h>
++#include <ktextedit.h>
++#include <kmessagebox.h>
++#include <kconfig.h>
++#include <qtooltip.h>
++#include <kpopupmenu.h>
++#include <qregexp.h>
++#include <qinputdialog.h>
++#include <qlabel.h>
++#include <qcheckbox.h>
++#include <qwhatsthis.h>
++#include <qdragobject.h>
++#include <qtimer.h>
++#include <kcombobox.h>
++#include <kmedit.h>
++#include <kiconloader.h>
++#include <kshortcut.h>
++#include <kaction.h>
++#include <kkeybutton.h>
++
++#include "snippetdlg.h"
++#include "snippetitem.h"
++#include "snippetwidget.h"
++
++#include <cassert>
++
++SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, QWidget* parent)
++ : KListView(parent, "snippet widget"), QToolTip( viewport() ),
++ mEditor( editor ), mActionCollection( actionCollection )
++{
++ // init the QPtrList
++ _list.setAutoDelete(TRUE);
++
++ // init the KListView
++ setSorting( -1 );
++ addColumn( "" );
++ setFullWidth(true);
++ header()->hide();
++ setAcceptDrops(true);
++ setDragEnabled(true);
++ setDropVisualizer(false);
++ setRootIsDecorated(true);
++
++ //connect the signals
++ connect( this, SIGNAL( contextMenuRequested ( QListViewItem *, const QPoint & , int ) ),
++ this, SLOT( showPopupMenu(QListViewItem *, const QPoint & , int ) ) );
++
++ connect( this, SIGNAL( doubleClicked (QListViewItem *) ),
++ this, SLOT( slotEdit( QListViewItem *) ) );
++ connect( this, SIGNAL( returnPressed (QListViewItem *) ),
++ this, SLOT( slotExecuted( QListViewItem *) ) );
++
++ connect( this, SIGNAL( dropped(QDropEvent *, QListViewItem *) ),
++ this, SLOT( slotDropped(QDropEvent *, QListViewItem *) ) );
++
++ connect( editor, SIGNAL( insertSnippet() ), this, SLOT( slotExecute() ));
++
++ _cfg = 0;
++
++ QTimer::singleShot(0, this, SLOT(initConfig()));
++}
++
++SnippetWidget::~SnippetWidget()
++{
++ writeConfig();
++ delete _cfg;
++
++ /* We need to delete the child items before the parent items
++ otherwise KDevelop would crash on exiting */
++ SnippetItem * item;
++ while (_list.count() > 0) {
++ for (item=_list.first(); item; item=_list.next()) {
++ if (item->childCount() == 0)
++ _list.remove(item);
++ }
++ }
++}
++
++
++/*!
++ \fn SnippetWidget::slotAdd()
++ Opens the dialog to add a snippet
++ */
++void SnippetWidget::slotAdd()
++{
++ //kdDebug(5006) << "Ender slotAdd()" << endl;
++ SnippetDlg dlg( mActionCollection, this, "SnippetDlg");
++
++ /*check if the user clicked a SnippetGroup
++ If not, we set the group variable to the SnippetGroup
++ which the selected item is a child of*/
++ SnippetGroup * group = dynamic_cast<SnippetGroup*>(selectedItem());
++ if ( !group && selectedItem() )
++ group = dynamic_cast<SnippetGroup*>(selectedItem()->parent());
++
++ /* still no group, let's make a default one */
++ if (!group ) {
++ if ( _list.isEmpty() ) {
++ group = new SnippetGroup(this, i18n("General"), SnippetGroup::getMaxId() );
++ _list.append( group );
++ } else {
++ group = dynamic_cast<SnippetGroup*>( _list.first() );
++ }
++ }
++ assert( group );
++
++ /*fill the combobox with the names of all SnippetGroup entries*/
++ for (SnippetItem *it=_list.first(); it; it=_list.next()) {
++ if (dynamic_cast<SnippetGroup*>(it)) {
++ dlg.cbGroup->insertItem(it->getName());
++ }
++ }
++ dlg.cbGroup->setCurrentText(group->getName());
++
++ if (dlg.exec() == QDialog::Accepted) {
++ group = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
++ _list.append( makeItem( group, dlg.snippetName->text(), dlg.snippetText->text(), dlg.keyButton->shortcut() ) );
++ }
++}
++
++/*!
++ \fn SnippetWidget::makeItem( SnippetItem* parent, const QString& name, const QString& text )
++ Helper factory method.
++ */
++SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const QString& name, const QString& text, const KShortcut& shortcut )
++{
++ SnippetItem * item = new SnippetItem(parent, name, text);
++ const QString actionName = i18n("Snippet %1").arg(name);
++ const QString normalizedName = QString(actionName).replace(" ", "_");
++ if ( !mActionCollection->action(normalizedName.utf8() ) ) {
++ KAction * action = new KAction( actionName, shortcut, item,
++ SLOT( slotExecute() ), mActionCollection,
++ normalizedName.utf8() );
++ item->setAction(action);
++ connect( item, SIGNAL( execute( QListViewItem* ) ),
++ this, SLOT( slotExecuted( QListViewItem* ) ) );
++ }
++ return item;
++}
++
++/*!
++ \fn SnippetWidget::slotAddGroup()
++ Opens the didalog to add a snippet
++ */
++void SnippetWidget::slotAddGroup()
++{
++ //kdDebug(5006) << "Ender slotAddGroup()" << endl;
++ SnippetDlg dlg( mActionCollection, this, "SnippetDlg");
++ dlg.setShowShortcut( false );
++ dlg.snippetText->setEnabled(false);
++ dlg.snippetText->setText("GROUP");
++ dlg.setCaption(i18n("Add Group"));
++ dlg.cbGroup->insertItem(i18n("All"));
++ dlg.cbGroup->setCurrentText(i18n("All"));
++
++ if (dlg.exec() == QDialog::Accepted) {
++ _list.append( new SnippetGroup(this, dlg.snippetName->text(), SnippetGroup::getMaxId() ) );
++ }
++}
++
++
++/*!
++ \fn SnippetWidget::slotRemove()
++ Removes the selected snippet
++ */
++void SnippetWidget::slotRemove()
++{
++ //get current data
++ QListViewItem * item = currentItem();
++ SnippetItem *snip = dynamic_cast<SnippetItem*>( item );
++ SnippetGroup *group = dynamic_cast<SnippetGroup*>( item );
++ if (!snip)
++ return;
++
++ if (group) {
++ if (group->childCount() > 0 &&
++ KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),QString::null,KStdGuiItem::del())
++ == KMessageBox::Cancel)
++ return;
++
++ SnippetItem *it=_list.first();
++ while ( it ) {
++ if (it->getParent() == group->getId()) {
++ SnippetItem *doomed = it;
++ it = _list.next();
++ //kdDebug(5006) << "remove " << doomed->getName() << endl;
++ _list.remove(doomed);
++ } else {
++ it = _list.next();
++ }
++ }
++ }
++
++ //kdDebug(5006) << "remove " << snip->getName() << endl;
++ _list.remove(snip);
++}
++
++
++
++/*!
++ \fn SnippetWidget::slotEdit()
++ Opens the dialog of editing the selected snippet
++ */
++void SnippetWidget::slotEdit( QListViewItem* item )
++{
++ if( item == 0 ) {
++ item = currentItem();
++ }
++
++ SnippetGroup *pGroup = dynamic_cast<SnippetGroup*>(item);
++ SnippetItem *pSnippet = dynamic_cast<SnippetItem*>( item );
++ if (!pSnippet || pGroup) /*selected item must be a SnippetItem but MUST not be a SnippetGroup*/
++ return;
++
++ //init the dialog
++ SnippetDlg dlg( mActionCollection, this, "SnippetDlg");
++ dlg.snippetName->setText(pSnippet->getName());
++ dlg.snippetText->setText(pSnippet->getText());
++ dlg.keyButton->setShortcut( pSnippet->getAction()->shortcut(), false );
++ dlg.btnAdd->setText(i18n("&Apply"));
++
++ dlg.setCaption(i18n("Edit Snippet"));
++ /*fill the combobox with the names of all SnippetGroup entries*/
++ for (SnippetItem *it=_list.first(); it; it=_list.next()) {
++ if (dynamic_cast<SnippetGroup*>(it)) {
++ dlg.cbGroup->insertItem(it->getName());
++ }
++ }
++ dlg.cbGroup->setCurrentText(SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName());
++
++ if (dlg.exec() == QDialog::Accepted) {
++ //update the KListView and the SnippetItem
++ item->setText( 0, dlg.snippetName->text() );
++ pSnippet->setName( dlg.snippetName->text() );
++ pSnippet->setText( dlg.snippetText->text() );
++ pSnippet->getAction()->setShortcut( dlg.keyButton->shortcut());
++
++ /* if the user changed the parent we need to move the snippet */
++ if ( SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName() != dlg.cbGroup->currentText() ) {
++ SnippetGroup * newGroup = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
++ pSnippet->parent()->takeItem(pSnippet);
++ newGroup->insertItem(pSnippet);
++ pSnippet->resetParent();
++ }
++
++ setSelected(item, TRUE);
++ }
++}
++
++/*!
++ \fn SnippetWidget::slotEditGroup()
++ Opens the dialog of editing the selected snippet-group
++ */
++void SnippetWidget::slotEditGroup()
++{
++ //get current data
++ QListViewItem * item = currentItem();
++
++ SnippetGroup *pGroup = dynamic_cast<SnippetGroup*>( item );
++ if (!pGroup) /*selected item MUST be a SnippetGroup*/
++ return;
++
++ //init the dialog
++ SnippetDlg dlg( mActionCollection, this, "SnippetDlg" );
++ dlg.setShowShortcut( false );
++ dlg.snippetName->setText(pGroup->getName());
++ dlg.snippetText->setText(pGroup->getText());
++ dlg.btnAdd->setText(i18n("&Apply"));
++ dlg.snippetText->setEnabled(FALSE);
++ dlg.setCaption(i18n("Edit Group"));
++ dlg.cbGroup->insertItem(i18n("All"));
++
++ if (dlg.exec() == QDialog::Accepted) {
++ //update the KListView and the SnippetGroup
++ item->setText( 0, dlg.snippetName->text() );
++ pGroup->setName( dlg.snippetName->text() );
++
++ setSelected(item, TRUE);
++ }
++}
++
++void SnippetWidget::slotExecuted(QListViewItem * item)
++{
++ if( item == 0 )
++ {
++ item = currentItem();
++ }
++
++ SnippetItem *pSnippet = dynamic_cast<SnippetItem*>( item );
++ if (!pSnippet || dynamic_cast<SnippetGroup*>(item))
++ return;
++
++ //process variables if any, then insert into the active view
++ insertIntoActiveView( parseText(pSnippet->getText(), _SnippetConfig.getDelimiter()) );
++}
++
++
++/*!
++ \fn SnippetWidget::insertIntoActiveView(QString text)
++ Inserts the parameter text into the activ view
++ */
++void SnippetWidget::insertIntoActiveView( const QString &text )
++{
++ mEditor->insert( text );
++}
++
++
++/*!
++ \fn SnippetWidget::writeConfig()
++ Write the cofig file
++ */
++void SnippetWidget::writeConfig()
++{
++ if( !_cfg )
++ return;
++ _cfg->deleteGroup("SnippetPart"); //this is neccessary otherwise delete entries will stay in list until
++ //they get overwritten by a more recent entry
++ _cfg->setGroup("SnippetPart");
++
++ QString strKeyName="";
++ QString strKeyText="";
++ QString strKeyId="";
++
++ int iSnipCount = 0;
++ int iGroupCount = 0;
++
++ SnippetItem* item=_list.first();
++ while ( item != 0) {
++
++ //kdDebug(5006) << "-->ERROR " << item->getName() << endl;
++ //kdDebug(5006) << "SnippetWidget::writeConfig() " << item->getName() << endl;
++ SnippetGroup * group = dynamic_cast<SnippetGroup*>(item);
++ if (group) {
++ //kdDebug(5006) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl;
++ strKeyName=QString("snippetGroupName_%1").arg(iGroupCount);
++ strKeyId=QString("snippetGroupId_%1").arg(iGroupCount);
++
++ _cfg->writeEntry(strKeyName, group->getName());
++ _cfg->writeEntry(strKeyId, group->getId());
++
++ iGroupCount++;
++ } else if (dynamic_cast<SnippetItem*>(item)) {
++ //kdDebug(5006) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl;
++ strKeyName=QString("snippetName_%1").arg(iSnipCount);
++ strKeyText=QString("snippetText_%1").arg(iSnipCount);
++ strKeyId=QString("snippetParent_%1").arg(iSnipCount);
++
++ _cfg->writeEntry(strKeyName, item->getName());
++ _cfg->writeEntry(strKeyText, item->getText());
++ _cfg->writeEntry(strKeyId, item->getParent());
++
++ KAction * action = item->getAction();
++ assert( action );
++ const KShortcut& sc = action->shortcut();
++ if (!sc.isNull() ) {
++ _cfg->writeEntry( QString("snippetShortcut_%1").arg(iSnipCount), sc.toString() );
++ }
++ iSnipCount++;
++ } else {
++ //kdDebug(5006) << "-->ERROR " << item->getName() << endl;
++ }
++ item = _list.next();
++ }
++ _cfg->writeEntry("snippetCount", iSnipCount);
++ _cfg->writeEntry("snippetGroupCount", iGroupCount);
++
++ int iCount = 1;
++ QMap<QString, QString>::Iterator it;
++ for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values
++ if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it
++
++ strKeyName=QString("snippetSavedName_%1").arg(iCount);
++ strKeyText=QString("snippetSavedVal_%1").arg(iCount);
++
++ _cfg->writeEntry(strKeyName, it.key());
++ _cfg->writeEntry(strKeyText, it.data());
++
++ iCount++;
++ }
++ _cfg->writeEntry("snippetSavedCount", iCount-1);
++
++
++ _cfg->writeEntry( "snippetDelimiter", _SnippetConfig.getDelimiter() );
++ _cfg->writeEntry( "snippetVarInput", _SnippetConfig.getInputMethod() );
++ _cfg->writeEntry( "snippetToolTips", _SnippetConfig.useToolTips() );
++ _cfg->writeEntry( "snippetGroupAutoOpen", _SnippetConfig.getAutoOpenGroups() );
++
++ _cfg->writeEntry("snippetSingleRect", _SnippetConfig.getSingleRect() );
++ _cfg->writeEntry("snippetMultiRect", _SnippetConfig.getMultiRect() );
++
++ _cfg->sync();
++}
++
++/*!
++ \fn SnippetWidget::initConfig()
++ Initial read the cofig file
++ */
++void SnippetWidget::initConfig()
++{
++ if (_cfg == NULL)
++ _cfg = new KConfig("kmailsnippetrc", false, false);
++
++ _cfg->setGroup("SnippetPart");
++
++ QString strKeyName="";
++ QString strKeyText="";
++ QString strKeyId="";
++ SnippetItem *item;
++ SnippetGroup *group;
++
++ //kdDebug(5006) << "SnippetWidget::initConfig() " << endl;
++
++ //if entry doesn't get found, this will return -1 which we will need a bit later
++ int iCount = _cfg->readNumEntry("snippetGroupCount", -1);
++
++ for ( int i=0; i<iCount; i++) { //read the group-list
++ strKeyName=QString("snippetGroupName_%1").arg(i);
++ strKeyId=QString("snippetGroupId_%1").arg(i);
++
++ QString strNameVal="";
++ int iIdVal=-1;
++
++ strNameVal = _cfg->readEntry(strKeyName, "");
++ iIdVal = _cfg->readNumEntry(strKeyId, -1);
++ //kdDebug(5006) << "Read group " << " " << iIdVal << endl;
++
++ if (strNameVal != "" && iIdVal != -1) {
++ group = new SnippetGroup(this, strNameVal, iIdVal);
++ //kdDebug(5006) << "Created group " << group->getName() << " " << group->getId() << endl;
++ _list.append(group);
++ }
++ }
++
++ /* Check if the snippetGroupCount property has been found
++ if iCount is -1 this means, that the user has his snippets
++ stored without groups. Therefore we will call the
++ initConfigOldVersion() function below */
++ // should not happen since this function has been removed
++
++ if (iCount != -1) {
++ iCount = _cfg->readNumEntry("snippetCount", 0);
++ for ( int i=0; i<iCount; i++) { //read the snippet-list
++ strKeyName=QString("snippetName_%1").arg(i);
++ strKeyText=QString("snippetText_%1").arg(i);
++ strKeyId=QString("snippetParent_%1").arg(i);
++
++ QString strNameVal="";
++ QString strTextVal="";
++ int iParentVal = -1;
++
++ strNameVal = _cfg->readEntry(strKeyName, "");
++ strTextVal = _cfg->readEntry(strKeyText, "");
++ iParentVal = _cfg->readNumEntry(strKeyId, -1);
++ //kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl;
++
++ if (strNameVal != "" && strTextVal != "" && iParentVal != -1) {
++ KShortcut shortcut( _cfg->readEntry( QString("snippetShortcut_%1").arg(i), QString() ) );
++ item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut );
++ //kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl;
++ _list.append(item);
++ }
++ }
++ } else {
++ //kdDebug() << "iCount is not -1";
++ }
++
++ iCount = _cfg->readNumEntry("snippetSavedCount", 0);
++
++ for ( int i=1; i<=iCount; i++) { //read the saved-values and store in QMap
++ strKeyName=QString("snippetSavedName_%1").arg(i);
++ strKeyText=QString("snippetSavedVal_%1").arg(i);
++
++ QString strNameVal="";
++ QString strTextVal="";
++
++ strNameVal = _cfg->readEntry(strKeyName, "");
++ strTextVal = _cfg->readEntry(strKeyText, "");
++
++ if (strNameVal != "" && strTextVal != "") {
++ _mapSaved[strNameVal] = strTextVal;
++ }
++ }
++
++
++ _SnippetConfig.setDelimiter( _cfg->readEntry("snippetDelimiter", "$") );
++ _SnippetConfig.setInputMethod( _cfg->readNumEntry("snippetVarInput", 0) );
++ _SnippetConfig.setToolTips( _cfg->readBoolEntry("snippetToolTips", true) );
++ _SnippetConfig.setAutoOpenGroups( _cfg->readNumEntry("snippetGroupAutoOpen", 1) );
++
++ _SnippetConfig.setSingleRect( _cfg->readRectEntry("snippetSingleRect", 0L) );
++ _SnippetConfig.setMultiRect( _cfg->readRectEntry("snippetMultiRect", 0L) );
++}
++
++/*!
++ \fn SnippetWidget::maybeTip( const QPoint & p )
++ Shows the Snippet-Text as ToolTip
++ */
++void SnippetWidget::maybeTip( const QPoint & p )
++{
++ SnippetItem * item = dynamic_cast<SnippetItem*>( itemAt( p ) );
++ if (!item)
++ return;
++
++ QRect r = itemRect( item );
++
++ if (r.isValid() &&
++ _SnippetConfig.useToolTips() )
++ {
++ tip( r, item->getText() ); //show the snippet's text
++ }
++}
++
++/*!
++ \fn SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int )
++ Shows the Popup-Menu depending item is a valid pointer
++*/
++void SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int )
++{
++ KPopupMenu popup;
++
++ SnippetItem * selectedItem = static_cast<SnippetItem *>(item);
++ if ( item ) {
++ popup.insertTitle( selectedItem->getName() );
++ if (dynamic_cast<SnippetGroup*>(item)) {
++ popup.insertItem( i18n("Edit &group..."), this, SLOT( slotEditGroup() ) );
++ } else {
++ popup.insertItem( SmallIconSet("editpaste"), i18n("&Paste"), this, SLOT( slotExecuted() ) );
++ popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, SLOT( slotEdit() ) );
++ }
++ popup.insertItem( SmallIconSet("editdelete"), i18n("&Remove"), this, SLOT( slotRemove() ) );
++ popup.insertSeparator();
++ } else {
++ popup.insertTitle(i18n("Text Snippets"));
++ }
++ popup.insertItem( i18n("&Add Snippet..."), this, SLOT( slotAdd() ) );
++ popup.insertItem( i18n("Add G&roup..."), this, SLOT( slotAddGroup() ) );
++
++ popup.exec(p);
++}
++
++
++// fn SnippetWidget::parseText(QString text, QString del)
++/*!
++ This function is used to parse the given QString for variables. If found the user will be prompted
++ for a replacement value. It returns the string text with all replacements made
++ */
++QString SnippetWidget::parseText(QString text, QString del)
++{
++ QString str = text;
++ QString strName = "";
++ QString strNew = "";
++ QString strMsg="";
++ int iFound = -1;
++ int iEnd = -1;
++ QMap<QString, QString> mapVar;
++ int iInMeth = _SnippetConfig.getInputMethod();
++ QRect rSingle = _SnippetConfig.getSingleRect();
++ QRect rMulti = _SnippetConfig.getMultiRect();
++
++ do {
++ iFound = text.find(QRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this QRegExp
++ if (iFound >= 0) {
++ iEnd = text.find(del, iFound+1)+1;
++ strName = text.mid(iFound, iEnd-iFound);
++
++ if ( strName != del+del ) { //if not doubel-delimiter
++ if (iInMeth == 0) { //if input-method "single" is selected
++ if ( mapVar[strName].length() <= 0 ) { // and not already in map
++ strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName);
++ strNew = showSingleVarDialog( strName, &_mapSaved, rSingle );
++ if (strNew=="")
++ return ""; //user clicked Cancle
++ } else {
++ continue; //we have already handled this variable
++ }
++ } else {
++ strNew = ""; //for inputmode "multi" just reset new valaue
++ }
++ } else {
++ strNew = del; //if double-delimiter -> replace by single character
++ }
++
++ if (iInMeth == 0) { //if input-method "single" is selected
++ str.replace(strName, strNew);
++ }
++
++ mapVar[strName] = strNew;
++ }
++ } while (iFound != -1);
++
++ if (iInMeth == 1) { //check config, if input-method "multi" is selected
++ int w, bh, oh;
++ w = rMulti.width();
++ bh = rMulti.height();
++ oh = rMulti.top();
++ if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) { //generate and show the dialog
++ QMap<QString, QString>::Iterator it;
++ for ( it = mapVar.begin(); it != mapVar.end(); ++it ) { //walk through the map and do the replacement
++ str.replace(it.key(), it.data());
++ }
++ } else {
++ return "";
++ }
++
++ rMulti.setWidth(w); //this is a hack to save the dialog's dimensions in only one QRect
++ rMulti.setHeight(bh);
++ rMulti.setTop(oh);
++ rMulti.setLeft(0);
++ _SnippetConfig.setMultiRect(rMulti);
++ }
++
++ _SnippetConfig.setSingleRect(rSingle);
++
++ return str;
++}
++
++
++// fn SnippetWidget::showMultiVarDialog()
++/*!
++ This function constructs a dialog which contains a label and a linedit for every
++ variable that is stored in the given map except the double-delimiter entry
++ It return true if everything was ok and false if the user hit cancel
++ */
++bool SnippetWidget::showMultiVarDialog(QMap<QString, QString> * map, QMap<QString, QString> * mapSave,
++ int & iWidth, int & iBasicHeight, int & iOneHeight)
++{
++ //if no var -> no need to show
++ if (map->count() == 0)
++ return true;
++
++ //if only var is the double-delimiter -> no need to show
++ QMap<QString, QString>::Iterator it = map->begin();
++ if ( map->count() == 1 && it.data()==_SnippetConfig.getDelimiter()+_SnippetConfig.getDelimiter() )
++ return true;
++
++ QMap<QString, KTextEdit *> mapVar2Te; //this map will help keeping track which TEXTEDIT goes with which variable
++ QMap<QString, QCheckBox *> mapVar2Cb; //this map will help keeping track which CHECKBOX goes with which variable
++
++ // --BEGIN-- building a dynamic dialog
++ QDialog dlg(this);
++ dlg.setCaption(i18n("Enter Values for Variables"));
++
++ QGridLayout * layout = new QGridLayout( &dlg, 1, 1, 11, 6, "layout");
++ QGridLayout * layoutTop = new QGridLayout( 0, 1, 1, 0, 6, "layoutTop");
++ QGridLayout * layoutVar = new QGridLayout( 0, 1, 1, 0, 6, "layoutVar");
++ QGridLayout * layoutBtn = new QGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
++
++ KTextEdit *te = NULL;
++ QLabel * labTop = NULL;
++ QCheckBox * cb = NULL;
++
++ labTop = new QLabel( &dlg, "label" );
++ labTop->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0,
++ labTop->sizePolicy().hasHeightForWidth() ) );
++ labTop->setText(i18n("Enter the replacement values for these variables:"));
++ layoutTop->addWidget(labTop, 0, 0);
++ layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
++
++
++ int i = 0; //walk through the variable map and add
++ for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout
++ if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
++ continue;
++
++ cb = new QCheckBox( &dlg, "cbVar" );
++ cb->setChecked( FALSE );
++ cb->setText(it.key());
++ layoutVar->addWidget( cb, i ,0, Qt::AlignTop );
++
++ te = new KTextEdit( &dlg, "teVar" );
++ layoutVar->addWidget( te, i, 1, Qt::AlignTop );
++
++ if ((*mapSave)[it.key()].length() > 0) {
++ cb->setChecked( TRUE );
++ te->setText((*mapSave)[it.key()]);
++ }
++
++ mapVar2Te[it.key()] = te;
++ mapVar2Cb[it.key()] = cb;
++
++ QToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") );
++ QWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. "
++ "If you use the same variable later, even in another snippet, the value entered to the right "
++ "will be the default value for that variable.") );
++
++ i++;
++ }
++ layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
++
++ KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
++ btn1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0,
++ btn1->sizePolicy().hasHeightForWidth() ) );
++ layoutBtn->addWidget( btn1, 0, 0 );
++
++ KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
++ btn2->setDefault( TRUE );
++ btn2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0,
++ btn2->sizePolicy().hasHeightForWidth() ) );
++ layoutBtn->addWidget( btn2, 0, 1 );
++
++ layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
++ // --END-- building a dynamic dialog
++
++ //connect the buttons to the QDialog default slots
++ connect(btn1, SIGNAL(clicked()), &dlg, SLOT(reject()) );
++ connect(btn2, SIGNAL(clicked()), &dlg, SLOT(accept()) );
++
++ //prepare to execute the dialog
++ bool bReturn = false;
++ //resize the textedits
++ if (iWidth > 1) {
++ QRect r = dlg.geometry();
++ r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
++ r.setWidth(iWidth);
++ dlg.setGeometry(r);
++ }
++ if ( i > 0 && // only if there are any variables
++ dlg.exec() == QDialog::Accepted ) {
++
++ QMap<QString, KTextEdit *>::Iterator it2;
++ for ( it2 = mapVar2Te.begin(); it2 != mapVar2Te.end(); ++it2 ) {
++ if (it2.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
++ continue;
++ (*map)[it2.key()] = it2.data()->text(); //copy the entered values back to the given map
++
++ if (mapVar2Cb[it2.key()]->isChecked()) //if the checkbox is on; save the values for later
++ (*mapSave)[it2.key()] = it2.data()->text();
++ else
++ (*mapSave).erase(it2.key());
++ }
++ bReturn = true;
++
++ iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height();
++ iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
++ iWidth = dlg.geometry().width();
++ }
++
++ //do some cleanup
++ QMap<QString, KTextEdit *>::Iterator it1;
++ for (it1 = mapVar2Te.begin(); it1 != mapVar2Te.end(); ++it1)
++ delete it1.data();
++ mapVar2Te.clear();
++ QMap<QString, QCheckBox *>::Iterator it2;
++ for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
++ delete it2.data();
++ mapVar2Cb.clear();
++ delete layoutTop;
++ delete layoutVar;
++ delete layoutBtn;
++ delete layout;
++
++ if (i==0) //if nothing happened this means, that there are no variables to translate
++ return true; //.. so just return OK
++
++ return bReturn;
++// return true;
++}
++
++
++// fn SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * mapSave)
++/*!
++ This function constructs a dialog which contains a label and a linedit for the given variable
++ It return either the entered value or an empty string if the user hit cancel
++ */
++QString SnippetWidget::showSingleVarDialog(QString var, QMap<QString, QString> * mapSave, QRect & dlgSize)
++{
++ // --BEGIN-- building a dynamic dialog
++ QDialog dlg(this);
++ dlg.setCaption(i18n("Enter Values for Variables"));
++
++ QGridLayout * layout = new QGridLayout( &dlg, 1, 1, 11, 6, "layout");
++ QGridLayout * layoutTop = new QGridLayout( 0, 1, 1, 0, 6, "layoutTop");
++ QGridLayout * layoutVar = new QGridLayout( 0, 1, 1, 0, 6, "layoutVar");
++ QGridLayout * layoutBtn = new QGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
++
++ KTextEdit *te = NULL;
++ QLabel * labTop = NULL;
++ QCheckBox * cb = NULL;
++
++ labTop = new QLabel( &dlg, "label" );
++ layoutTop->addWidget(labTop, 0, 0);
++ labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
++ layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
++
++
++ cb = new QCheckBox( &dlg, "cbVar" );
++ cb->setChecked( FALSE );
++ cb->setText(i18n( "Make value &default" ));
++
++ te = new KTextEdit( &dlg, "teVar" );
++ layoutVar->addWidget( te, 0, 1, Qt::AlignTop);
++ layoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
++ if ((*mapSave)[var].length() > 0) {
++ cb->setChecked( TRUE );
++ te->setText((*mapSave)[var]);
++ }
++
++ QToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") );
++ QWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. "
++ "If you use the same variable later, even in another snippet, the value entered to the right "
++ "will be the default value for that variable.") );
++
++ layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
++
++ KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
++ layoutBtn->addWidget( btn1, 0, 0 );
++
++ KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
++ btn2->setDefault( TRUE );
++ layoutBtn->addWidget( btn2, 0, 1 );
++
++ layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
++ te->setFocus();
++ // --END-- building a dynamic dialog
++
++ //connect the buttons to the QDialog default slots
++ connect(btn1, SIGNAL(clicked()), &dlg, SLOT(reject()) );
++ connect(btn2, SIGNAL(clicked()), &dlg, SLOT(accept()) );
++
++ //execute the dialog
++ QString strReturn = "";
++ if (dlgSize.isValid())
++ dlg.setGeometry(dlgSize);
++ if ( dlg.exec() == QDialog::Accepted ) {
++ if (cb->isChecked()) //if the checkbox is on; save the values for later
++ (*mapSave)[var] = te->text();
++ else
++ (*mapSave).erase(var);
++
++ strReturn = te->text(); //copy the entered values back the the given map
++
++ dlgSize = dlg.geometry();
++ }
++
++ //do some cleanup
++ delete cb;
++ delete te;
++ delete labTop;
++ delete btn1;
++ delete btn2;
++ delete layoutTop;
++ delete layoutVar;
++ delete layoutBtn;
++ delete layout;
++
++ return strReturn;
++}
++
++// fn SnippetWidget::acceptDrag (QDropEvent *event) const
++/*!
++ Reimplementation from KListView.
++ Check here if the data the user is about to drop fits our restrictions.
++ We only accept dropps of plaintext, because from the dropped text
++ we will create a snippet.
++ */
++bool SnippetWidget::acceptDrag (QDropEvent *event) const
++{
++ //kdDebug(5006) << "Format: " << event->format() << "" << event->pos() << endl;
++
++ QListViewItem * item = itemAt(event->pos());
++
++ if (item &&
++ QString(event->format()).startsWith("text/plain") &&
++ static_cast<SnippetWidget *>(event->source()) != this) {
++ ///kdDebug(5006) << "returning TRUE " << endl;
++ return TRUE;
++ } else if(item &&
++ QString(event->format()).startsWith("x-kmailsnippet") &&
++ static_cast<SnippetWidget *>(event->source()) != this)
++ {
++ //kdDebug(5006) << "returning TRUE " << endl;
++ return TRUE;
++ } else {
++ //kdDebug(5006) << "returning FALSE" << endl;
++ event->acceptAction(FALSE);
++ return FALSE;
++ }
++}
++
++// fn SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *after)
++/*!
++ This slot is connected to the dropped signal.
++ If it is emitted, we need to construct a new snippet entry with
++ the data given
++ */
++void SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *)
++{
++ QListViewItem * item2 = itemAt(e->pos());
++
++ SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2);
++ if (!group)
++ group = dynamic_cast<SnippetGroup *>(item2->parent());
++
++ QCString dropped;
++ QByteArray data = e->encodedData("text/plain");
++ if ( e->provides("text/plain") && data.size()>0 ) {
++ //get the data from the event...
++ QString encData(data.data());
++ //kdDebug(5006) << "encData: " << encData << endl;
++
++ //... then fill the dialog with the given data
++ SnippetDlg dlg( mActionCollection, this, "SnippetDlg" );
++ dlg.snippetName->clear();
++ dlg.snippetText->setText(encData);
++
++ /*fill the combobox with the names of all SnippetGroup entries*/
++ for (SnippetItem *it=_list.first(); it; it=_list.next()) {
++ if (dynamic_cast<SnippetGroup*>(it)) {
++ dlg.cbGroup->insertItem(it->getName());
++ }
++ }
++ dlg.cbGroup->setCurrentText(group->getName());
++
++ if (dlg.exec() == QDialog::Accepted) {
++ /* get the group that the user selected with the combobox */
++ group = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
++ _list.append( makeItem(group, dlg.snippetName->text(), dlg.snippetText->text(), dlg.keyButton->shortcut() ) );
++ }
++ }
++}
++
++void SnippetWidget::startDrag()
++{
++ QString text = dynamic_cast<SnippetItem*>( currentItem() )->getText();
++ QTextDrag *drag = new QTextDrag(text, this);
++ drag->setSubtype("x-textsnippet");
++ drag->drag();
++}
++
++void SnippetWidget::slotExecute()
++{
++ slotExecuted(currentItem());
++}
++
++
++#include "snippetwidget.moc"
++
+Index: kmail/snippetsettings.cpp
+===================================================================
+--- kmail/snippetsettings.cpp.orig 2008-02-13 10:39:38.000000000 +0100
++++ kmail/snippetsettings.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -17,7 +17,7 @@
+ #include <qbuttongroup.h>
+
+ #include "snippetsettings.h"
+-#include "snippet_widget.h"
++#include "snippetwidget.h"
+
+
+ SnippetSettings::SnippetSettings(QWidget *parent, const char *name)
+Index: kmail/acljobs.cpp
+===================================================================
+--- kmail/acljobs.cpp.orig 2007-10-08 11:50:38.000000000 +0200
++++ kmail/acljobs.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -175,7 +175,7 @@
+ void ACLJobs::GetACLJob::slotInfoMessage( KIO::Job*, const QString& str )
+ {
+ // Parse the result
+- QStringList lst = QStringList::split( " ", str, true );
++ QStringList lst = QStringList::split( "\"", str, true );
+ while ( lst.count() >= 2 ) // we take items 2 by 2
+ {
+ QString user = lst.front(); lst.pop_front();
+Index: kmail/dcopmail.desktop
+===================================================================
+--- kmail/dcopmail.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ kmail/dcopmail.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Comment[is]=Póstforrit með DCOP viðmóti
+ Comment[it]=Programma di posta con un'interfaccia DCOP
+ Comment[ja]=DCOP インターフェース付ã®ãƒ¡ãƒ¼ãƒ«ãƒ—ãƒã‚°ãƒ©ãƒ
++Comment[ka]=სáƒáƒ¤áƒáƒ¡áƒ¢áƒ პრáƒáƒ’რáƒáƒ›áƒ DCOP ინტერფეისით
+ Comment[kk]=DCOP интерфейÑÑ‚Ñ– пошта бағдарламаÑÑ‹
+ Comment[km]=កម្មវិធី​អ៊ីមែល​ដែល​មាន​ចំណុច​ប្រទាក់ DCOP
+ Comment[lt]=Pašto programa su DCOP sąsaja
+Index: kmail/kmfoldertree.cpp
+===================================================================
+--- kmail/kmfoldertree.cpp.orig 2008-02-13 10:39:38.000000000 +0100
++++ kmail/kmfoldertree.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1540,8 +1540,8 @@
+ {
+ KMFolderImap *folder = static_cast<KMFolderImap*>( fti->folder()->storage() );
+ // if we should list all folders we limit this to the root folder
+- if ( !folder->account()->listOnlyOpenFolders() &&
+- fti->parent() )
++ if ( !folder->account() || ( !folder->account()->listOnlyOpenFolders() &&
++ fti->parent() ) )
+ return;
+ if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation )
+ {
+Index: kmail/kmail_config_security.desktop
+===================================================================
+--- kmail/kmail_config_security.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ kmail/kmail_config_security.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -39,6 +39,7 @@
+ Name[is]=Öryggi
+ Name[it]=Sicurezza
+ Name[ja]=ã‚»ã‚ュリティ
++Name[ka]=უსáƒáƒ¤áƒ თხáƒáƒ”ბáƒ
+ Name[kk]=ҚауіпÑіздік
+ Name[km]=សុវážáŸ’ážáž·áž—ាព
+ Name[lt]=Saugumas
+@@ -64,7 +65,8 @@
+ Name[tg]=ÐмниÑÑ‚
+ Name[tr]=Güvenlik
+ Name[uk]=Безпека
+-Name[uz]=ХавфÑизлик
++Name[uz]=Xavfsizlik
++Name[uz at cyrillic]=ХавфÑизлик
+ Name[zh_CN]=安全
+ Name[zh_TW]=安全性
+ Comment=Security & Privacy Settings
+@@ -92,6 +94,7 @@
+ Comment[is]=Öryggis & einkalÃfsstillingar
+ Comment[it]=Impostazioni sicurezza e privacy
+ Comment[ja]=ã‚»ã‚ュリティ & プライãƒã‚·ãƒ¼ã®è¨å®š
++Comment[ka]=უსáƒáƒ¤áƒ თხáƒáƒ”ბისრდრპირáƒáƒ“ულáƒáƒ‘ის პáƒáƒ áƒáƒ›áƒ”ტრები
+ Comment[kk]=ҚауіпÑіздігі пен ДербеÑтік параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážŸáž»ážœážáŸ’ážáž·áž—ាព & ភាព​ឯកជន
+ Comment[lt]=Saugumo ir privatumo nustatymai
+@@ -142,6 +145,7 @@
+ Keywords[is]=kmail,öryggi
+ Keywords[it]=kmail,sicurezza
+ Keywords[ja]=kmail,ã‚»ã‚ュリティ
++Keywords[ka]=kmail,უსáƒáƒ¤áƒ თხáƒáƒ”ბáƒ
+ Keywords[km]=kmail,សុវážáŸ’ážáž·áž—ាព
+ Keywords[lt]=kmail,security,saugumas
+ Keywords[mk]=kmail,security,кпошта,безбедноÑÑ‚
+@@ -164,5 +168,6 @@
+ Keywords[tg]=kmail,security,амниÑÑ‚
+ Keywords[tr]=kmail,güvenlik
+ Keywords[uk]=kmail,безпека
+-Keywords[uz]=kmail,хавфÑизлик
++Keywords[uz]=kmail,xavfsizlik
++Keywords[uz at cyrillic]=kmail,хавфÑизлик
+ Keywords[zh_CN]=kmail,security,安全
+Index: kmail/objecttreeparser.cpp
+===================================================================
+--- kmail/objecttreeparser.cpp.orig 2008-02-13 10:39:38.000000000 +0100
++++ kmail/objecttreeparser.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -2086,7 +2086,7 @@
+ url.setPath( "showAuditLog" );
+ url.addQueryItem( "log", auditLog );
+
+- return "<a href=\"" + url.htmlURL() + "\">" + i18n("Show Audit Log") + "</a>";
++ return "<a href=\"" + url.htmlURL() + "\">" + i18n("The Audit Log is a detailed error log from the gnupg backend", "Show Audit Log") + "</a>";
+ }
+
+ static QString endVerboseSigstatHeader( const PartMetaData & pmd )
+@@ -2230,11 +2230,9 @@
+ QString msgFrom( KPIM::getEmailAddress(fromAddress) );
+ QString certificate;
+ if( block.keyId.isEmpty() )
+- certificate = "certificate";
++ certificate = i18n("certificate");
+ else
+- certificate = QString("%1%2</a>")
+- .arg( startKeyHREF,
+- "certificate" );
++ certificate = startKeyHREF + i18n("certificate") + "</a>";
+ if( !blockAddrs.empty() ){
+ if( blockAddrs.grep(
+ msgFrom,
+Index: kmail/kmail_config_accounts.desktop
+===================================================================
+--- kmail/kmail_config_accounts.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ kmail/kmail_config_accounts.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -40,6 +40,7 @@
+ Name[is]=Tengingar
+ Name[it]=Account
+ Name[ja]=アカウント
++Name[ka]=áƒáƒœáƒ’áƒáƒ იშები
+ Name[kk]=Тіркелгілері
+ Name[km]=គណនី
+ Name[lt]=Paskyros
+@@ -64,7 +65,8 @@
+ Name[tg]=Қайдҳои баҳиÑобгирӣ
+ Name[tr]=Hesaplar
+ Name[uk]=Рахунки
+-Name[uz]=ҲиÑоблар
++Name[uz]=Hisoblar
++Name[uz at cyrillic]=ҲиÑоблар
+ Name[zh_CN]=账户
+ Name[zh_TW]=帳號
+ Comment=Setup for Sending and Receiving Messages
+@@ -90,6 +92,7 @@
+ Comment[is]=Uppsetning fyrir sendingu og móttöku af tölvupósti
+ Comment[it]=Impostazioni per spedire e ricevere messaggi
+ Comment[ja]=メッセージをé€å—ä¿¡ã™ã‚‹ãŸã‚ã®è¨å®š
++Comment[ka]=შეტყáƒáƒ‘ინებების გáƒáƒ’ზáƒáƒ•áƒœáƒ˜áƒ¡áƒ დრმიღების კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=Хаттарды жіберу мен қабылдауды баптау
+ Comment[km]=រៀបចំ​ដើម្បី​ផ្ញើ និង​ទទួល​សារ
+ Comment[lt]=Laiškų siuntimo ir gavimo sąranka
+@@ -137,6 +140,7 @@
+ Keywords[hu]=kmail,azonosÃtók
+ Keywords[is]=kmail,accounts,tengingar
+ Keywords[it]=kmail,account
++Keywords[ka]=kmail,áƒáƒœáƒ’áƒáƒ იშები
+ Keywords[km]=kmail,គណនី
+ Keywords[lt]=kmail,accounts,paskyros
+ Keywords[mk]=kmail,accounts,кпошта,Ñметка,Ñметки
+Index: networkstatus/networkstatus.desktop
+===================================================================
+--- networkstatus/networkstatus.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ networkstatus/networkstatus.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=Netstöðupúki
+ Name[it]=Demone dello stato della rete
+ Name[ja]=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒ‡ãƒ¼ãƒ¢ãƒ³
++Name[ka]=ქსელის მდგáƒáƒ›áƒáƒ ეáƒáƒ‘ის დემáƒáƒœáƒ˜
+ Name[kk]=Желі күйінің қызметі
+ Name[km]=ដáŸáž˜áž·áž“​ស្ážáž¶áž“ភាព​បណ្ដាញ
+ Name[ko]=ë„¤íŠ¸ì›Œí¬ ìƒíƒœ ë°ëª¬
+@@ -67,6 +68,7 @@
+ Comment[is]=Fylgist með stöðu netkorta og sendir tilkynningar til forrita sem nota netið.
+ Comment[it]=Controlla lo stato delle interfacce di rete e fornisce notifiche alle applicazioni che usano al rete.
+ Comment[ja]=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã®çŠ¶æ…‹ã‚’追跡ã—ã€ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’用ã„るアプリケーションã«é€šçŸ¥ã—ã¾ã™
++Comment[ka]=იძიებს ქსელის ინტერფეისის სტáƒáƒ¢áƒ£áƒ¡áƒ”ბს დრუზრუნველჰყáƒáƒ¤áƒ¡ ქსელის მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი პრáƒáƒ’რáƒáƒ›áƒ”ბისáƒáƒ—ვის შეტყáƒáƒ‘ინებების მიწáƒáƒ“ებáƒáƒ¡.
+ Comment[kk]=Желі интерфейÑтерінің күйін бақылап, желіні қолданатын бағдарламаларын құлақтандыру қызметі.
+ Comment[km]=ážáž¶áž˜ážŠáž¶áž“​ស្ážáž¶áž“ភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ព្រម​ទាំង​ផ្ដល់​នូវ​ការ​ជូនដំណឹង​ទៅ​កម្មវិធី ដែល​ប្រើ​បណ្ដាញ ។
+ Comment[lt]=Seka tinklo sÄ…sajų bÅ«senÄ… ir informuoja apie jas programas, naudojanÄias tinklÄ…
+Index: knode/knode_config_identity.desktop
+===================================================================
+--- knode/knode_config_identity.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ knode/knode_config_identity.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -39,6 +39,7 @@
+ Name[is]=Auðkenni
+ Name[it]=IdentitÃ
+ Name[ja]=å€‹äººæƒ…å ±
++Name[ka]=პრáƒáƒ¤áƒ˜áƒšáƒ˜
+ Name[kk]=ІÑ-әлпеті
+ Name[km]=អážáŸ’ážážŸáž‰áŸ’ញាណ
+ Name[lt]=TapatybÄ—
+@@ -63,7 +64,8 @@
+ Name[tg]=Профил
+ Name[tr]=Kimlik
+ Name[uk]=Профіль
+-Name[uz]=ШахÑиÑÑ‚
++Name[uz]=Shaxsiyat
++Name[uz at cyrillic]=ШахÑиÑÑ‚
+ Name[zh_CN]=身份
+ Name[zh_TW]=身份
+ Comment=Personal Information
+@@ -93,6 +95,7 @@
+ Comment[is]=Persónuupplýsingar
+ Comment[it]=Informazioni personali
+ Comment[ja]=個人ã®æƒ…å ±
++Comment[ka]=პირáƒáƒ“ი ინფáƒáƒ მáƒáƒªáƒ˜áƒ
+ Comment[kk]=Ð”ÐµÑ€Ð±ÐµÑ Ð¼Ó™Ð»Ñ–Ð¼ÐµÑ‚Ñ‚ÐµÑ€
+ Comment[km]=áž–áŸážáŸŒáž˜áž¶áž“​ផ្ទាល់​ážáŸ’លួន
+ Comment[lt]=AsmeninÄ— informacija
+Index: knode/knode_config_accounts.desktop
+===================================================================
+--- knode/knode_config_accounts.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ knode/knode_config_accounts.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -40,6 +40,7 @@
+ Name[is]=Tengingar
+ Name[it]=Account
+ Name[ja]=アカウント
++Name[ka]=áƒáƒœáƒ’áƒáƒ იშები
+ Name[kk]=Тіркелгілері
+ Name[km]=គណនី
+ Name[lt]=Paskyros
+@@ -64,7 +65,8 @@
+ Name[tg]=Қайдҳои баҳиÑобгирӣ
+ Name[tr]=Hesaplar
+ Name[uk]=Рахунки
+-Name[uz]=ҲиÑоблар
++Name[uz]=Hisoblar
++Name[uz at cyrillic]=ҲиÑоблар
+ Name[zh_CN]=账户
+ Name[zh_TW]=帳號
+ Comment=Setup for Newsgroup and Mail Servers
+@@ -88,6 +90,7 @@
+ Comment[is]=Uppsetning fyrir fréttahópa og póstþjóna
+ Comment[it]=Impostazioni per newsgroup e server di posta
+ Comment[ja]=ニュースグループã¨ãƒ¡ãƒ¼ãƒ«ã‚µãƒ¼ãƒã®è¨å®š
++Comment[ka]=სიáƒáƒ®áƒšáƒ”თრჯგუფებისრდრსáƒáƒ¤áƒáƒ¡áƒ¢áƒ სერვერის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=Жаңалық топтар мен Пошта Ñерверлері
+ Comment[km]=រៀបចំម៉ាស៊ីន​បម្រើ​វáŸáž‘ិកា​ពáŸážáŸŒáž˜áž¶áž“ និង​សំបុážáŸ’ážš
+ Comment[lt]=Naujienų grupių ir pašto serverių nustatymai
+Index: knode/knode_config_read_news.desktop
+===================================================================
+--- knode/knode_config_read_news.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ knode/knode_config_read_news.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -36,6 +36,7 @@
+ Name[is]=Lestur frétta
+ Name[it]=Lettura News
+ Name[ja]=ニュースをèªã‚€
++Name[ka]=სიáƒáƒ®áƒšáƒ”ების კითხვáƒ
+ Name[kk]=Жаңалықтарды оқу
+ Name[km]=អាន​ពáŸážáŸŒáž˜áž¶áž“
+ Name[lt]=Naujienų skaitymas
+@@ -59,7 +60,8 @@
+ Name[tg]=Хондани ахборот
+ Name[tr]=Haber Okuma
+ Name[uk]=Ð§Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¸Ð½
+-Name[uz]=Янгиликларни ўқиш
++Name[uz]=Yangiliklarni oʻqish
++Name[uz at cyrillic]=Янгиликларни ўқиш
+ Name[zh_CN]=阅读新闻
+ Name[zh_TW]=閱讀新èž
+
+Index: knode/knode_config_privacy.desktop
+===================================================================
+--- knode/knode_config_privacy.desktop.orig 2007-05-14 09:54:39.000000000 +0200
++++ knode/knode_config_privacy.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -35,6 +35,7 @@
+ Name[is]=Undirrita/staðfesta
+ Name[it]=Firma/verifica
+ Name[ja]=ç½²å/検証
++Name[ka]=ხელმáƒáƒ¬áƒ”რáƒ/დáƒáƒ›áƒáƒ¬áƒ›áƒ”ბáƒ
+ Name[kk]=Қолтаңбалау/ТекÑеру
+ Name[km]=ចុះហážáŸ’ážáž›áŸážáž¶/ផ្ទៀងផ្ទាážáŸ‹
+ Name[lt]=Pasirašoma/tikrinama
+@@ -81,6 +82,7 @@
+ Comment[is]=Verndaðu einkalÃfið þitt með þvà að undirrita og staðfesta sendingar
+ Comment[it]=Proteggi la tua privacy firmando e verificando i messaggi
+ Comment[ja]=投稿ã®ç½²åã¨æ¤œè¨¼ã«ã‚ˆã‚Šã‚ãªãŸã®ãƒ—ライãƒã‚·ãƒ¼ã‚’ä¿è·ã—ã¾ã™
++Comment[ka]=დáƒáƒ˜áƒªáƒáƒ•áƒ˜áƒ— თქვენი პირáƒáƒ“ულáƒáƒ‘რხელმáƒáƒ¬áƒ”რითრდრგáƒáƒœáƒ—áƒáƒ•áƒ¡áƒ”ბული სტáƒáƒ¢áƒ˜áƒ”ბის დáƒáƒ›áƒáƒ¬áƒ›áƒ”ბით
+ Comment[kk]=ЖариÑланғанды қолтаңбалап/текÑеріп қорғану
+ Comment[km]=ការពារ​ភាព​ឯកជន​របស់​អ្នក​ដោយ​ចុះហážáŸ’ážáž›áŸážáž¶ និង​​ផ្ទៀងផ្ទាážáŸ‹â€‹áž€áž¶ážšâ€‹áž”្រកាស
+ Comment[lt]=Saugokite savo privatumą pasirašydami ir patikrindami skelbimus
+Index: knode/knode_config_cleanup.desktop
+===================================================================
+--- knode/knode_config_cleanup.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ knode/knode_config_cleanup.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -36,6 +36,7 @@
+ Name[is]=Hreinsun
+ Name[it]=Pulizia
+ Name[ja]=æ•´ç†
++Name[ka]=გáƒáƒ¬áƒ›áƒ”ნდáƒ
+ Name[kk]=Тазалау
+ Name[km]=សម្អាáž
+ Name[lt]=IÅ¡valymas
+@@ -85,6 +86,7 @@
+ Comment[is]=Varðveita diskpláss
+ Comment[it]=Risparmia lo spazio su disco
+ Comment[ja]=ディスクスペースをç¶æŒ
++Comment[ka]=სივრცის შენáƒáƒ®áƒ•áƒ დისკზე
+ Comment[kk]=ДиÑкідегі орынды үнемдеу
+ Comment[km]=បង្ការ​ទំហំ​ážáž¶ážŸ
+ Comment[lt]=Disko erdvės išsaugojimas
+Index: knode/knode_config_appearance.desktop
+===================================================================
+--- knode/knode_config_appearance.desktop.orig 2008-02-13 10:39:38.000000000 +0100
++++ knode/knode_config_appearance.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -40,6 +40,7 @@
+ Name[is]=Útlit
+ Name[it]=Aspetto
+ Name[ja]=外観
++Name[ka]=იერსáƒáƒ®áƒ”
+ Name[kk]=Сыртқы көрініÑÑ–
+ Name[km]=រូបរាង
+ Name[ko]=모양
+@@ -66,7 +67,8 @@
+ Name[tg]=Ðамуди зоҳирӣ
+ Name[tr]=Görünüm
+ Name[uk]=ВиглÑд
+-Name[uz]=Кўриниши
++Name[uz]=Koʻrinishi
++Name[uz at cyrillic]=Кўриниши
+ Name[zh_CN]=外观
+ Comment=Customize Visual Appearance
+ Comment[af]=Pasmaak die visuele voorkoms
+@@ -92,6 +94,7 @@
+ Comment[is]=Stilla útlit
+ Comment[it]=Personalizza l'aspetto
+ Comment[ja]=外観をカスタマイズ
++Comment[ka]=ვიზუáƒáƒšáƒ£áƒ ი იერსáƒáƒ®áƒ˜áƒ¡ დáƒáƒ§áƒ”ნებáƒ
+ Comment[kk]=Сыртқы көрініÑін ыңғайлау
+ Comment[km]=ប្ដូរ​រូបរាង​មើល​ឃើញ​ážáž¶áž˜â€‹áž”ំណង
+ Comment[lt]=Derinti vizualinę išvaizdą
+Index: knode/knode_config_post_news.desktop
+===================================================================
+--- knode/knode_config_post_news.desktop.orig 2007-05-14 09:54:39.000000000 +0200
++++ knode/knode_config_post_news.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -34,6 +34,7 @@
+ Name[is]=Senda fréttir
+ Name[it]=Invio news
+ Name[ja]=ニュースを投稿
++Name[ka]=სიáƒáƒ®áƒšáƒ”ების გáƒáƒœáƒ—áƒáƒ•áƒ¡áƒ”ბáƒ
+ Name[kk]=ЖариÑлау
+ Name[km]=ប្រកាស​ពáŸážáŸŒáž˜áž¶áž“​
+ Name[lt]=Naujienų skelbimas
+Index: knode/KNode.desktop
+===================================================================
+--- knode/KNode.desktop.orig 2007-10-08 11:50:41.000000000 +0200
++++ knode/KNode.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -45,6 +45,7 @@
+ GenericName[is]=Fréttaforrit
+ GenericName[it]=Lettore newsgroup
+ GenericName[ja]=ニュースリーダー
++GenericName[ka]=სიáƒáƒ®áƒšáƒ”ების წáƒáƒ›áƒ™áƒ˜áƒ—ხველი
+ GenericName[kk]=Жаңалықтарды оқу құралы
+ GenericName[km]=កម្មវិធី​អាន​ពáŸážáŸŒáž˜áž¶áž“
+ GenericName[lt]=Naujienų skaityklė
+Index: kioslaves/imap4/imapparser.cc
+===================================================================
+--- kioslaves/imap4/imapparser.cc.orig 2008-02-13 10:39:38.000000000 +0100
++++ kioslaves/imap4/imapparser.cc 2008-06-29 20:10:36.000000000 +0200
+@@ -280,7 +280,7 @@
+ while ( true )
+ {
+ //read the next line
+- while (parseLoop() == 0);
++ while (parseLoop() == 0) ;
+ if ( cmd->isComplete() ) break;
+
+ if (!continuation.isEmpty())
+@@ -895,6 +895,8 @@
+
+ void imapParser::parseAddressList (parseString & inWords, QPtrList<mailAddress>& list)
+ {
++ if (inWords.isEmpty())
++ return;
+ if (inWords[0] != '(')
+ {
+ parseOneWordC (inWords); // parse NIL
+@@ -915,7 +917,7 @@
+ }
+ }
+
+- if (inWords[0] == ')')
++ if (!inWords.isEmpty() && inWords[0] == ')')
+ inWords.pos++;
+ skipWS (inWords);
+ }
+@@ -931,7 +933,7 @@
+ retVal.setUser(parseLiteralC(inWords));
+ retVal.setHost(parseLiteralC(inWords));
+
+- if (inWords[0] == ')')
++ if (!inWords.isEmpty() && inWords[0] == ')')
+ inWords.pos++;
+ skipWS (inWords);
+
+@@ -1004,7 +1006,7 @@
+ parseLiteralC (inWords);
+ }
+
+- if (inWords[0] == ')')
++ if (!inWords.isEmpty() && inWords[0] == ')')
+ inWords.pos++;
+ skipWS (inWords);
+
+@@ -1531,7 +1533,7 @@
+ parseBodyStructure (inWords, section, envelope);
+ QByteArray data;
+ QDataStream stream( data, IO_WriteOnly );
+- body->serialize(stream);
++ if (body) body->serialize(stream);
+ parseRelay(data);
+
+ delete body;
+@@ -1613,7 +1615,7 @@
+ parseLiteralC(inWords);
+ }
+
+- if (inWords[0] != ')')
++ if (inWords.isEmpty() || inWords[0] != ')')
+ return;
+ inWords.pos++;
+ skipWS (inWords);
+@@ -1906,7 +1908,7 @@
+
+ QCString imapParser::parseLiteralC(parseString & inWords, bool relay, bool stopAtBracket, int *outlen) {
+
+- if (inWords[0] == '{')
++ if (!inWords.isEmpty() && inWords[0] == '{')
+ {
+ QCString retVal;
+ ulong runLen = inWords.find ('}', 1);
+Index: kioslaves/imap4/imap4.cc
+===================================================================
+--- kioslaves/imap4/imap4.cc.orig 2008-02-13 10:39:38.000000000 +0100
++++ kioslaves/imap4/imap4.cc 2008-06-29 20:10:36.000000000 +0200
+@@ -313,7 +313,7 @@
+ cmd = sendCommand (imapCommand::clientFetch (aSequence, mySection));
+ do
+ {
+- while (!parseLoop ());
++ while (!parseLoop ()) ;
+ }
+ while (!cmd->isComplete ());
+ completeQueue.removeRef (cmd);
+@@ -332,7 +332,7 @@
+ aUpper = aSection.upper();
+ do
+ {
+- while (!(res = parseLoop()));
++ while (!(res = parseLoop())) ;
+ if (res == -1) break;
+
+ mailHeader *lastone = 0;
+@@ -595,7 +595,7 @@
+ imapCache *cache;
+ do
+ {
+- while (!parseLoop ());
++ while (!parseLoop ()) ;
+
+ cache = getLastHandled ();
+
+@@ -824,7 +824,7 @@
+
+ imapCommand *cmd =
+ sendCommand (imapCommand::clientAppend (aBox, aSection, length));
+- while (!parseLoop ());
++ while (!parseLoop ()) ;
+
+ // see if server is waiting
+ if (!cmd->isComplete () && !getContinuation ().isEmpty ())
+@@ -1493,10 +1493,10 @@
+ }
+ // Returning information to the application from a special() command isn't easy.
+ // I'm reusing the infoMessage trick seen above (for capabilities), but this
+- // limits me to a string instead of a stringlist. I'm using space as separator,
+- // since I don't think it can be used in login names.
++ // limits me to a string instead of a stringlist. Using DQUOTE as separator,
++ // because it's forbidden in userids by rfc3501
+ kdDebug(7116) << getResults() << endl;
+- infoMessage(getResults().join( " " ));
++ infoMessage(getResults().join( "\"" ));
+ finished();
+ break;
+ }
+@@ -1603,7 +1603,7 @@
+ if ( type == 'E' ) {
+ kdDebug(7116) << "IMAP4Protocol::specialCustomCommand: extended mode" << endl;
+ imapCommand *cmd = sendCommand (imapCommand::clientCustom( command, QString() ));
+- while ( !parseLoop () );
++ while ( !parseLoop () ) ;
+
+ // see if server is waiting
+ if (!cmd->isComplete () && !getContinuation ().isEmpty ())
+@@ -1626,7 +1626,7 @@
+
+ do
+ {
+- while (!parseLoop ());
++ while (!parseLoop ()) ;
+ }
+ while (!cmd->isComplete ());
+
+@@ -2032,7 +2032,7 @@
+ imapCommand *cmd;
+
+ unhandled.clear ();
+- if (!alreadyConnected) while (!parseLoop ()); //get greeting
++ if (!alreadyConnected) while (!parseLoop ()) ; //get greeting
+ QString greeting;
+ if (!unhandled.isEmpty()) greeting = unhandled.first().stripWhiteSpace();
+ unhandled.clear (); //get rid of it
+Index: kioslaves/sieve/sieve.cpp
+===================================================================
+--- kioslaves/sieve/sieve.cpp.orig 2008-02-13 10:39:38.000000000 +0100
++++ kioslaves/sieve/sieve.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -17,7 +17,7 @@
+ /**
+ * Portions adapted from the SMTP ioslave.
+ * Copyright (c) 2000, 2001 Alex Zepeda <jazepeda at pacbell.net>
+- * Copyright (c) 2001 Michael Häckel <Michael at Haeckel.Net>
++ * Copyright (c) 2001 Michael Häckel <Michael at Haeckel.Net>
+ * All rights reserved.
+ *
+ * Policy: the function where the error occurs calls error(). A result of
+@@ -41,6 +41,7 @@
+ #include <kglobal.h>
+
+ #include <qcstring.h>
++#include <qregexp.h>
+
+ #include <cstdlib>
+ using std::exit;
+@@ -252,6 +253,7 @@
+ ksDebug() << "Connected to Sieve server: " << r.getVal() << endl;
+ ret = true;
+ setMetaData("implementation", r.getVal());
++ m_implementation = r.getVal();
+ }
+
+ } else if (r.getKey() == "SASL") {
+@@ -357,7 +359,7 @@
+ if (retval == 1) {
+ ksDebug() << "TLS enabled successfully." << endl;
+ // reparse capabilities:
+- parseCapabilities(false);
++ parseCapabilities( requestCapabilitiesAfterStartTLS() );
+ } else {
+ ksDebug() << "TLS initiation failed, code " << retval << endl;
+ disconnect(true);
+@@ -393,8 +395,11 @@
+ if (!forcibly) {
+ sendData("LOGOUT");
+
+- if (!operationSuccessful())
+- ksDebug() << "Server did not logout cleanly." << endl;
++ // This crashes under certain conditions as described in
++ // http://intevation.de/roundup/kolab/issue2442
++ // Fixing KIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support.
++ //if (!operationSuccessful())
++ // ksDebug() << "Server did not logout cleanly." << endl;
+ }
+
+ closeDescriptor();
+@@ -1188,7 +1193,10 @@
+ {
+ // expecting {quantity}
+ start = 0;
+- end = interpret.find('}', start + 1)-1;
++ end = interpret.find("+}", start + 1);
++ // some older versions of Cyrus enclose the literal size just in { } instead of { +}
++ if ( end == -1 )
++ end = interpret.find('}', start + 1);
+
+ bool ok = false;
+ r.setQuantity(interpret.mid(start + 1, end - start - 1).toUInt( &ok ));
+@@ -1270,3 +1278,21 @@
+
+ return OTHER;
+ }
++
++bool kio_sieveProtocol::requestCapabilitiesAfterStartTLS() const
++{
++ // Cyrus didn't send CAPABILITIES after STARTTLS until 2.3.11, which is
++ // not standard conform, but we need to support that anyway.
++ // m_implementation looks like this 'Cyrus timsieved v2.2.12' for Cyrus btw.
++ QRegExp regExp( "Cyrus\\stimsieved\\sv(\\d+)\\.(\\d+)\\.(\\d+)", false );
++ if ( regExp.search( m_implementation ) >= 0 ) {
++ const int major = regExp.cap( 1 ).toInt();
++ const int minor = regExp.cap( 2 ).toInt();
++ const int patch = regExp.cap( 3 ).toInt();
++ if ( major < 2 || (major == 2 && (minor < 3 || (major == 3 && patch < 11))) ) {
++ ksDebug() << k_funcinfo << "Enabling compat mode for Cyrus < 2.3.11" << endl;
++ return true;
++ }
++ }
++ return false;
++}
+Index: kioslaves/sieve/sieve.h
+===================================================================
+--- kioslaves/sieve/sieve.h.orig 2005-09-10 10:24:05.000000000 +0200
++++ kioslaves/sieve/sieve.h 2008-06-29 20:10:36.000000000 +0200
+@@ -122,6 +122,11 @@
+ QString m_sPass;
+ QString m_sAuth;
+ bool m_shouldBeConnected;
++
++private:
++ bool requestCapabilitiesAfterStartTLS() const;
++
++ QString m_implementation;
+ };
+
+ #endif
+Index: kioslaves/sieve/sieve.protocol
+===================================================================
+--- kioslaves/sieve/sieve.protocol.orig 2007-10-08 11:50:42.000000000 +0200
++++ kioslaves/sieve/sieve.protocol 2008-06-29 20:10:36.000000000 +0200
+@@ -30,6 +30,7 @@
+ Description[is]=Ioslave fyrir Sieve tölvupóstsÃu samskiptaregluna
+ Description[it]=Un ioslave per il protocollo di filtraggio posta Sieve
+ Description[ja]=Sieve メールフィルタプãƒãƒˆã‚³ãƒ«ç”¨ ioslave
++Description[ka]=Sieve ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ ფილტრის შეტáƒáƒœáƒ-გáƒáƒ›áƒáƒ¢áƒáƒœáƒ˜áƒ¡ გáƒáƒœáƒáƒ¬áƒ”სი
+ Description[kk]=Sieve поштаны Ñүзгілеу протоколының ioslave модулі
+ Description[km]=ioslave សម្រាប់​ពិធីការ​ážáŸ’រង​សំបុážáŸ’ážš Sieve
+ Description[ms]=Hamba io untuk protokol tapisan mel saringan
+Index: doc/kaddressbook/index.docbook
+===================================================================
+--- doc/kaddressbook/index.docbook.orig 2005-09-10 10:24:11.000000000 +0200
++++ doc/kaddressbook/index.docbook 2008-06-29 20:10:36.000000000 +0200
+@@ -1134,6 +1134,34 @@
+ <userinput><option>--help-qt</option></userinput>.</para>
+ </chapter>
+
++<chapter id="configure-non-gui-options">
++<title>Options Without a User Interface Representation</title>
++<para>
++Apart from the options presented in the configuration dialog, some options
++can only be set directly in the configuration file ($KDEHOME/share/config/kaddressbookrc)
++or through KIOSK.
++</para>
++
++<variablelist>
++
++<varlistentry>
++<term><guilabel>ContactListAboveExtensions</guilabel></term>
++<listitem>
++<para>
++If enabled, extensions (e.g. the distribution list editor) are shown below the contact list,
++not in an separate column. By default, this option is disabled.
++
++To enable this option, add a line reading (under [MainWindow] section):
++</para>
++<programlisting>ContactListAboveExtensions=true
++</programlisting>
++</listitem>
++</varlistentry>
++
++</variablelist>
++
++</chapter>
++
+ <chapter id="credits">
+ <title>Credits and License</title>
+
+Index: kalarm/alarmevent.cpp
+===================================================================
+--- kalarm/alarmevent.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/alarmevent.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * alarmevent.cpp - represents calendar alarms and events
+ * Program: kalarm
+- * Copyright © 2001-2008 by David Jarvie <software at astrojar.org.uk>
++ * Copyright © 2001-2008 by David Jarvie <djarvie at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -822,25 +822,6 @@
+ mUpdated = false;
+ }
+
+-/******************************************************************************
+- * Initialise a command KAEvent.
+- */
+-void KAEvent::setCommand(const QDate& d, const QString& command, int lateCancel, int flags, const QString& logfile)
+-{
+- if (!logfile.isEmpty())
+- flags &= ~EXEC_IN_XTERM;
+- set(d, command, QColor(), QColor(), QFont(), COMMAND, lateCancel, flags | ANY_TIME);
+- mLogFile = logfile;
+-}
+-
+-void KAEvent::setCommand(const QDateTime& dt, const QString& command, int lateCancel, int flags, const QString& logfile)
+-{
+- if (!logfile.isEmpty())
+- flags &= ~EXEC_IN_XTERM;
+- set(dt, command, QColor(), QColor(), QFont(), COMMAND, lateCancel, flags);
+- mLogFile = logfile;
+-}
+-
+ void KAEvent::setLogFile(const QString& logfile)
+ {
+ mLogFile = logfile;
+@@ -848,29 +829,6 @@
+ mCommandXterm = false;
+ }
+
+-/******************************************************************************
+- * Initialise an email KAEvent.
+- */
+-void KAEvent::setEmail(const QDate& d, uint from, const EmailAddressList& addresses, const QString& subject,
+- const QString& message, const QStringList& attachments, int lateCancel, int flags)
+-{
+- set(d, message, QColor(), QColor(), QFont(), EMAIL, lateCancel, flags | ANY_TIME);
+- mEmailFromIdentity = from;
+- mEmailAddresses = addresses;
+- mEmailSubject = subject;
+- mEmailAttachments = attachments;
+-}
+-
+-void KAEvent::setEmail(const QDateTime& dt, uint from, const EmailAddressList& addresses, const QString& subject,
+- const QString& message, const QStringList& attachments, int lateCancel, int flags)
+-{
+- set(dt, message, QColor(), QColor(), QFont(), EMAIL, lateCancel, flags);
+- mEmailFromIdentity = from;
+- mEmailAddresses = addresses;
+- mEmailSubject = subject;
+- mEmailAttachments = attachments;
+-}
+-
+ void KAEvent::setEmail(uint from, const EmailAddressList& addresses, const QString& subject, const QStringList& attachments)
+ {
+ mEmailFromIdentity = from;
+Index: kalarm/templatemenuaction.cpp
+===================================================================
+--- kalarm/templatemenuaction.cpp.orig 2005-09-10 10:24:14.000000000 +0200
++++ kalarm/templatemenuaction.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * templatemenuaction.cpp - menu action to select a template
+ * Program: kalarm
+- * Copyright (C) 2005 by David Jarvie <software at astrojar.org.uk>
++ * Copyright © 2005,2008 by David Jarvie <djarvie at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -41,8 +41,8 @@
+ }
+
+ /******************************************************************************
+-* Called when the New From Template action is clicked.
+-* Creates a popup menu listing all alarm templates.
++* Called when the New From Template action is clicked.
++* Creates a popup menu listing all alarm templates, in sorted name order.
+ */
+ void TemplateMenuAction::slotInitMenu()
+ {
+@@ -50,12 +50,18 @@
+ menu->clear();
+ mOriginalTexts.clear();
+ QValueList<KAEvent> templates = KAlarm::templateList();
+- for (QValueList<KAEvent>::Iterator it = templates.begin(); it != templates.end(); ++it)
++ for (QValueList<KAEvent>::ConstIterator it = templates.constBegin(); it != templates.constEnd(); ++it)
+ {
+ QString name = (*it).templateName();
+- menu->insertItem(name);
+- mOriginalTexts += name;
++ // Insert the template in sorted order
++ QStringList::Iterator tit;
++ for (tit = mOriginalTexts.begin();
++ tit != mOriginalTexts.end() && QString::localeAwareCompare(name, *tit) > 0;
++ ++tit);
++ mOriginalTexts.insert(tit, name);
+ }
++ for (QStringList::ConstIterator tit = mOriginalTexts.constBegin(); tit != mOriginalTexts.constEnd(); ++tit)
++ menu->insertItem(*tit);
+ }
+
+ /******************************************************************************
+Index: kalarm/editdlg.cpp
+===================================================================
+--- kalarm/editdlg.cpp.orig 2008-02-13 14:20:14.000000000 +0100
++++ kalarm/editdlg.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -717,8 +717,8 @@
+ else
+ {
+ mExpiredRecurrence = recurs && event->mainExpired();
+- mTimeWidget->setDateTime(!event->mainExpired() ? event->mainDateTime()
+- : recurs ? DateTime() : event->deferDateTime());
++ mTimeWidget->setDateTime(recurs || event->uidStatus() == KAEvent::EXPIRED ? event->startDateTime()
++ : event->mainExpired() ? event->deferDateTime() : event->mainDateTime());
+ }
+ }
+
+@@ -759,7 +759,7 @@
+ mReminder->enableOnceOnly(event->recurs());
+ if (mSpecialActionsButton)
+ mSpecialActionsButton->setActions(event->preAction(), event->postAction());
+- mRecurrenceEdit->set(*event); // must be called after mTimeWidget is set up, to ensure correct date-only enabling
++ mRecurrenceEdit->set(*event, (mTemplate || event->isTemplate())); // must be called after mTimeWidget is set up, to ensure correct date-only enabling
+ mTabs->setTabLabel(mTabs->page(mRecurPageIndex), recurText(*event));
+ SoundPicker::Type soundType = event->speak() ? SoundPicker::SPEAK
+ : event->beep() ? SoundPicker::BEEP
+@@ -1403,7 +1403,6 @@
+ int reminder = mReminder->minutes();
+ if (reminder && !mReminder->isOnceOnly())
+ {
+- getEvent(recurEvent); // this may adjust mAlarmDateTime
+ mRecurrenceEdit->updateEvent(recurEvent, false);
+ longestRecurInterval = recurEvent.longestRecurrenceInterval();
+ if (longestRecurInterval && reminder >= longestRecurInterval)
+@@ -1419,11 +1418,11 @@
+ {
+ if (longestRecurInterval < 0)
+ {
+- getEvent(recurEvent); // this may adjust mAlarmDateTime
+ mRecurrenceEdit->updateEvent(recurEvent, false);
+ longestRecurInterval = recurEvent.longestRecurrenceInterval();
+ }
+- if (recurEvent.repeatInterval() * recurEvent.repeatCount() >= longestRecurInterval - reminder)
++ if (longestRecurInterval > 0
++ && recurEvent.repeatInterval() * recurEvent.repeatCount() >= longestRecurInterval - reminder)
+ {
+ KMessageBox::sorry(this, i18n("The duration of a repetition within the recurrence must be less than the recurrence interval minus any reminder period"));
+ mRecurrenceEdit->activateSubRepetition(); // display the alarm repetition dialog again
+Index: kalarm/fontcolour.h
+===================================================================
+--- kalarm/fontcolour.h.orig 2007-05-14 09:54:42.000000000 +0200
++++ kalarm/fontcolour.h 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * fontcolour.h - font and colour chooser widget
+ * Program: kalarm
+- * Copyright © 2001,2003 by David Jarvie <software at astrojar.org.uk>
++ * Copyright © 2001,2003,2008 by David Jarvie <djarvie at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -57,6 +57,7 @@
+ void setSampleText(const QString& text);
+ bool isReadOnly() const { return mReadOnly; }
+ void setReadOnly(bool);
++ virtual bool eventFilter(QObject*, QEvent*);
+
+ private slots:
+ void setSampleColour();
+Index: kalarm/templatedlg.cpp
+===================================================================
+--- kalarm/templatedlg.cpp.orig 2007-01-15 12:28:51.000000000 +0100
++++ kalarm/templatedlg.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -59,26 +59,22 @@
+
+ layout = new QVBoxLayout(topLayout);
+ QPushButton* button = new QPushButton(i18n("&New..."), topWidget);
+- button->setFixedSize(button->sizeHint());
+ connect(button, SIGNAL(clicked()), SLOT(slotNew()));
+ QWhatsThis::add(button, i18n("Create a new alarm template"));
+ layout->addWidget(button);
+
+ mEditButton = new QPushButton(i18n("&Edit..."), topWidget);
+- mEditButton->setFixedSize(mEditButton->sizeHint());
+ connect(mEditButton, SIGNAL(clicked()), SLOT(slotEdit()));
+ QWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template"));
+ layout->addWidget(mEditButton);
+
+ mCopyButton = new QPushButton(i18n("Co&py"), topWidget);
+- mCopyButton->setFixedSize(mCopyButton->sizeHint());
+ connect(mCopyButton, SIGNAL(clicked()), SLOT(slotCopy()));
+ QWhatsThis::add(mCopyButton,
+ i18n("Create a new alarm template based on a copy of the currently highlighted template"));
+ layout->addWidget(mCopyButton);
+
+ mDeleteButton = new QPushButton(i18n("&Delete"), topWidget);
+- mDeleteButton->setFixedSize(mDeleteButton->sizeHint());
+ connect(mDeleteButton, SIGNAL(clicked()), SLOT(slotDelete()));
+ QWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template"));
+ layout->addWidget(mDeleteButton);
+Index: kalarm/alarmevent.h
+===================================================================
+--- kalarm/alarmevent.h.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/alarmevent.h 2008-06-29 20:10:36.000000000 +0200
+@@ -317,23 +317,7 @@
+ ~KAEvent() { delete mRecurrence; }
+ KAEvent& operator=(const KAEvent& e) { if (&e != this) copy(e); return *this; }
+ void set(const KCal::Event&);
+- void set(const QDate& d, const QString& message, const QColor& bg, const QColor& fg, const QFont& f, Action action, int lateCancel, int flags)
+- { set(d, message, bg, fg, f, action, lateCancel, flags | ANY_TIME); }
+ void set(const QDateTime&, const QString& message, const QColor& bg, const QColor& fg, const QFont&, Action, int lateCancel, int flags);
+- void setMessage(const QDate& d, const QString& message, const QColor& bg, const QColor& fg, const QFont& f, int lateCancel, int flags)
+- { set(d, message, bg, fg, f, MESSAGE, lateCancel, flags | ANY_TIME); }
+- void setMessage(const QDateTime& dt, const QString& message, const QColor& bg, const QColor& fg, const QFont& f, int lateCancel, int flags)
+- { set(dt, message, bg, fg, f, MESSAGE, lateCancel, flags); }
+- void setFileName(const QDate& d, const QString& filename, const QColor& bg, const QColor& fg, const QFont& f, int lateCancel, int flags)
+- { set(d, filename, bg, fg, f, FILE, lateCancel, flags | ANY_TIME); }
+- void setFileName(const QDateTime& dt, const QString& filename, const QColor& bg, const QColor& fg, const QFont& f, int lateCancel, int flags)
+- { set(dt, filename, bg, fg, f, FILE, lateCancel, flags); }
+- void setCommand(const QDate&, const QString& command, int lateCancel, int flags, const QString& logfile = QString::null);
+- void setCommand(const QDateTime&, const QString& command, int lateCancel, int flags, const QString& logfile = QString::null);
+- void setEmail(const QDate&, uint from, const EmailAddressList&, const QString& subject,
+- const QString& message, const QStringList& attachments, int lateCancel, int flags);
+- void setEmail(const QDateTime&, uint from, const EmailAddressList&, const QString& subject,
+- const QString& message, const QStringList& attachments, int lateCancel, int flags);
+ void setEmail(uint from, const EmailAddressList&, const QString& subject, const QStringList& attachments);
+ void setAudioFile(const QString& filename, float volume, float fadeVolume, int fadeSeconds);
+ void setTemplate(const QString& name, int afterTime = -1) { mTemplateName = name; mTemplateAfterTime = afterTime; mUpdated = true; }
+Index: kalarm/kalarm.h
+===================================================================
+--- kalarm/kalarm.h.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/kalarm.h 2008-06-29 20:10:36.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include <config.h>
+ #endif
+
+-#define KALARM_VERSION "1.5.1"
++#define KALARM_VERSION "1.5.3"
+ #define KALARM_NAME "KAlarm"
+
+ #include <kdeversion.h>
+Index: kalarm/mainwindow.cpp
+===================================================================
+--- kalarm/mainwindow.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/mainwindow.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -253,7 +253,7 @@
+ */
+ void MainWindow::closeAll()
+ {
+- while (mWindowList.first())
++ while (!mWindowList.isEmpty())
+ delete mWindowList.first(); // N.B. the destructor removes the window from the list
+ }
+
+Index: kalarm/sounddlg.h
+===================================================================
+--- kalarm/sounddlg.h.orig 2007-10-08 11:50:44.000000000 +0200
++++ kalarm/sounddlg.h 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * sounddlg.h - sound file selection and configuration dialog
+ * Program: kalarm
+- * Copyright © 2005,2007 by David Jarvie <software at astrojar.org.uk>
++ * Copyright © 2005,2007,2008 by David Jarvie <djarvie at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -91,7 +91,6 @@
+ KDE::PlayObject* mPlayObject;
+ QTimer* mPlayTimer; // timer for playing the sound file
+ QString mLocalAudioFile; // local copy of audio file
+- QTime mAudioFileStart; // time when audio file loading started, or when play started
+ bool mPlayStarted; // the sound file has started playing
+ };
+
+Index: kalarm/kalarmd/kalarmd.desktop
+===================================================================
+--- kalarm/kalarmd/kalarmd.desktop.orig 2008-02-13 10:39:41.000000000 +0100
++++ kalarm/kalarmd/kalarmd.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -24,6 +24,7 @@
+ Name[is]=KAlarm þjónn
+ Name[it]=Demone degli avvisi
+ Name[ja]=KAlarm デーモン
++Name[ka]=KAlarm დემáƒáƒœáƒ˜
+ Name[kk]=KAlarm қызметі
+ Name[km]=ដáŸáž˜áž·áž“ KAlarm
+ Name[lt]=KAlarm tarnyba
+@@ -52,3 +53,4 @@
+ Type=Application
+ Terminal=false
+ X-DCOP-ServiceType=Unique
++NoDisplay=true
+Index: kalarm/kalarmd/kalarmd.autostart.desktop
+===================================================================
+--- kalarm/kalarmd/kalarmd.autostart.desktop.orig 2008-02-13 10:39:41.000000000 +0100
++++ kalarm/kalarmd/kalarmd.autostart.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -24,6 +24,7 @@
+ Name[is]=KAlarm þjónn
+ Name[it]=Demone degli avvisi
+ Name[ja]=KAlarm デーモン
++Name[ka]=KAlarm დემáƒáƒœáƒ˜
+ Name[kk]=KAlarm қызметі
+ Name[km]=ដáŸáž˜áž·áž“ KAlarm
+ Name[lt]=KAlarm tarnyba
+@@ -71,6 +72,7 @@
+ Comment[is]=Ræsa KAlarm áminningaþjónn sjálfkrafa við byrjun setu
+ Comment[it]=Avvio automatico del demone degli avvisi
+ Comment[ja]=KAlarm アラームデーモンã®ãƒã‚°ã‚¤ãƒ³æ™‚ã®è‡ªå‹•èµ·å‹•
++Comment[ka]=KAlarm მáƒáƒ¦áƒ•áƒ˜áƒ«áƒáƒ áƒáƒ¡ დემáƒáƒœáƒ˜áƒ¡ áƒáƒ•áƒ¢áƒáƒ“áƒáƒ¬áƒ§áƒ”ბრშესვლისáƒáƒ¡
+ Comment[kk]=KAlarm қызметі жүйеге кіргенде жегіледі
+ Comment[km]=ចាប់ផ្ដើម​ដáŸáž˜áž·áž“​រោទáŸâ€‹ážšáž”ស់ KAlarm áž–áŸáž›â€‹áž…ូល
+ Comment[lt]=KOrganizer/KAlarm priminimų tarnybos automatinis paleidimas prisiregistruojant
+Index: kalarm/Changelog
+===================================================================
+--- kalarm/Changelog.orig 2008-02-13 14:20:14.000000000 +0100
++++ kalarm/Changelog 2008-06-29 20:10:36.000000000 +0200
+@@ -1,8 +1,20 @@
+ KAlarm Change Log
+
++=== Version 1.5.3 --- 22 May 2008 ===
++- In New From Template menu, show list of template names in sorted order.
++- Fix recurrence count being lost when using alarm templates.
++- Prevent invalid negative values appearing in 'Time from now' edit field.
++- Fix time shown in alarm edit dialogue for recurring alarms.
++- Fix recurrence count shown in alarm edit dialogue once alarm has triggered.
++- Fix Find not working with a new search text after a failed search.
++- Display correct error message when a search fails.
++- Prevent user changing font/colour dialogue when editing read-only alarms.
++
++=== Version 1.5.2 --- 13 February 2008 ===
++- Prevent repetition duration error message when saving alarm which never recurs.
++
+ === Version 1.5.1 (KDE 3.5.9) --- 13 February 2008 ===
+ - Fix inability to set up sub-repetitions for simple yearly recurrences.
+-- Fix wrong error message when changing recurrence frequency.
+
+ === Version 1.5.0 --- 27 January 2008 ===
+ - Replace simple repetitions with recurrence sub-repetitions, to save confusion.
+Index: kalarm/recurrenceedit.h
+===================================================================
+--- kalarm/recurrenceedit.h.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/recurrenceedit.h 2008-06-29 20:10:36.000000000 +0200
+@@ -66,7 +66,7 @@
+ /** Set widgets to default values */
+ void setDefaults(const QDateTime& from);
+ /** Initialise according to a specified event */
+- void set(const KAEvent&);
++ void set(const KAEvent&, bool keepDuration);
+ /** Write recurrence settings into an event */
+ void updateEvent(KAEvent&, bool adjustStart);
+ QWidget* checkData(const QDateTime& startDateTime, QString& errorMessage) const;
+Index: kalarm/sounddlg.cpp
+===================================================================
+--- kalarm/sounddlg.cpp.orig 2007-10-08 11:50:44.000000000 +0200
++++ kalarm/sounddlg.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * sounddlg.cpp - sound file selection and configuration dialog
+ * Program: kalarm
+- * Copyright © 2005,2007 by David Jarvie <software at astrojar.org.uk>
++ * Copyright © 2005,2007,2008 by David Jarvie <djarvie at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -114,7 +114,7 @@
+ QGroupBox* group = new QGroupBox(i18n("Volume"), page);
+ layout->addWidget(group);
+ QGridLayout* grid = new QGridLayout(group, 4, 3, marginHint(), spacingHint());
+- grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
++ grid->addRowSpacing(0, fontMetrics().height() - marginHint() + spacingHint());
+ grid->setColStretch(2, 1);
+ int indentWidth = 3 * KDialog::spacingHint();
+ grid->addColSpacing(0, indentWidth);
+@@ -306,7 +306,6 @@
+ connect(mPlayTimer, SIGNAL(timeout()), SLOT(checkAudioPlay()));
+ mArtsDispatcher = new KArtsDispatcher;
+ mPlayStarted = false;
+- mAudioFileStart = QTime::currentTime();
+ KArtsServer aserver;
+ Arts::SoundServerV2 sserver = aserver.server();
+ KDE::PlayObjectFactory factory(sserver);
+Index: kalarm/find.cpp
+===================================================================
+--- kalarm/find.cpp.orig 2007-01-15 12:28:51.000000000 +0100
++++ kalarm/find.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * find.cpp - search facility
+ * Program: kalarm
+- * Copyright © 2005,2006 by David Jarvie <software at astrojar.org.uk>
++ * Copyright © 2005,2006,2008 by David Jarvie <djarvie at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -228,47 +228,50 @@
+
+ // Supply KFind with only those options which relate to the text within alarms
+ long options = mOptions & (KFindDialog::WholeWordsOnly | KFindDialog::CaseSensitive | KFindDialog::RegularExpression);
++ bool newFind = !mFind;
++ bool newPattern = (mDialog->pattern() != mLastPattern);
++ mLastPattern = mDialog->pattern();
+ if (mFind)
+ {
+- mFind->setPattern(mDialog->pattern());
++ mFind->resetCounts();
++ mFind->setPattern(mLastPattern);
+ mFind->setOptions(options);
+- delete mDialog; // automatically set to 0
+- findNext(true, true, false);
+ }
+ else
+ {
+ #ifdef MODAL_FIND
+- mFind = new KFind(mDialog->pattern(), options, mListView);
++ mFind = new KFind(mLastPattern, options, mListView);
++ mDialog->deleteLater(); // automatically set to 0
+ #else
+- mFind = new KFind(mDialog->pattern(), options, mListView, mDialog);
++ mFind = new KFind(mLastPattern, options, mListView, mDialog);
+ #endif
+ connect(mFind, SIGNAL(destroyed()), SLOT(slotKFindDestroyed()));
+- delete mDialog; // close the Find dialogue. Automatically set to 0.
+ mFind->closeFindNextDialog(); // prevent 'Find Next' dialog appearing
++ }
+
+- // Set the starting point for the search
+- mListView->sort(); // ensure the whole list is sorted, not just the visible items
+- mStartID = QString::null;
+- mNoCurrentItem = true;
+- bool fromCurrent = false;
+- EventListViewItemBase* item = 0;
++ // Set the starting point for the search
++ mStartID = QString::null;
++ mNoCurrentItem = newPattern;
++ bool checkEnd = false;
++ if (newPattern)
++ {
++ mFound = false;
+ if (mOptions & KFindDialog::FromCursor)
+ {
+- item = mListView->currentItem();
++ EventListViewItemBase* item = mListView->currentItem();
+ if (item)
+ {
+ mStartID = item->event().id();
+ mNoCurrentItem = false;
+- fromCurrent = true;
++ checkEnd = true;
+ }
+ }
+-
+- // Execute the search
+- mFound = false;
+- findNext(true, false, fromCurrent);
+- if (mFind)
+- emit active(true);
+ }
++
++ // Execute the search
++ findNext(true, true, checkEnd, false);
++ if (mFind && newFind)
++ emit active(true);
+ }
+
+ /******************************************************************************
+@@ -276,7 +279,7 @@
+ * If 'fromCurrent' is true, the search starts with the current search item;
+ * otherwise, it starts from the next item.
+ */
+-void Find::findNext(bool forward, bool sort, bool fromCurrent)
++void Find::findNext(bool forward, bool sort, bool checkEnd, bool fromCurrent)
+ {
+ if (sort)
+ mListView->sort(); // ensure the whole list is sorted, not just the visible items
+@@ -287,11 +290,12 @@
+
+ // Search successive alarms until a match is found or the end is reached
+ bool found = false;
+- for ( ; item; item = nextItem(item, forward))
++ bool last = false;
++ for ( ; item && !last; item = nextItem(item, forward))
+ {
+ const KAEvent& event = item->event();
+ if (!fromCurrent && !mStartID.isNull() && mStartID == event.id())
+- break; // we've wrapped round and reached the starting alarm again
++ last = true; // we've wrapped round and reached the starting alarm again
+ fromCurrent = false;
+ bool live = !event.expired();
+ if (live && !(mOptions & FIND_LIVE)
+@@ -357,12 +361,13 @@
+ else
+ {
+ // No match was found
+- if (mFound)
++ if (mFound || checkEnd)
+ {
+ QString msg = forward ? i18n("End of alarm list reached.\nContinue from the beginning?")
+ : i18n("Beginning of alarm list reached.\nContinue from the end?");
+ if (KMessageBox::questionYesNo(mListView, msg, QString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()) == KMessageBox::Yes)
+ {
++ mNoCurrentItem = true;
+ findNext(forward, false);
+ return;
+ }
+Index: kalarm/repetition.cpp
+===================================================================
+--- kalarm/repetition.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/repetition.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -96,8 +96,10 @@
+ */
+ void RepetitionButton::initialise(int interval, int count, bool dateOnly, int maxDuration)
+ {
+- mInterval = (maxDuration > 0 && interval > maxDuration) ? 1 : interval;
++ if (maxDuration > 0 && interval > maxDuration)
++ count = 0;
+ mCount = count;
++ mInterval = interval;
+ mMaxDuration = maxDuration;
+ mDateOnly = dateOnly;
+ if (mDialog)
+Index: kalarm/prefdlg.cpp
+===================================================================
+--- kalarm/prefdlg.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/prefdlg.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -233,7 +233,7 @@
+ mPage(frame)
+ {
+ if (!mIndentWidth)
+- mIndentWidth = 3 * KDialog::spacingHint();
++ mIndentWidth = style().subRect(QStyle::SR_RadioButtonIndicator, this).width();
+ }
+
+ void PrefsTabBase::apply(bool syncToDisc)
+Index: kalarm/lib/timespinbox.cpp
+===================================================================
+--- kalarm/lib/timespinbox.cpp.orig 2008-02-13 10:39:41.000000000 +0100
++++ kalarm/lib/timespinbox.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -205,12 +205,12 @@
+ if (value() < mMinimumValue)
+ SpinBox2::setValue(mMinimumValue);
+ setSpecialValueText(QString());
+- setMinValue(mMinimumValue);
++ SpinBox2::setMinValue(mMinimumValue);
+ }
+ else if (!valid && !mInvalid)
+ {
+ mInvalid = true;
+- setMinValue(mMinimumValue - 1);
++ SpinBox2::setMinValue(mMinimumValue - 1);
+ setSpecialValueText(QString::fromLatin1("**:**"));
+ SpinBox2::setValue(mMinimumValue - 1);
+ }
+@@ -221,8 +221,8 @@
+ */
+ void TimeSpinBox::setMinValue(int minutes)
+ {
+- mMinimumValue = minutes;
+- SpinBox2::setMinValue(mMinimumValue - (mInvalid ? 1 : 0));
++ mMinimumValue = minutes;
++ SpinBox2::setMinValue(mMinimumValue - (mInvalid ? 1 : 0));
+ }
+
+ /******************************************************************************
+@@ -242,7 +242,7 @@
+ {
+ mInvalid = false;
+ setSpecialValueText(QString());
+- setMinValue(mMinimumValue);
++ SpinBox2::setMinValue(mMinimumValue);
+ }
+ SpinBox2::setValue(minutes);
+ mEnteredSetValue = false;
+Index: kalarm/lib/spinbox2.h
+===================================================================
+--- kalarm/lib/spinbox2.h.orig 2007-10-08 11:50:44.000000000 +0200
++++ kalarm/lib/spinbox2.h 2008-06-29 20:10:36.000000000 +0200
+@@ -138,9 +138,9 @@
+ /** Returns the maximum value of the spin box. */
+ int maxValue() const { return mMaxValue; }
+ /** Sets the minimum value of the spin box. */
+- void setMinValue(int val);
++ virtual void setMinValue(int val);
+ /** Sets the maximum value of the spin box. */
+- void setMaxValue(int val);
++ virtual void setMaxValue(int val);
+ /** Sets the minimum and maximum values of the spin box. */
+ void setRange(int minValue, int maxValue) { setMinValue(minValue); setMaxValue(maxValue); }
+ /** Returns the current value of the spin box. */
+Index: kalarm/lib/timespinbox.h
+===================================================================
+--- kalarm/lib/timespinbox.h.orig 2008-02-13 10:39:41.000000000 +0100
++++ kalarm/lib/timespinbox.h 2008-06-29 20:10:36.000000000 +0200
+@@ -117,7 +117,7 @@
+ private:
+ class TimeValidator;
+ TimeValidator* mValidator;
+- int mMinimumValue;
++ int mMinimumValue; // real minimum value, excluding special value for "**:**"
+ bool m12Hour; // use 12-hour clock
+ bool mPm; // use PM for manually entered values (with 12-hour clock)
+ bool mInvalid; // value is currently invalid (asterisks)
+Index: kalarm/kalarm.desktop
+===================================================================
+--- kalarm/kalarm.desktop.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/kalarm.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -45,6 +45,7 @@
+ GenericName[is]=Ãminningakerfi
+ GenericName[it]=Programmatore degli avvisi personali
+ GenericName[ja]=個人アラームスケジューラ
++GenericName[ka]=პერსáƒáƒœáƒáƒšáƒ£áƒ ი მáƒáƒ¦áƒ•áƒ˜áƒ«áƒáƒ áƒáƒ¡ მგეგმáƒáƒ•áƒ˜
+ GenericName[kk]=Ð”ÐµÑ€Ð±ÐµÑ ÐµÑкертулер жоÑпарлағышы
+ GenericName[km]=កម្មវិធី​កំណážáŸ‹â€‹áž˜áŸ‰áŸ„ង​រោទáŸâ€‹áž•áŸ’ទាល់​ážáŸ’លួន
+ GenericName[lt]=Asmeninių žinuÄių-priminimų planuoklis
+Index: kalarm/recurrenceedit.cpp
+===================================================================
+--- kalarm/recurrenceedit.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/recurrenceedit.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -732,9 +732,11 @@
+ }
+
+ /******************************************************************************
+- * Set the state of all controls to reflect the data in the specified event.
+- */
+-void RecurrenceEdit::set(const KAEvent& event)
++* Set the state of all controls to reflect the data in the specified event.
++* Set 'keepDuration' true to prevent the recurrence count being adjusted to the
++* remaining number of recurrences.
++*/
++void RecurrenceEdit::set(const KAEvent& event, bool keepDuration)
+ {
+ setDefaults(event.mainDateTime().dateTime());
+ if (event.repeatAtLogin())
+@@ -839,17 +841,7 @@
+ else if (duration)
+ {
+ mRepeatCountButton->setChecked(true);
+- int repeatCount;
+- if (event.expired())
+- repeatCount = duration;
+- else if (event.mainExpired())
+- {
+- mRepeatCountEntry->setMinValue(0);
+- repeatCount = 0;
+- }
+- else
+- repeatCount = duration - recurrence->durationTo(QDateTime::currentDateTime());
+- mRepeatCountEntry->setValue(repeatCount);
++ mRepeatCountEntry->setValue(duration);
+ }
+ else
+ {
+Index: kalarm/karecurrence.cpp
+===================================================================
+--- kalarm/karecurrence.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/karecurrence.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -296,7 +296,10 @@
+
+ // Remove surplus rules
+ for ( ; rr != rrulelist.end(); ++rr)
++ {
+ removeRRule(*rr);
++ delete *rr;
++ }
+
+ QDate end;
+ int count;
+Index: kalarm/kalarm.tray.desktop
+===================================================================
+--- kalarm/kalarm.tray.desktop.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/kalarm.tray.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -44,6 +44,7 @@
+ Comment[is]=Ãminningakerfi: ræsir sem táknmynd á spjaldinu
+ Comment[it]=Programmatore personale degli avvisi: all'avvio si mette nel vassoio di sistema
+ Comment[ja]=個人アラームスケジューラ: システムトレイアイコンã§èµ·å‹•
++Comment[ka]=პესáƒáƒœáƒáƒšáƒ£áƒ ი მáƒáƒ¦áƒ•áƒ˜áƒ«áƒáƒ áƒáƒ¡ მგეგმáƒáƒ•áƒ˜: სისტემურპáƒáƒœáƒ”ლის ხáƒáƒ¢áƒ£áƒšáƒáƒ“ იწყებáƒ
+ Comment[kk]=Ð”ÐµÑ€Ð±ÐµÑ ÐµÑкертулер жоÑпарлағышы: жүйелік Ñөреде орналаÑады
+ Comment[km]=កម្មវិធី​កំណážáŸ‹â€‹áž˜áŸ‰áŸ„ង​រោទáŸâ€‹áž•áŸ’ទាល់​ážáŸ’លួន ៖ ចាប់ផ្ដើម​ជា​រូបážáŸ†ážŽáž¶áž„​ក្នុង​ážáž¶ážŸâ€‹áž”្រពáŸáž“្ធ
+ Comment[lt]=ŽinuÄių-priminimų planuoklis: paleisti kaip sisteminio dÄ—klo ženkliukÄ…
+Index: kalarm/find.h
+===================================================================
+--- kalarm/find.h.orig 2007-01-15 12:28:51.000000000 +0100
++++ kalarm/find.h 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * find.h - search facility
+ * Program: kalarm
+- * Copyright © 2005,2006 by David Jarvie <software at astrojar.org.uk>
++ * Copyright © 2005,2006,2008 by David Jarvie <djarvie at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -50,7 +50,7 @@
+ void slotKFindDestroyed() { emit active(false); }
+
+ private:
+- void findNext(bool forward, bool sort, bool fromCurrent = false);
++ void findNext(bool forward, bool sort, bool checkEnd = false, bool fromCurrent = false);
+ EventListViewItemBase* nextItem(EventListViewItemBase*, bool forward) const;
+
+ EventListViewBase* mListView; // parent list view
+@@ -64,6 +64,7 @@
+ QCheckBox* mEmailType;
+ KFind* mFind;
+ QStringList mHistory; // list of history items for Find dialog
++ QString mLastPattern; // pattern used in last search
+ QString mStartID; // ID of first alarm searched if 'from cursor' was selected
+ long mOptions; // OR of find dialog options
+ bool mNoCurrentItem; // there is no current item for the purposes of searching
+Index: kalarm/fontcolourbutton.cpp
+===================================================================
+--- kalarm/fontcolourbutton.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/fontcolourbutton.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * fontcolourbutton.cpp - pushbutton widget to select a font and colour
+ * Program: kalarm
+- * Copyright © 2003-2005,2007 by David Jarvie <djarvie at kde.org>
++ * Copyright © 2003-2005,2007,2008 by David Jarvie <djarvie at kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -142,7 +142,10 @@
+ void FontColourDlg::slotOk()
+ {
+ if (mReadOnly)
++ {
+ reject();
++ return;
++ }
+ mDefaultFont = mChooser->defaultFont();
+ mFont = mChooser->font();
+ mBgColour = mChooser->bgColour();
+Index: kalarm/Makefile.am
+===================================================================
+--- kalarm/Makefile.am.orig 2005-10-10 17:02:22.000000000 +0200
++++ kalarm/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -12,12 +12,12 @@
+ # Don't change the order of the kalarm_SOURCES files without first checking
+ # that it builds with --enable-final !!!
+ kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \
+- soundpicker.cpp sounddlg.cpp alarmcalendar.cpp daemon.cpp undo.cpp \
++ fontcolour.cpp soundpicker.cpp sounddlg.cpp alarmcalendar.cpp daemon.cpp undo.cpp \
+ kalarmapp.cpp mainwindowbase.cpp mainwindow.cpp messagewin.cpp \
+ preferences.cpp prefdlg.cpp kalarmiface.skel \
+ traywindow.cpp dcophandler.cpp alarmguiiface.skel \
+ recurrenceedit.cpp karecurrence.cpp deferdlg.cpp functions.cpp \
+- fontcolour.cpp fontcolourbutton.cpp alarmtimewidget.cpp \
++ fontcolourbutton.cpp alarmtimewidget.cpp \
+ specialactions.cpp reminder.cpp startdaytimer.cpp \
+ eventlistviewbase.cpp alarmlistview.cpp kamail.cpp timeselector.cpp \
+ templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \
+Index: kalarm/fontcolour.cpp
+===================================================================
+--- kalarm/fontcolour.cpp.orig 2005-09-10 10:24:14.000000000 +0200
++++ kalarm/fontcolour.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * fontcolour.cpp - font and colour chooser widget
+ * Program: kalarm
+- * Copyright (C) 2001 - 2003, 2005 by David Jarvie <software at astrojar.org.uk>
++ * Copyright © 2001-2003,2005,2008 by David Jarvie <software at astrojar.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -55,42 +55,39 @@
+ page = new QGroupBox(frameLabel, this);
+ topLayout->addWidget(page);
+ topLayout = new QVBoxLayout(page, KDialog::marginHint(), KDialog::spacingHint());
+- topLayout->addSpacing(fontMetrics().lineSpacing()/2);
++ topLayout->addSpacing(fontMetrics().height() - KDialog::marginHint() + KDialog::spacingHint());
+ }
++ QHBoxLayout* hlayout = new QHBoxLayout(topLayout);
++ QVBoxLayout* colourLayout = new QVBoxLayout(hlayout);
+ if (fg)
+ {
+- QBoxLayout* layout = new QHBoxLayout(topLayout);
+ QHBox* box = new QHBox(page); // to group widgets for QWhatsThis text
+- box->setSpacing(KDialog::spacingHint());
+- layout->addWidget(box);
++ box->setSpacing(KDialog::spacingHint()/2);
++ colourLayout->addWidget(box);
+
+ QLabel* label = new QLabel(i18n("&Foreground color:"), box);
+- label->setMinimumSize(label->sizeHint());
++ box->setStretchFactor(new QWidget(box), 0);
+ mFgColourButton = new ColourCombo(box);
+- mFgColourButton->setMinimumSize(mFgColourButton->sizeHint());
+ connect(mFgColourButton, SIGNAL(activated(const QString&)), SLOT(setSampleColour()));
+ label->setBuddy(mFgColourButton);
+ QWhatsThis::add(box, i18n("Select the alarm message foreground color"));
+- layout->addStretch();
+ }
+
+- QBoxLayout* layout = new QHBoxLayout(topLayout);
+ QHBox* box = new QHBox(page); // to group widgets for QWhatsThis text
+- box->setSpacing(KDialog::spacingHint());
+- layout->addWidget(box);
++ box->setSpacing(KDialog::spacingHint()/2);
++ colourLayout->addWidget(box);
+
+ QLabel* label = new QLabel(i18n("&Background color:"), box);
+- label->setMinimumSize(label->sizeHint());
++ box->setStretchFactor(new QWidget(box), 0);
+ mBgColourButton = new ColourCombo(box);
+- mBgColourButton->setMinimumSize(mBgColourButton->sizeHint());
+ connect(mBgColourButton, SIGNAL(activated(const QString&)), SLOT(setSampleColour()));
+ label->setBuddy(mBgColourButton);
+ QWhatsThis::add(box, i18n("Select the alarm message background color"));
+- layout->addStretch();
++ hlayout->addStretch();
+
+ if (editColours)
+ {
+- layout = new QHBoxLayout(topLayout);
++ QHBoxLayout* layout = new QHBoxLayout(topLayout);
+ QPushButton* button = new QPushButton(i18n("Add Co&lor..."), page);
+ button->setFixedSize(button->sizeHint());
+ connect(button, SIGNAL(clicked()), SLOT(slotAddColour()));
+@@ -107,7 +104,7 @@
+
+ if (defaultFont)
+ {
+- layout = new QHBoxLayout(topLayout);
++ QHBoxLayout* layout = new QHBoxLayout(topLayout);
+ mDefaultFont = new CheckBox(i18n("Use &default font"), page);
+ mDefaultFont->setMinimumSize(mDefaultFont->sizeHint());
+ connect(mDefaultFont, SIGNAL(toggled(bool)), SLOT(slotDefaultFontToggled(bool)));
+@@ -120,6 +117,10 @@
+ mDefaultFont = 0;
+
+ mFontChooser = new KFontChooser(page, name, onlyFixed, fontList, false, visibleListSize);
++ mFontChooser->installEventFilter(this); // for read-only mode
++ const QObjectList* kids = mFontChooser->queryList();
++ for (QObjectList::ConstIterator it = kids->constBegin(); it != kids->constEnd(); ++it)
++ (*it)->installEventFilter(this);
+ topLayout->addWidget(mFontChooser);
+
+ slotDefaultFontToggled(false);
+@@ -212,6 +213,25 @@
+ }
+ }
+
++bool FontColourChooser::eventFilter(QObject*, QEvent* e)
++{
++ if (mReadOnly)
++ {
++ switch (e->type())
++ {
++ case QEvent::MouseButtonPress:
++ case QEvent::MouseButtonRelease:
++ case QEvent::MouseButtonDblClick:
++ case QEvent::KeyPress:
++ case QEvent::KeyRelease:
++ return true; // prevent the event being handled
++ default:
++ break;
++ }
++ }
++ return false;
++}
++
+ void FontColourChooser::slotDefaultFontToggled(bool on)
+ {
+ mFontChooser->setEnabled(!on);
+Index: kalarm/birthdaydlg.cpp
+===================================================================
+--- kalarm/birthdaydlg.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ kalarm/birthdaydlg.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -88,7 +88,6 @@
+ QGroupBox* textGroup = new QGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget);
+ topLayout->addWidget(textGroup);
+ QLabel* label = new QLabel(i18n("Pre&fix:"), textGroup);
+- label->setFixedSize(label->sizeHint());
+ mPrefix = new BLineEdit(mPrefixText, textGroup);
+ mPrefix->setMinimumSize(mPrefix->sizeHint());
+ label->setBuddy(mPrefix);
+@@ -98,7 +97,6 @@
+ "including any necessary trailing spaces."));
+
+ label = new QLabel(i18n("S&uffix:"), textGroup);
+- label->setFixedSize(label->sizeHint());
+ mSuffix = new BLineEdit(mSuffixText, textGroup);
+ mSuffix->setMinimumSize(mSuffix->sizeHint());
+ label->setBuddy(mSuffix);
+@@ -152,7 +150,6 @@
+ // Acknowledgement confirmation required - default = no confirmation
+ QHBoxLayout* layout = new QHBoxLayout(groupLayout, 2*spacingHint());
+ mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group);
+- mConfirmAck->setFixedSize(mConfirmAck->sizeHint());
+ layout->addWidget(mConfirmAck);
+ layout->addSpacing(2*spacingHint());
+ layout->addStretch();
+@@ -161,20 +158,17 @@
+ {
+ // Special actions button
+ mSpecialActionsButton = new SpecialActionsButton(i18n("Special Actions..."), group);
+- mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint());
+ layout->addWidget(mSpecialActionsButton);
+ }
+
+ // Late display checkbox - default = allow late display
+ layout = new QHBoxLayout(groupLayout, 2*spacingHint());
+ mLateCancel = new LateCancelSelector(false, group);
+- mLateCancel->setFixedSize(mLateCancel->sizeHint());
+ layout->addWidget(mLateCancel);
+ layout->addStretch();
+
+ // Sub-repetition button
+ mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), false, group);
+- mSubRepetition->setFixedSize(mSubRepetition->sizeHint());
+ mSubRepetition->set(0, 0, true, 364*24*60);
+ QWhatsThis::add(mSubRepetition, i18n("Set up an additional alarm repetition"));
+ layout->addWidget(mSubRepetition);
+Index: libemailfunctions/tests/testemail.cpp
+===================================================================
+--- libemailfunctions/tests/testemail.cpp.orig 2007-10-08 11:50:45.000000000 +0200
++++ libemailfunctions/tests/testemail.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -144,6 +144,13 @@
+ return true;
+ }
+
++static bool checkNormalizeAddressesAndDecodeIDNs( const QString& input, const QString& expResult )
++{
++ QString result = KPIM::normalizeAddressesAndDecodeIDNs( input );
++ check( "normalizeAddressesAndDecodeIDNs( \"" + input + "\" ) result ", result, expResult );
++ return true;
++}
++
+ static bool checkQuoteIfNecessary( const QString& input, const QString& expResult )
+ {
+ QString result = quoteNameIfNecessary( input );
+@@ -458,6 +465,10 @@
+ checkNormalizeAddressesAndEncodeIDNs( "matt at fruitsalad.org (jongel,fibbel)", "\"jongel,fibbel\" <matt at fruitsalad.org>" );
+ checkNormalizeAddressesAndEncodeIDNs( "matt at fruitsalad.org (\"jongel,fibbel\")", "\"jongel,fibbel\" <matt at fruitsalad.org>" );
+
++ // check checkNormalizeAddressesAndDecodeIDNs
++ checkNormalizeAddressesAndDecodeIDNs( "=?us-ascii?Q?Surname=2C=20Name?= <nobody at example.org>", "\"Surname, Name\" <nobody at example.org>" );
++ checkNormalizeAddressesAndDecodeIDNs( "=?iso-8859-1?B?5Hf8b2xmLPZBbmRyZWFz?= <nobody at example.org>", QString::fromUtf8("\"äwüolf,öAndreas\" <nobody at example.org>") );
++
+ // check the "quote if necessary" method
+ checkQuoteIfNecessary( "Matt Douhan", "Matt Douhan");
+ checkQuoteIfNecessary( "Douhan, Matt", "\"Douhan, Matt\"");
+Index: libemailfunctions/tests/Makefile.am
+===================================================================
+--- libemailfunctions/tests/Makefile.am.orig 2005-09-10 10:24:14.000000000 +0200
++++ libemailfunctions/tests/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -1,5 +1,5 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/libemailfunctions $(all_includes)
+-LDADD = ../libemailfunctions.la $(LIB_KDECORE)
++LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_KDECORE)
+
+ check_PROGRAMS = testidmapper testemail
+ TESTS = testemail
+Index: libemailfunctions/email.cpp
+===================================================================
+--- libemailfunctions/email.cpp.orig 2008-06-29 20:07:35.000000000 +0200
++++ libemailfunctions/email.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <kdebug.h>
+ #include <klocale.h>
+ #include <kidna.h>
++#include <kmime_util.h>
+
+ #include <qregexp.h>
+
+@@ -811,7 +812,7 @@
+ if ( displayName.isEmpty() && comment.isEmpty() )
+ return addrSpec;
+ else if ( comment.isEmpty() )
+- return displayName + " <" + addrSpec + ">";
++ return quoteNameIfNecessary( displayName ) + " <" + addrSpec + ">";
+ else if ( displayName.isEmpty() ) {
+ QString commentStr = comment;
+ return quoteNameIfNecessary( commentStr ) + " <" + addrSpec + ">";
+@@ -871,6 +872,9 @@
+ if ( KPIM::splitAddress( (*it).utf8(), displayName, addrSpec, comment )
+ == AddressOk ) {
+
++ displayName = KMime::decodeRFC2047String(displayName).utf8();
++ comment = KMime::decodeRFC2047String(comment).utf8();
++
+ normalizedAddressList <<
+ normalizedAddress( QString::fromUtf8( displayName ),
+ decodeIDN( QString::fromUtf8( addrSpec ) ),
+Index: libemailfunctions/Makefile.am
+===================================================================
+--- libemailfunctions/Makefile.am.orig 2005-09-10 10:24:14.000000000 +0200
++++ libemailfunctions/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = $(all_includes)
++INCLUDES = $(all_includes) -I$(srcdir)/../libkmime/
+
+ noinst_LTLIBRARIES = libemailfunctions.la
+ libemailfunctions_la_SOURCES = email.cpp idmapper.cpp kasciistricmp.cpp \
+@@ -7,7 +7,7 @@
+ libemailfunctions_la_LDFLAGS = $(all_libraries) -no-undefined
+ ## Since this is a noinst library, in case of --enable-closure we need
+ ## to link it explicitly to the libraries that it uses.
+-libemailfunctions_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
++libemailfunctions_la_LIBADD = ../libkmime/libkmime.la $(LIB_QT) $(LIB_KDECORE)
+
+ emailfunctionsincludedir = $(includedir)/libemailfunctions
+ emailfunctionsinclude_HEADERS = idmapper.h
+Index: korn/KOrn.desktop
+===================================================================
+--- korn/KOrn.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ korn/KOrn.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ GenericName[is]=Póst áminning
+ GenericName[it]=Programma per controllare la posta
+ GenericName[ja]=メールã®é€šçŸ¥
++GenericName[ka]=სáƒáƒ¤áƒáƒ¡áƒ¢áƒ სიგნáƒáƒšáƒ˜
+ GenericName[kk]=Пошта келген туралы хабарлау
+ GenericName[km]=សញ្ញា​ជូនដំណឹងសំបុážáŸ’ážš
+ GenericName[lt]=Pašto pranešėjas
+@@ -55,7 +56,8 @@
+ GenericName[th]=à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸ˆà¸”หมาย
+ GenericName[tr]=Midi Uyarısı
+ GenericName[uk]=ÐÐ°Ð³Ð°Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑˆÑ‚Ð¸
+-GenericName[uz]=Янги хат ҳақида хабар берувчи
++GenericName[uz]=Yangi xat haqida xabar beruvchi
++GenericName[uz at cyrillic]=Янги хат ҳақида хабар берувчи
+ GenericName[ven]=U sedzesa poso
+ GenericName[xh]=Umposi Wokulumkisa
+ GenericName[zh_CN]=邮件è¦å‘Š
+Index: kaddressbook/interfaces/kaddressbook_extension.desktop
+===================================================================
+--- kaddressbook/interfaces/kaddressbook_extension.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/interfaces/kaddressbook_extension.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -28,6 +28,7 @@
+ Comment[is]=KAddressbook viðbótar Ãforrit
+ Comment[it]=Plugin estensione di KAddressbook
+ Comment[ja]=KAddressbook 拡張プラグイン
++Comment[ka]=KDE წიგნáƒáƒ™áƒ˜áƒ¡ გáƒáƒ¤áƒáƒ თáƒáƒ”ბის მáƒáƒ“ული
+ Comment[kk]=KAddressBook кеңейту модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ផ្នែក​បន្ážáŸ‚ម​របស់ KAddressBook
+ Comment[lt]=KAddressBook praplÄ—timo priedas
+Index: kaddressbook/interfaces/kaddressbook_xxport.desktop
+===================================================================
+--- kaddressbook/interfaces/kaddressbook_xxport.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/interfaces/kaddressbook_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Comment[is]=KAddressbook flytja inn/út Ãforrit
+ Comment[it]=Plugin importa/esporta di KAddressbook
+ Comment[ja]=KAddressbook インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Comment[ka]=წიგნáƒáƒ™áƒ˜áƒ¡ იმპáƒáƒ ტ/ექსპáƒáƒ ტის მáƒáƒ“ული
+ Comment[kk]=KAddressBook импорт/ÑкÑпорт модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​នាំចូល/នាំចáŸáž‰â€‹ážšáž”ស់ KAddressBook
+ Comment[lt]=KAddressBook importo/eksporto priedas
+@@ -52,7 +53,8 @@
+ Comment[tg]=Содирот ва воридоти китоби адреÑ
+ Comment[tr]=KAdresDefteri Al/Gönder Eklentisi
+ Comment[uk]=Втулок імпорту/екÑпорту адреÑної книги KAddressBook
+-Comment[uz]=Манзиллар дафтари учун импорт/ÑкÑпорт плагини
++Comment[uz]=Manzillar daftari uchun import/eksport plagini
++Comment[uz at cyrillic]=Манзиллар дафтари учун импорт/ÑкÑпорт плагини
+ Comment[zh_CN]=KAddressBook 导入/导出æ’件
+ Comment[zh_TW]=KAddressBook 匯入/匯出外掛程å¼
+
+Index: kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
+===================================================================
+--- kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Comment[is]=KAddressbook tengiliðaritils Ãforrit
+ Comment[it]=Plugin editor dei contatti di KAddressbook
+ Comment[ja]=KAddressbook 連絡先エディタ ウィジェット プラグイン
++Comment[ka]= KDE-ს წიგნáƒáƒ™áƒ˜áƒ¡ კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ—რრედáƒáƒ¥áƒ¢áƒ˜áƒ ების ელემენტის მáƒáƒ“ული
+ Comment[kk]=ÐдреÑтік кітапшаның контактты өңдеу модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ធាážáž»â€‹áž€áŸ’រាហ្វិក​កម្មវិធី​និពន្ធ​ទំនាក់ទំនង​របស់ KAddressBook
+ Comment[lt]=KAddressBook kontaktų redaktoriaus valdiklių priedas
+Index: kaddressbook/extensionmanager.cpp
+===================================================================
+--- kaddressbook/extensionmanager.cpp.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/extensionmanager.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -46,10 +46,10 @@
+
+ ExtensionManager::ExtensionManager( QWidget* extensionBar, QWidgetStack* detailsStack, KAB::Core *core, QObject *parent,
+ const char *name )
+- : QObject( parent, name ), mExtensionBar( extensionBar ), mCore( core ),
++ : QObject( parent, name ), mExtensionBar( extensionBar ), mCore( core ),
+ mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 )
+ {
+- Q_ASSERT( mExtensionBar );
++ Q_ASSERT( mExtensionBar );
+ QVBoxLayout* layout = new QVBoxLayout( mExtensionBar );
+ mSplitter = new QSplitter( mExtensionBar );
+ mSplitter->setOrientation( QSplitter::Vertical );
+@@ -68,7 +68,7 @@
+ }
+
+
+-void ExtensionManager::restoreSettings()
++void ExtensionManager::restoreSettings()
+ {
+ const QStringList activeExtensions = KABPrefs::instance()->activeExtensions();
+
+@@ -110,7 +110,7 @@
+ for ( QStringList::ConstIterator it = mActiveExtensions.begin(), end = mActiveExtensions.end(); it != end; ++it ) {
+ if ( mExtensionMap.contains( *it ) && mExtensionMap[*it].widget )
+ mExtensionMap[*it].widget->contactsSelectionChanged();
+- }
++ }
+ }
+
+ void ExtensionManager::activationToggled( const QString &extid )
+@@ -127,7 +127,7 @@
+ if ( !mExtensionMap.contains( extid ) )
+ return;
+ if ( mActiveExtensions.contains( extid ) == active )
+- return;
++ return;
+ const ExtensionData data = mExtensionMap[ extid ];
+ if ( active ) {
+ mActiveExtensions.append( extid );
+@@ -152,7 +152,7 @@
+ }
+ mExtensionBar->setShown( !mActiveExtensions.isEmpty() );
+ }
+-
++
+ void ExtensionManager::createActions()
+ {
+ mCore->guiClient()->unplugActionList( "extensions_list" );
+@@ -178,6 +178,7 @@
+ data.action->setChecked( true );
+ }
+
++ mActionList.append( new KActionSeparator( mActionCollection ) );
+ mCore->guiClient()->plugActionList( "extensions_list", mActionList );
+ }
+
+@@ -235,6 +236,8 @@
+
+ wdg = extensionFactory->extension( mCore, mSplitter );
+ if ( wdg ) {
++ if ( wdg->identifier() == "distribution_list_editor_ng" )
++ mSplitter->moveToFirst( wdg );
+ wdg->hide();
+ connect( wdg, SIGNAL( modified( const KABC::Addressee::List& ) ),
+ SIGNAL( modified( const KABC::Addressee::List& ) ) );
+Index: kaddressbook/kaddressbookui.rc
+===================================================================
+--- kaddressbook/kaddressbookui.rc.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/kaddressbookui.rc 2008-06-29 20:10:36.000000000 +0200
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui>
+-<kpartgui name="kaddressbook" version="22">
++<kpartgui name="kaddressbook" version="23">
+
+ <MenuBar>
+ <Menu name="file" noMerge="1"><text>&File</text>
+@@ -47,6 +47,8 @@
+ <Action name="view_modify"/>
+ <Action name="view_delete"/>
+ <Separator/>
++ <ActionList name="extensions_list"/>
++ <Separator/>
+ <Action name="view_refresh"/>
+ </Menu>
+
+@@ -56,9 +58,6 @@
+
+ <Menu name="settings" noMerge="1"><text>&Settings</text>
+ <Merge name="StandardToolBarMenuHandler" />
+- <Menu name="show_extensions_menu"><text>Show Extension</text>
+- <ActionList name="extensions_list"/>
+- </Menu>
+ <Action name="options_show_jump_bar"/>
+ <Action name="options_show_details"/>
+ <Action name="options_show_statusbar"/>
+Index: kaddressbook/dcopaddressbook.desktop
+===================================================================
+--- kaddressbook/dcopaddressbook.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/dcopaddressbook.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Comment[is]=Vistfangaskrá með DCOP tengingu
+ Comment[it]=Rubrica indirizzi con un'interfaccia DCOP
+ Comment[ja]=DCOP インターフェースをæŒã¤ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³
++Comment[ka]=წიგნáƒáƒ™áƒ˜ DCOP-ის ინტერფეისით
+ Comment[kk]=DCOP интерфейÑÑ‚Ñ– адреÑтік кітапшаÑÑ‹
+ Comment[km]=សៀវភៅ​អាសយដ្ឋាន​ដែល​មាន​ចំណុច​ប្រទាក់ DCOP
+ Comment[ko]=DCOP ì¸í„°íŽ˜ì´ìŠ¤ë¥¼ 사용하는 주소ë¡
+@@ -54,6 +55,7 @@
+ Comment[tg]=Китоби Ð°Ð´Ñ€ÐµÑ Ð±Ð¾ интерфейÑи DCOP
+ Comment[tr]=DCOP Arayüzü Olan Adres Defteri
+ Comment[uk]=ÐдреÑна книга з інтерфейÑом DCOP
+-Comment[uz]=DCOP интерфейÑли манзиллар дафтари
++Comment[uz]=DCOP interfeysli manzillar daftari
++Comment[uz at cyrillic]=DCOP интерфейÑли манзиллар дафтари
+ Comment[zh_CN]=具有 DCOP 接å£çš„地å€ç°¿
+ Comment[zh_TW]=有 DCOP 介é¢çš„通訊錄
+Index: kaddressbook/kaddressbook.desktop
+===================================================================
+--- kaddressbook/kaddressbook.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/kaddressbook.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -43,6 +43,7 @@
+ GenericName[is]=Vistfangastjóri
+ GenericName[it]=Gestore degli indirizzi
+ GenericName[ja]=アドレスマãƒãƒ¼ã‚¸ãƒ£
++GenericName[ka]=წიგნáƒáƒ™áƒ˜áƒ¡ მმáƒáƒ თველი
+ GenericName[kk]=ÐдреÑтік кітапшаÑÑ‹
+ GenericName[km]=កម្មវិធី​គ្រប់គ្រង​អាសយដ្ឋាន
+ GenericName[lt]=Adresų tvarkyklė
+Index: kaddressbook/csv-templates/kaddressbook.desktop
+===================================================================
+--- kaddressbook/csv-templates/kaddressbook.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/csv-templates/kaddressbook.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -19,6 +19,7 @@
+ Name[hr]=KAdressBook (KDE 3.1)
+ Name[hu]=CÃmjegyzék (KDE 3.1)
+ Name[it]=Rubrica indirizzi (KDE 3.1)
++Name[ka]=წიგნáƒáƒ™áƒ˜ (KDE 3.1)
+ Name[mk]=КÐдреÑар (KDE 3.1)
+ Name[nb]=Adressebok (KDE 3.1)
+ Name[nds]=KAdressbook (KDE 3.1)
+Index: kaddressbook/csv-templates/yahoo.desktop
+===================================================================
+--- kaddressbook/csv-templates/yahoo.desktop.orig 2008-02-13 10:39:42.000000000 +0100
++++ kaddressbook/csv-templates/yahoo.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -32,6 +32,7 @@
+ Name[is]=Yahoo! póstfangaskrá
+ Name[it]=Rubrica indirizzi Yahoo!
+ Name[ja]=Yahoo! アドレス帳
++Name[ka]=წიგნáƒáƒ™áƒ˜ Yahoo!
+ Name[kk]=Yahoo! адреÑтік кітапшаÑÑ‹
+ Name[km]=សៀវភៅ​អាសយដ្ឋាន​របស់​យ៉ាហ៊ូ
+ Name[ko]=Yahoo! 주소ë¡
+@@ -57,7 +58,8 @@
+ Name[tg]=Китоби адреÑии Yahoo!
+ Name[tr]=Yahoo! Adres Defteri
+ Name[uk]=ÐдреÑна книга Yahoo
+-Name[uz]=Yahoo! манзиллар дафтари
++Name[uz]=Yahoo! manzillar daftari
++Name[uz at cyrillic]=Yahoo! манзиллар дафтари
+ Name[zh_CN]=Yahoo! 地å€ç°¿
+ Name[zh_TW]=Yahoo! 通訊錄
+
+Index: kaddressbook/distributionlisteditor_p.h
+===================================================================
+--- kaddressbook/distributionlisteditor_p.h.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/distributionlisteditor_p.h 2008-06-29 20:10:36.000000000 +0200
+@@ -26,8 +26,11 @@
+ #include <libkdepim/addresseelineedit.h>
+ #include <libkdepim/distributionlist.h>
+
++#include <qpushbutton.h>
+ #include <qstring.h>
+
++class QToolButton;
++
+ namespace KABC {
+ class Addressee;
+ class AddressBook;
+@@ -52,7 +55,8 @@
+
+ void setEntry( const KPIM::DistributionList::Entry& entry );
+ KPIM::DistributionList::Entry entry() const;
+-
++ void setFocusToLineEdit();
++
+ signals:
+ void cleared();
+ void textChanged();
+@@ -67,6 +71,7 @@
+ QString m_uid;
+ QString m_initialText;
+ LineEdit* m_lineEdit;
++ QToolButton* m_clearButton;
+ KABC::AddressBook* m_addressBook;
+ };
+
+Index: kaddressbook/views/tableview.desktop
+===================================================================
+--- kaddressbook/views/tableview.desktop.orig 2008-02-13 10:39:42.000000000 +0100
++++ kaddressbook/views/tableview.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Name[is]=Töflusýn
+ Name[it]=Vista tabella
+ Name[ja]=テーブルビュー
++Name[ka]=ცხრილი
+ Name[kk]=КеÑте
+ Name[km]=ទិដ្ឋភាព​ážáž¶ážšáž¶áž„
+ Name[lt]=LentelÄ—s vaizdas
+@@ -55,7 +56,8 @@
+ Name[tg]=Ҷадвал
+ Name[tr]=Tablo Görünümü
+ Name[uk]=ВиглÑд таблицею
+-Name[uz]=Жадвал кўринишида
++Name[uz]=Jadval koʻrinishida
++Name[uz at cyrillic]=Жадвал кўринишида
+ Name[zh_CN]=è¡¨æ ¼è§†å›¾
+ Name[zh_TW]=è¡¨æ ¼æª¢è¦–
+ Type=Service
+Index: kaddressbook/views/iconview.desktop
+===================================================================
+--- kaddressbook/views/iconview.desktop.orig 2007-05-14 09:54:43.000000000 +0200
++++ kaddressbook/views/iconview.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -33,6 +33,7 @@
+ Name[is]=Táknmyndasýn
+ Name[it]=Vista a icone
+ Name[ja]=アイコンビュー
++Name[ka]=ხáƒáƒ¢áƒ£áƒšáƒ”ბის ჩვენებáƒ
+ Name[kk]=Таңбаша
+ Name[km]=ទិដ្ឋភាព​រូបážáŸ†ážŽáž¶áž„
+ Name[lt]=Rodyti piktogramas
+@@ -63,7 +64,8 @@
+ Name[th]=มุมมà¸à¸‡à¹à¸šà¸šà¹„à¸à¸„à¸à¸™
+ Name[tr]=Simge Görünümü
+ Name[uk]=ВиглÑд піктограмами
+-Name[uz]=Ðишонча кўринишида
++Name[uz]=Nishoncha koʻrinishida
++Name[uz at cyrillic]=Ðишонча кўринишида
+ Name[ven]=Mbonalelo ya aikhono
+ Name[vi]=Xem icon
+ Name[xh]=Imboniselo ye Icon
+Index: kaddressbook/views/cardview.desktop
+===================================================================
+--- kaddressbook/views/cardview.desktop.orig 2008-02-13 10:39:42.000000000 +0100
++++ kaddressbook/views/cardview.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Name[is]=Spjaldsýn
+ Name[it]=Vista scheda
+ Name[ja]=カードビュー
++Name[ka]=ბáƒáƒ áƒáƒ—ების ჩვენებáƒ
+ Name[kk]=Визитка
+ Name[km]=ទិដ្ឋភាព​កាáž
+ Name[lt]=KortelÄ—s vaizdas
+Index: kaddressbook/kaddressbook_part.rc
+===================================================================
+--- kaddressbook/kaddressbook_part.rc.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/kaddressbook_part.rc 2008-06-29 20:10:36.000000000 +0200
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui>
+-<kpartgui name="kaddressbook" version="22">
++<kpartgui name="kaddressbook" version="23">
+
+ <MenuBar>
+ <Menu name="file" noMerge="1"><text>&File</text>
+@@ -47,6 +47,8 @@
+ <Action name="view_modify"/>
+ <Action name="view_delete"/>
+ <Separator/>
++ <ActionList name="extensions_list"/>
++ <Separator/>
+ <Action name="view_refresh"/>
+ </Menu>
+
+@@ -56,9 +58,6 @@
+
+ <Menu name="settings" noMerge="1"><text>&Settings</text>
+ <Merge name="StandardToolBarMenuHandler" />
+- <Menu name="show_extensions_menu"><text>Show Extension</text>
+- <ActionList name="extensions_list"/>
+- </Menu>
+ <Action name="options_show_jump_bar"/>
+ <Action name="options_show_details"/>
+ <Action name="options_show_statusbar"/>
+Index: kaddressbook/xxport/kde2_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/kde2_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/kde2_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -26,6 +26,7 @@
+ Name[hu]=KAB KDE2 XXPort bÅ‘vÃtÅ‘modul
+ Name[is]=Ãforrit fyrir KAB KDE2 XXPort
+ Name[ja]=KAB KDE2 インãƒãƒ¼ãƒˆ/プラグイン
++Name[ka]=KAB KDE2-ს ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=KDE2 пішімінен импорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB KDE2 XXPort
+ Name[lt]=KAB KDE2 XXPort priedas
+@@ -73,6 +74,7 @@
+ Comment[is]=Ãforrit til að færa inn gömlu KDE2 vistfangaskrána
+ Comment[it]=Plugin per importare le vecchie voci della rubrica di KDE2
+ Comment[ja]=å¤ã„ KDE 2 アドレス帳をインãƒãƒ¼ãƒˆã™ã‚‹ãƒ—ラグイン
++Comment[ka]=ძველი KDE2-ს წიგნáƒáƒ™áƒ˜áƒ¡ იმპáƒáƒ ტის მáƒáƒ“ული
+ Comment[kk]=ЕÑкі KDE2 адр.кітапшаÑынан импорт ету модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​នាំចូល​សៀវភៅ​អាសយដ្ឋាន KDE 2 ចាស់ៗ
+ Comment[lt]=Priedas senosios KDE 2 adresų knygelės importui
+@@ -96,7 +98,8 @@
+ Comment[tg]=Модул барои воридоти файлҳои китобиадреÑии KDE2
+ Comment[tr]=KDE 2 adres defteri bilgilerini alma eklentisi
+ Comment[uk]=Втулок Ð´Ð»Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ адреÑної книги Ñтарого формату чаÑів KDE 2
+-Comment[uz]=ÐÑки KDE 2 манзиллар дафтарини импорт қилиш учун плагин
++Comment[uz]=Eski KDE 2 manzillar daftarini import qilish uchun plagin
++Comment[uz at cyrillic]=ÐÑки KDE 2 манзиллар дафтарини импорт қилиш учун плагин
+ Comment[zh_CN]=导入旧的 KDE 2 地å€ç°¿çš„æ’件
+ Comment[zh_TW]=匯入舊的 KDE2 通訊錄的外掛程å¼
+ Type=Service
+Index: kaddressbook/xxport/csv_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/csv_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/csv_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[hu]=KAB XXPort bÅ‘vÃtÅ‘modul
+ Name[is]=Ãforrit fyrir KAV CSV XXPort
+ Name[ja]=KAB CSV インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Name[ka]=KAB CSV ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=CSV файлды ÑкÑпорт/импорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB CSV XXPort
+ Name[lt]=KAB CSV XXPort priedas
+@@ -71,6 +72,7 @@
+ Comment[is]=Ãforrit til að flytja tengiliði inn og út à CSV sniði
+ Comment[it]=Plugin per importare ed esportare contatti in formato CSV
+ Comment[ja]=CSV フォーマットã§é€£çµ¡å…ˆã‚’インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒ—ラグイン
++Comment[ka]=კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბის CSV ფáƒáƒ მáƒáƒ¢áƒ˜áƒ— იმპáƒáƒ ტ/ექსპáƒáƒ ტის მáƒáƒ“ული
+ Comment[kk]=Контакттарды CSV пішіміне ÑкÑпорт/импорт ету модулі
+ Comment[km]=កម្មវិធី ជំនួយ​ដើម្បី​នាំចូល និង​នាំចáŸáž‰â€‹áž‘ំនាក់ទំនង​ក្នុង​ទ្រង់ទ្រាយ​ជា CSV ។
+ Comment[lt]=Priedas, skirtas kontaktų eksportui ir importui CSV formatu
+Index: kaddressbook/xxport/vcard_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/vcard_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/vcard_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -26,6 +26,7 @@
+ Name[hu]=KAB vCard XXPort bÅ‘vÃtÅ‘modul
+ Name[is]=Ãforrit fyrir KAB vCard XXPort
+ Name[ja]=KAB vCazrd インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Name[ka]=KAB vCard ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=vCard-Ñ‚Ñ‹ ÑкÑпорт/импорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB vCard XXPort
+ Name[lt]=KAB vCard XXPort priedas
+@@ -74,6 +75,7 @@
+ Comment[is]=Ãforrit til að flytja inn eða út tengiliði à vCard sniði
+ Comment[it]=Plugin per importare ed esportare contatti in formato vCard
+ Comment[ja]=vCard フォーマットã§é€£çµ¡å…ˆã‚’インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒ—ラグイン
++Comment[ka]=კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბის vCard-ის ფáƒáƒ მáƒáƒ¢áƒ˜áƒ— იმპáƒáƒ ტ/ექსპáƒáƒ ტის მáƒáƒ“ული
+ Comment[kk]=vCard пішіміне ÑкÑпорт/импорт ету модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​នាំចូល និង​នាំចáŸáž‰â€‹áž‘ំនាក់ទំនង​ក្នុង​ទ្រង់ទ្រាយ​ជា vCard
+ Comment[lt]=Įskiepis kontaktų importavimui ir eksportavimui vCard formatu
+Index: kaddressbook/xxport/pab_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/pab_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/pab_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -24,6 +24,7 @@
+ Name[hu]=KAB XXPort bÅ‘vÃtÅ‘modul MS Exchange személyes cÃmjegyzékekhez
+ Name[is]=Ãforrit fyrir KAB MS Exchange Personal Addressbook XXPort
+ Name[ja]=KAB MS Exchange パーソナルアドレス帳インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Name[ka]= MS Exchange-ის პერსáƒáƒœáƒáƒšáƒ£áƒ ი წიგნáƒáƒ™áƒ˜áƒ¡ ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=MS Exchange адреÑтік кітапшаÑына ÑкÑпорт/импорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB MS Exchange Personal Addressbook XXPort
+ Name[lt]=KAB MS Exchange asmeninės adresų knygelės XXPort priedas
+@@ -72,6 +73,7 @@
+ Comment[is]=Ãforrit til að flytja tengiliði à eða úr MS Exchange Personal Address Book
+ Comment[it]=Plugin per importare rubriche personali da MS Exchange
+ Comment[ja]=MS Exchange パーソナルアドレス帳をインãƒãƒ¼ãƒˆã™ã‚‹ãƒ—ラグイン
++Comment[ka]=MS Exchange-ის პერსáƒáƒœáƒáƒšáƒ£áƒ ი წიგნáƒáƒ™áƒ˜áƒ¡ იმპáƒáƒ ტის მáƒáƒ“ული
+ Comment[kk]=MS Exchange адреÑтік кітапшаÑына ÑкÑпорт/импорт ету модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​នាំចូល​សៀវភៅ​អាសយដ្ឋាន​ផ្ទាល់​ážáŸ’លួន​របស់ MS Exchange
+ Comment[lt]=Priedas leidžiantis importuoti MS Exchange asmenines adresų knygeles
+Index: kaddressbook/xxport/opera_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/opera_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/opera_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[hu]=KAB Opera XXPort bÅ‘vÃtÅ‘modul
+ Name[is]=Ãforrit fyrir KAP Opera XXPort
+ Name[ja]=KAB Opera インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Name[ka]=KAB Opera-ს ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=Opera пішіміне ÑкÑпорт/импорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB Opera XXPort
+ Name[lt]=KAB Opera XXPort priedas
+@@ -72,6 +73,7 @@
+ Comment[is]=Ãforrit til flytja inn eða út Opera tengiliði
+ Comment[it]=Plugin per importare contatti da Opera
+ Comment[ja]=Opera ã®é€£çµ¡å…ˆã‚’インãƒãƒ¼ãƒˆã™ã‚‹ãƒ—ラグイン
++Comment[ka]=Opera-ს კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბის იმპáƒáƒ ტის მáƒáƒ“ული
+ Comment[kk]=Opera контактарын ÑкÑпорт/импорт ету модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​នាំចូល​ទំនាក់ទំនង​របស់ Opera
+ Comment[lt]=Priedas Opera kontaktų importui
+Index: kaddressbook/xxport/gnokii_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/gnokii_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/gnokii_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[is]=Ãforrit fyrir KAB farsÃma XXPort
+ Name[it]=Plugin KAB telefono cellulare XXPort
+ Name[ja]=KAB æºå¸¯é›»è©±ã‚¤ãƒ³ãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Name[ka]=KAB მáƒáƒ‘ილურტელეფáƒáƒœáƒ—áƒáƒœ ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=Қалта телефонға ÑкÑпорт/импорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB Mobile Phone XXPort
+ Name[lt]=KAB mobilaus telefono XXPort priedas
+@@ -72,6 +73,7 @@
+ Comment[is]=Ãforrit til að færa tengilið milli póstfangaskrár og farsÃma
+ Comment[it]=Plugin per importare ed esportare voci della rubrica da un telefono cellulare
+ Comment[ja]=アドレス帳ã®ã‚¨ãƒ³ãƒˆãƒªã‚’インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆã™ã‚‹æºå¸¯é›»è©±ç”¨ãƒ—ラグイン
++Comment[ka]=მáƒáƒ‘ილური ტელეფáƒáƒœáƒ˜áƒ¡ მáƒáƒ“ული წიგნáƒáƒ™áƒ˜áƒ¡ ელემენტების იმპáƒáƒ ტ/ექსპáƒáƒ ტისáƒáƒ—ვის
+ Comment[kk]=Қалта телефонға адр. кітапша жазуын ÑкÑпорт/импорт ету модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ទូរសáŸáž–្ទ​ចលáŸážâ€‹ážŠáž¾áž˜áŸ’បី​នាំចូល និង​នាំចáŸáž‰â€‹áž’ាážáž»â€‹ážŸáŸ€ážœáž—ៅ​អាសយដ្ឋាន
+ Comment[lt]=Priedas skirtas importuoti ir eksportuoti adresų knygelės įrašus į mobiliuosius telefonus
+Index: kaddressbook/xxport/bookmark_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/bookmark_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/bookmark_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[hu]=KAB könyvjelzÅ‘kezelÅ‘ XXPort bÅ‘vÃtÅ‘modul
+ Name[is]=Ãforrit fyrir KAB XXPort bókarmerki
+ Name[ja]=KAB ブックマーク インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Name[ka]=KAB სáƒáƒœáƒ˜áƒ¨áƒœáƒ”ების ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=Бетбелгіні ÑкÑпорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB Bookmark XXPort
+ Name[lt]=KAB žymelių XXPort priedas
+@@ -72,6 +73,7 @@
+ Comment[is]=Ãforrit til að skrá vefföng tengiliða sem bókarmerki
+ Comment[it]=Plugin per esportare come segnalibro gli indirizzi web dei contatti
+ Comment[ja]=連絡先ã®ã‚¦ã‚§ãƒ–アドレスをブックマークã¨ã—ã¦ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã™ã‚‹ãƒ—ラグイン
++Comment[ka]= კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბის ვებ-მისáƒáƒ›áƒáƒ თების სáƒáƒœáƒ˜áƒ¨áƒœáƒ”ებáƒáƒ“ ექსპáƒáƒ ტის მáƒáƒ“ული
+ Comment[kk]=Контакттың веб адреÑтерін бетбелгіге ÑкÑпорттау модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​នាំចáŸáž‰â€‹áž¢áž¶ážŸáž™ážŠáŸ’ឋាន​បណ្ដាញ​របស់​ទំនាក់ទំនង ជា​ចំណាំ
+ Comment[lt]=Priedas skirtas žiniatinklio adresų kontaktuose eksportavimui į žymeles
+Index: kaddressbook/xxport/ldif_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/ldif_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/ldif_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -26,6 +26,7 @@
+ Name[hu]=KAB LDIF XXPort bÅ‘vÃtÅ‘modul
+ Name[is]=Ãforrit fyrir KAB LDIF XXPort
+ Name[ja]=KAB LDIF インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Name[ka]=KAB LDIF-ის ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=LDIF пішіміне ÑкÑпорт/импорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB LDIF XXPort
+ Name[lt]=KAB LDIF XXPort priedas
+@@ -74,6 +75,7 @@
+ Comment[is]=Ãforrit sem flytur flytja inn eða út tengiliði à Netscape og Mozilla LDIF sniði
+ Comment[it]=Plugin per importare ed esportare contatti in formato Netscape e Mozilla LDIF
+ Comment[ja]=Netscape 㨠Mozilla ã® LDIF フォーマットã§é€£çµ¡å…ˆã‚’インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒ—ラグイン
++Comment[ka]= Netscape-სრდრMozilla-ს კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბის იმპáƒáƒ ტ/ექსპáƒáƒ ტის მáƒáƒ“ული LDIF ფáƒáƒ მáƒáƒ¢áƒ˜áƒ—
+ Comment[kk]=Netscape пен Mozilla LDIF пішіміне ÑкÑпорт/импорт ету модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​នាំចូល និង​នាំចáŸáž‰â€‹áž‘ំនាក់ទំនង​ក្នុង​ទ្រង់ទ្រាយ​ជា Netscape áž“áž·áž„ Mozilla LDIF
+ Comment[lt]=Priedas, skirtas kontaktų importavimui ir eksportavimui Netscape ir Mozilla LDIFF formatu
+Index: kaddressbook/xxport/eudora_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/eudora_xxport.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/xxport/eudora_xxport.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[hu]=KAB Eudora XXPort bÅ‘vÃtÅ‘modul
+ Name[is]=Ãforrit fyrir KAB Eudora XXPort
+ Name[ja]=KAB Eudora インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
++Name[ka]= KAB Eudora-სთáƒáƒœ ექსპáƒáƒ ტის მáƒáƒ“ული
+ Name[kk]=Eudora-ға ÑкÑпорт/импорт ету
+ Name[km]=កម្មវិធី​ជំនួយ KAB Eudora XXPort
+ Name[lt]=KAB Eudora XXPort priedas
+@@ -72,6 +73,7 @@
+ Comment[is]=Ãforrit til að flytja inn og út Eudora tengiliði
+ Comment[it]=Plugin importare ed esportare contatti Eudora
+ Comment[ja]=Eudora ã®é€£çµ¡å…ˆã‚’インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒ—ラグイン
++Comment[ka]=Eudora-ს კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბის იმპáƒáƒ ტ/ექსპáƒáƒ ტის მáƒáƒ“ული
+ Comment[kk]=Eudora контакттарды ÑкÑпорт/импорт ету модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​នាំចូល និង​នាំចáŸáž‰â€‹áž‘ំនាក់ទំនង​របស់ Eudora
+ Comment[lt]=Priedas Eudora kontaktų importui ir eksportui
+Index: kaddressbook/editors/protocols/jabberprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/jabberprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/jabberprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -31,6 +31,7 @@
+ Comment[is]=Jabber samskiptamátinn
+ Comment[it]=Protocollo Jabber
+ Comment[ja]=Jabber プãƒãƒˆã‚³ãƒ«
++Comment[ka]=Jabber áƒáƒ¥áƒ›áƒ˜
+ Comment[kk]=Jabber протоколы
+ Comment[km]=ពិធីការ Jabber
+ Comment[lt]=Jabber protokolas
+Index: kaddressbook/editors/protocols/aimprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/aimprotocol.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/editors/protocols/aimprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -30,6 +30,7 @@
+ Comment[is]=AIM samskiptamátinn
+ Comment[it]=Protocollo AIM
+ Comment[ja]=AIM プãƒãƒˆã‚³ãƒ«
++Comment[ka]=AIM áƒáƒ¥áƒ›áƒ˜
+ Comment[kk]=AIM протоколы
+ Comment[km]=ពិធីការ AIM
+ Comment[ko]=AIM í”„ë¡œí† ì½œ
+Index: kaddressbook/editors/protocols/meanwhileprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/meanwhileprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/meanwhileprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -30,6 +30,7 @@
+ Comment[is]=Meanwhile samskiptamátinn
+ Comment[it]=Protocollo Meanwhile
+ Comment[ja]=Meanwhile プãƒãƒˆã‚³ãƒ«
++Comment[ka]=Meanwhile áƒáƒ¥áƒ›áƒ˜
+ Comment[kk]=Meanwhile протоколы
+ Comment[km]=ពិធីការ Meanwhile
+ Comment[lt]=Meanwhile protokolas
+Index: kaddressbook/editors/protocols/skypeprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/skypeprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/skypeprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Comment[is]=Skype Internet sÃmi
+ Comment[it]=Telefonia internet Skype
+ Comment[ja]=Skype インターãƒãƒƒãƒˆé›»è©±
++Comment[ka]=Skype ინტერნეტ ტელეფáƒáƒœáƒ˜
+ Comment[kk]=Skype Интернет телефониÑÑÑ‹
+ Comment[km]=ទូរសáŸáž–្ទ​ážáž¶áž˜â€‹áž¢áŸŠáž¸áž“ធឺណិážâ€‹ážŠáŸ„យ​ប្រើ Skype
+ Comment[lt]=Skype Interneto telefonija
+Index: kaddressbook/editors/protocols/icqprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/icqprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/icqprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -30,6 +30,7 @@
+ Comment[is]=ICQ samskiptamátinn
+ Comment[it]=Protocollo ICQ
+ Comment[ja]=ICQ プãƒãƒˆã‚³ãƒ«
++Comment[ka]=ICQ áƒáƒ¥áƒ›áƒ˜
+ Comment[kk]=ICQ протоколы
+ Comment[km]=ពិធីការ ICQ
+ Comment[lt]=ICQ protokolas
+Index: kaddressbook/editors/protocols/ircprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/ircprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/ircprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -10,6 +10,7 @@
+ Comment[hu]=IRC (Internet Relay Chat)
+ Comment[is]=Internet spjall
+ Comment[ja]=インターãƒãƒƒãƒˆãƒªãƒ¬ãƒ¼ãƒãƒ£ãƒƒãƒˆ
++Comment[ka]=IRC
+ Comment[kk]=Internet Relay Chat хабарлаÑу
+ Comment[km]=ជជែក​កំសាន្ážâ€‹ážáž¶áž˜áž¢áŸŠáž¸áž“ធឺណិáž
+ Comment[lt]=Estafetinis Interneto pokalbis
+Index: kaddressbook/editors/protocols/msnprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/msnprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/msnprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -13,6 +13,7 @@
+ Comment[fr]=Messagerie MSN
+ Comment[is]=MSN spjallforritið
+ Comment[ja]=MSN メッセンジャー
++Comment[ka]=MSN შიკრიკი
+ Comment[km]=កម្មវិធី​ផ្ញើ​សារ MSN
+ Comment[nds]=MSN-Kortnarichtenmaker
+ Comment[ne]=à¤à¤®à¤à¤¸à¤à¤¨ मà¥à¤¯à¤¾à¤¸à¥‡à¤¨à¥à¤œà¤°
+@@ -25,6 +26,7 @@
+ Name[eo]=MSN MesaÄilo
+ Name[fa]=پیام‌رسان MSN
+ Name[ja]=MSN メッセンジャー
++Name[ka]=MSN შიკრიკი
+ Name[km]=កម្មវិធី​ផ្ញើសារ MSN
+ Name[nds]=MSN-Kortnarichtenmaker
+ Name[ne]=à¤à¤®à¤à¤¸à¤à¤¨ मà¥à¤¯à¤¾à¤¸à¥‡à¤¨à¥à¤œà¤°
+Index: kaddressbook/editors/protocols/yahooprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/yahooprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/yahooprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -31,6 +31,7 @@
+ Comment[is]=Yahoo samskiptamátinn
+ Comment[it]=Protocollo Yahoo
+ Comment[ja]=Yahoo プãƒãƒˆã‚³ãƒ«
++Comment[ka]=Yahoo áƒáƒ¥áƒ›áƒ˜
+ Comment[kk]=Yahoo протоколы
+ Comment[km]=ពិធីការ​យ៉ាហ៊ូ
+ Comment[lt]=Yahoo protokolas
+Index: kaddressbook/editors/protocols/gaduprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/gaduprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/gaduprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -31,6 +31,7 @@
+ Comment[is]=Gadu-Gadu samskiptamátinn
+ Comment[it]=Protocollo Gadu-Gadu
+ Comment[ja]=Gadu-Gadu プãƒãƒˆã‚³ãƒ«
++Comment[ka]=Gadu-Gadu áƒáƒ¥áƒ›áƒ˜
+ Comment[kk]=Gadu-Gadu протоколы
+ Comment[km]=ពិធីការ Gadu-Gadu
+ Comment[lt]=Gadu-Gadu protokolas
+Index: kaddressbook/editors/protocols/smsprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/smsprotocol.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/editors/protocols/smsprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -30,6 +30,7 @@
+ Comment[is]=SMS samskiptamátinn
+ Comment[it]=Protocollo SMS
+ Comment[ja]=SMS プãƒãƒˆã‚³ãƒ«
++Comment[ka]= SMS áƒáƒ¥áƒ›áƒ˜
+ Comment[kk]=SMS протоколы
+ Comment[km]=ពិធីការ​សáŸážœáž¶â€‹ážŸáž¶ážšâ€‹ážáŸ’លីៗ
+ Comment[lt]=SMS protokolas
+Index: kaddressbook/editors/protocols/groupwiseprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/groupwiseprotocol.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/editors/protocols/groupwiseprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -19,6 +19,7 @@
+ Comment[he]=×ž×¡× ×’'ר של Novell GroupWise
+ Comment[is]=Novell GroupWise Samskiptatólið
+ Comment[ja]=Novell GroupWise メッセンジャー
++Comment[ka]= Novell GroupWise მყისიერი შეტყáƒáƒ‘ინებების მáƒáƒªáƒœáƒ”
+ Comment[kk]=Novell GroupWise хабарлаÑу
+ Comment[km]=កម្មវិធី​ផ្ញើ​សារ​របស់​ណូវែល - GroupWise
+ Comment[lt]=Novell GroupWise momentinių žinuÄių klientas
+Index: kaddressbook/editors/cryptosettings.desktop
+===================================================================
+--- kaddressbook/editors/cryptosettings.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/editors/cryptosettings.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[is]=Stillingar dulritunar
+ Name[it]=Preferenze crittografia
+ Name[ja]=æš—å·ã®è¨å®š
++Name[ka]=დáƒáƒ¨áƒ˜áƒ¤áƒ ვის პáƒáƒ áƒáƒ›áƒ”ტრები
+ Name[kk]=Шифрлау параметрлері
+ Name[km]=ចំណង់​ចំណូល​ចិážáŸ’áž Crypto
+ Name[ko]=암호화 ì„¤ì •
+Index: kaddressbook/editors/imaddresseditor.desktop
+===================================================================
+--- kaddressbook/editors/imaddresseditor.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/editors/imaddresseditor.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=Skilaboðaforrit
+ Name[it]=Messaggistica istantanea
+ Name[ja]=インスタントメッセージ
++Name[ka]=მყისიერი შეტყáƒáƒ‘ინებები
+ Name[kk]=Лезде хабарлаÑу
+ Name[km]=ផ្ញើ​សារ​បន្ទាន់
+ Name[ko]=ì¸ìŠ¤í„´íŠ¸ 페시징
+@@ -45,7 +46,8 @@
+ Name[tg]=Хизматгоҳи мубодилаи иттилоот
+ Name[tr]=Hızlı Mesajlaşma
+ Name[uk]=Миттєвий зв'Ñзок
+-Name[uz]=Хабар алмашиш
++Name[uz]=Xabar almashish
++Name[uz at cyrillic]=Хабар алмашиш
+ Name[zh_CN]=å³æ—¶é€šè®¯
+ Name[zh_TW]=å³æ™‚通訊
+ Comment=Instant Messaging Address Editor
+@@ -71,6 +73,7 @@
+ Comment[is]=Vistfangaritill fyrir skilaboðaforrit
+ Comment[it]=Editor degli indirizzi per messaggi istantanei
+ Comment[ja]=インスタントメッセージã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’編集
++Comment[ka]=მყისიერი შეტყáƒáƒ‘ინებების წიგნáƒáƒ™áƒ˜áƒ¡ რედáƒáƒ¥áƒ¢áƒáƒ ი
+ Comment[kk]=Лезде хабарлаÑу адреÑтер өңдегіші
+ Comment[km]=កម្មវិធី​និពន្ធ​អាសយដ្ឋាន​ដើម្បី​ផ្ញើ​សារ​បន្ទាន់
+ Comment[ko]=ì¸ìŠ¤í„´íŠ¸ 메시징 주소 편집기
+Index: kaddressbook/editors/kaddressbookimprotocol.desktop
+===================================================================
+--- kaddressbook/editors/kaddressbookimprotocol.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/editors/kaddressbookimprotocol.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[is]=KAddressbook skilaboðaforritið
+ Name[it]=KAddressbook protocollo messaggistica istantanea
+ Name[ja]=KAddressbook インスタントメッセージプãƒãƒˆã‚³ãƒ«
++Name[ka]=KDE áƒáƒ¥áƒ›áƒ˜ მყისიერი შეტყáƒáƒ‘ინებებისáƒáƒ—ვისწიგნáƒáƒ™áƒ˜áƒ—ვის
+ Name[kk]=KAddressbook лезде хабарлаÑу протоколы
+ Name[km]=ពិធីការ​ផ្ញើសារ​បន្ទាន់​របស់ KAddressbook
+ Name[ko]=KAddressbook ì¸ìŠ¤í„´íŠ¸ 메시징 í”„ë¡œí† ì½œ
+Index: kaddressbook/kabcore.cpp
+===================================================================
+--- kaddressbook/kabcore.cpp.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/kabcore.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -224,6 +224,9 @@
+ }
+ mDetailsSplitter->setSizes( splitterSize );
+
++ const QValueList<int> leftSplitterSizes = KABPrefs::instance()->leftSplitter();
++ if ( !leftSplitterSizes.isEmpty() )
++ mLeftSplitter->setSizes( leftSplitterSizes );
+ }
+
+ void KABCore::saveSettings()
+@@ -231,7 +234,8 @@
+ KABPrefs::instance()->setJumpButtonBarVisible( mActionJumpBar->isChecked() );
+ KABPrefs::instance()->setDetailsPageVisible( mActionDetails->isChecked() );
+ KABPrefs::instance()->setDetailsSplitter( mDetailsSplitter->sizes() );
+-
++ KABPrefs::instance()->setLeftSplitter( mLeftSplitter->sizes() );
++
+ mExtensionManager->saveSettings();
+ mViewManager->saveSettings();
+
+@@ -1094,18 +1098,23 @@
+ SLOT( incrementalTextSearch( const QString& ) ) );
+
+ mDetailsSplitter = new QSplitter( mWidget );
++
++ mLeftSplitter = new QSplitter( mDetailsSplitter );
++ mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? Qt::Vertical : Qt::Horizontal );
++
+ topLayout->addWidget( searchTB );
+ topLayout->addWidget( mDetailsSplitter );
+-
++
+ mDetailsStack = new QWidgetStack( mDetailsSplitter );
+- mExtensionManager = new ExtensionManager( new QWidget( mDetailsSplitter ), mDetailsStack, this, this );
++ mExtensionManager = new ExtensionManager( new QWidget( mLeftSplitter ), mDetailsStack, this, this );
+ connect( mExtensionManager, SIGNAL( detailsWidgetDeactivated( QWidget* ) ),
+ this, SLOT( deactivateDetailsWidget( QWidget* ) ) );
+ connect( mExtensionManager, SIGNAL( detailsWidgetActivated( QWidget* ) ),
+ this, SLOT( activateDetailsWidget( QWidget* ) ) );
+-
+
+- QWidget *viewWidget = new QWidget( mDetailsSplitter );
++ QWidget *viewWidget = new QWidget( mLeftSplitter );
++ if ( KABPrefs::instance()->contactListAboveExtensions() )
++ mLeftSplitter->moveToFirst( viewWidget );
+ QVBoxLayout *viewLayout = new QVBoxLayout( viewWidget );
+ viewLayout->setSpacing( KDialog::spacingHint() );
+
+@@ -1544,7 +1553,7 @@
+ return;
+ QGuardedPtr<KPIM::DistributionListEditor::EditorWidget> dlg = new KPIM::DistributionListEditor::EditorWidget( addressBook(), widget() );
+ dlg->setDistributionList( dist );
+- if ( dlg->exec() == QDialog::Accepted ) {
++ if ( dlg->exec() == QDialog::Accepted && dlg ) {
+ const KPIM::DistributionList newDist = dlg->distributionList();
+ if ( newDist != dist ) {
+ addressBook()->insertAddressee( newDist );
+Index: kaddressbook/distributionlisteditor.cpp
+===================================================================
+--- kaddressbook/distributionlisteditor.cpp.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/distributionlisteditor.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -56,7 +56,7 @@
+ QVBoxLayout* addresseeLayout;
+ QValueList<KPIM::DistributionListEditor::Line*> addressees;
+ KPIM::DistributionList distributionList;
+- void addLineForEntry( const KPIM::DistributionList::Entry& entry );
++ KPIM::DistributionListEditor::Line* addLineForEntry( const KPIM::DistributionList::Entry& entry );
+ int lastLineId;
+ };
+
+@@ -70,21 +70,26 @@
+ connect( m_lineEdit, SIGNAL( textChanged( const QString& ) ),
+ this, SLOT( textChanged( const QString& ) ) );
+ layout->addWidget( m_lineEdit );
+- QToolButton *button = new QToolButton( this );
+- button->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
+-
+-
+- layout->addWidget( button );
+- connect( button, SIGNAL( clicked() ), m_lineEdit, SLOT( clear() ) );
++ m_clearButton = new QToolButton( this );
++ m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
++ m_clearButton->setEnabled( false );
++ layout->addWidget( m_clearButton );
++ connect( m_clearButton, SIGNAL( clicked() ), m_lineEdit, SLOT( clear() ) );
+ }
+
+ void KPIM::DistributionListEditor::Line::textChanged( const QString& text )
+ {
++ m_clearButton->setEnabled( !text.isEmpty() );
+ if ( text.isEmpty() )
+ emit cleared();
+ emit textChanged();
+ }
+
++void KPIM::DistributionListEditor::Line::setFocusToLineEdit()
++{
++ m_lineEdit->setFocus();
++}
++
+ void KPIM::DistributionListEditor::Line::setEntry( const KPIM::DistributionList::Entry& entry )
+ {
+ m_uid = entry.addressee.uid();
+@@ -155,13 +160,12 @@
+ this, SLOT( lineTextChanged( int ) ) );
+ setCaption( i18n( "Edit Distribution List" ) );
+ QWidget* main = new QWidget( this );
+- QGridLayout* mainLayout = new QGridLayout( main );
++ QVBoxLayout* mainLayout = new QVBoxLayout( main );
+ mainLayout->setMargin( KDialog::marginHint() );
+ mainLayout->setSpacing( KDialog::spacingHint() );
+
+ QHBoxLayout* nameLayout = new QHBoxLayout;
+ nameLayout->setSpacing( KDialog::spacingHint() );
+-
+ d->nameLabel = new QLabel( main );
+ d->nameLabel->setText( i18n( "Name:" ) );
+ nameLayout->addWidget( d->nameLabel );
+@@ -169,15 +173,16 @@
+ d->nameLineEdit = new KLineEdit( main );
+ nameLayout->addWidget( d->nameLineEdit );
+
+- mainLayout->addLayout( nameLayout, 0, 0 );
++ mainLayout->addLayout( nameLayout );
++ mainLayout->addSpacing( 30 );
+
+ d->memberListLabel = new QLabel( main );
+ d->memberListLabel->setText( i18n( "Distribution list members:" ) );
+- mainLayout->addWidget( d->memberListLabel, 1, 0 );
++ mainLayout->addWidget( d->memberListLabel );
+
+ d->scrollView = new QScrollView( main );
+ d->scrollView->setFrameShape( QFrame::NoFrame );
+- mainLayout->addWidget( d->scrollView, 2, 0 );
++ mainLayout->addWidget( d->scrollView );
+ d->memberListWidget = new QWidget( d->scrollView->viewport() );
+ d->memberListWidget->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding );
+ QVBoxLayout* memberLayout = new QVBoxLayout( d->memberListWidget );
+@@ -190,7 +195,9 @@
+
+ setMainWidget( main );
+
+- d->addLineForEntry( KPIM::DistributionList::Entry() );
++ KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( KPIM::DistributionList::Entry() );
++ const QSize hint = sizeHint();
++ resize( hint.width() * 1.5, hint.height() );
+ }
+
+ KPIM::DistributionListEditor::EditorWidget::~EditorWidget()
+@@ -226,10 +233,11 @@
+ {
+ d->addLineForEntry( *it );
+ }
+- d->addLineForEntry( Entry() );
++ KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( Entry() );
++ last->setFocusToLineEdit();
+ }
+
+-void KPIM::DistributionListEditor::EditorWidgetPrivate::addLineForEntry( const KPIM::DistributionList::Entry& entry )
++KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPrivate::addLineForEntry( const KPIM::DistributionList::Entry& entry )
+ {
+ KPIM::DistributionListEditor::Line* line = new KPIM::DistributionListEditor::Line( addressBook, memberListWidget );
+ line->setEntry( entry );
+@@ -239,6 +247,7 @@
+ mapper, SLOT( map() ) );
+ mapper->setMapping( line, ++lastLineId );
+ line->setShown( true );
++ return line;
+ }
+
+ void KPIM::DistributionListEditor::EditorWidget::slotOk()
+Index: kaddressbook/kaddressbook_view.desktop
+===================================================================
+--- kaddressbook/kaddressbook_view.desktop.orig 2007-10-08 11:50:46.000000000 +0200
++++ kaddressbook/kaddressbook_view.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Comment[is]=KAddressbook birtingar Ãforrit
+ Comment[it]=Plugin visualizzazione di KAddressbook
+ Comment[ja]=Addressbook ビュープラグイン
++Comment[ka]= KDE წიგნáƒáƒ™áƒ˜áƒ¡ ჩვენების მáƒáƒ“ული
+ Comment[kk]=ÐдреÑтік кітапшаÑын қарау модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ទិដ្ឋភាព​របស់ KAddressBook
+ Comment[lt]=KAddressBook peržiūros priedas
+Index: kaddressbook/kcmconfigs/kabcustomfields.desktop
+===================================================================
+--- kaddressbook/kcmconfigs/kabcustomfields.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/kcmconfigs/kabcustomfields.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -38,6 +38,7 @@
+ Name[is]=Sérsniðnar sÃður
+ Name[it]=Pagine personalizzate
+ Name[ja]=カスタムページ
++Name[ka]=სáƒáƒ›áƒáƒ›áƒ®áƒ›áƒáƒ ებლრგვერდები
+ Name[kk]=ҚоÑымша парақтар
+ Name[km]=ទំពáŸážšâ€‹áž•áŸ’ទាល់​ážáŸ’លួន
+ Name[lt]=Pasirinkti puslapiai
+@@ -89,6 +90,7 @@
+ Comment[is]=Stilla sérsniðnu sÃðurnar
+ Comment[it]=Configura le pagine personalizzate
+ Comment[ja]=カスタムページã®è¨å®š
++Comment[ka]=სáƒáƒ›áƒáƒ›áƒ®áƒ›áƒáƒ ებლრგვერდების კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=ҚоÑымша парақтарды баптау
+ Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ទំពáŸážšâ€‹áž•áŸ’ទាល់​ážáŸ’លួន
+ Comment[lt]=KonfigÅ«ruoti darbastalių skaiÄių ir pavadinimus
+@@ -136,6 +138,7 @@
+ Keywords[is]=kaddressbook, stillingar, stilla, sérsniðnir reitir
+ Keywords[it]=kaddressbook, configura, impostazioni, campi personalizzati
+ Keywords[ja]=kaddressbookã€è¨å®šã€è¨å®š,カスタムフィールド
++Keywords[ka]=kaddressbook,კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ,პáƒáƒ áƒáƒ›áƒ”ტრები,სáƒáƒ›áƒáƒ›áƒ®áƒ›áƒáƒ ებლრველები
+ Keywords[km]=kaddressbook,កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ,ការ​កំណážáŸ‹,វាល​ផ្ទាល់​ážáŸ’លួន
+ Keywords[lt]=kaddressbook, configure, settings, custom fields, pasirinkti laukai,konfigūruoti, nustatymai
+ Keywords[mk]=kaddressbook, configure, settings, custom fields, КÐдреÑар, конфигурација, конфигурирање, ÑопÑтвени полиња
+Index: kaddressbook/kcmconfigs/kabconfig.desktop
+===================================================================
+--- kaddressbook/kcmconfigs/kabconfig.desktop.orig 2007-10-08 11:50:45.000000000 +0200
++++ kaddressbook/kcmconfigs/kabconfig.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -37,6 +37,7 @@
+ Name[is]=Almennt
+ Name[it]=Generale
+ Name[ja]=全般
++Name[ka]=ზáƒáƒ’áƒáƒ“ი
+ Name[kk]=Жалпы
+ Name[km]=ទូទៅ
+ Name[lt]=Bendras
+@@ -62,7 +63,8 @@
+ Name[th]=ทั่วไป
+ Name[tr]=Genel
+ Name[uk]=Загальні
+-Name[uz]=Умумий
++Name[uz]=Umumiy
++Name[uz at cyrillic]=Умумий
+ Name[zh_CN]=常规
+ Comment=Configure the Address Book
+ Comment[af]=Stel die adres boek op
+@@ -93,6 +95,7 @@
+ Comment[is]=Stilla vistfangaskrána
+ Comment[it]=Configura la rubrica indirizzi
+ Comment[ja]=アドレス帳è¨å®š
++Comment[ka]=წიგნáƒáƒ™áƒ˜áƒ¡ კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=ÐдреÑтік кітапшаны баптау
+ Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​សៀវភៅ​អាសយដ្ឋាន
+ Comment[lt]=Konfigūruoti adresų knygelę
+@@ -118,7 +121,8 @@
+ Comment[tg]=Танзимоти китоби адреÑ
+ Comment[tr]=Adres Defterini Yapılandır
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð´Ñ€ÐµÑної книги
+-Comment[uz]=Манзиллар дафтарини моÑлаш
++Comment[uz]=Manzillar daftarini moslash
++Comment[uz at cyrillic]=Манзиллар дафтарини моÑлаш
+ Comment[zh_CN]=é…置地å€ç°¿
+ Comment[zh_TW]=è¨å®šé€šè¨ŠéŒ„
+ Keywords=kaddressbook, configure, settings
+@@ -148,6 +152,7 @@
+ Keywords[is]=kaddressbook, stillingar, stilla
+ Keywords[it]=kaddressbook, configura, impostazioni
+ Keywords[ja]=kaddressbook è¨å®š
++Keywords[ka]=kaddressbook,კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ, პáƒáƒ áƒáƒ›áƒ”ტრები
+ Keywords[km]=kaddressbook,កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ,ការ​កំណážáŸ‹
+ Keywords[lt]=kaddressbook, configure, settings, konfigūravimas, nustatymai
+ Keywords[mk]=kaddressbook, configure, settings, КÐдреÑар, конфигурирање, конфигурација, поÑтавување
+@@ -171,5 +176,6 @@
+ Keywords[tg]=kaddressbook,китоби адреÑ,танзимот
+ Keywords[tr]=kadresdefteri, yapılandırma, ayarlar
+ Keywords[uk]=kaddressbook, налаштуваннÑ, параметри
+-Keywords[uz]=kaddressbook, моÑлаш, моÑламалар, манзиллар дафтари
++Keywords[uz]=kaddressbook, moslash, moslamalar, manzillar daftari
++Keywords[uz at cyrillic]=kaddressbook, моÑлаш, моÑламалар, манзиллар дафтари
+ Keywords[zh_CN]=kaddressbook, configure, settings, é…ç½®, 设置
+Index: kaddressbook/kcmconfigs/kabldapconfig.desktop
+===================================================================
+--- kaddressbook/kcmconfigs/kabldapconfig.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/kcmconfigs/kabldapconfig.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -39,6 +39,7 @@
+ Name[is]=LDAP uppfletting
+ Name[it]=Ricerca LDAP
+ Name[ja]=LDAP 検索
++Name[ka]= ძებნრLDAP-ში
+ Name[kk]=LDAP іздеу
+ Name[km]=ស្វែងរក LDAP
+ Name[lt]=LDAP paieška
+@@ -89,6 +90,7 @@
+ Comment[is]=Breyta LDAP stillingum vistfangaskráarinnar
+ Comment[it]=Configurare le impostazioni LDAP della rubrica indirizzi
+ Comment[ja]=アドレス帳 LDAP è¨å®š
++Comment[ka]=LDAP წიგნáƒáƒ™áƒ˜áƒ¡ პáƒáƒ áƒáƒ›áƒ”ტრების კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=ÐдреÑтік кітапшаның LDAP параметрлерін баптау
+ Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ការ​កំណážáŸ‹ LDAP របស់​សៀវភៅ​អាសយដ្ឋាន
+ Comment[lt]=Konfigūruoti adresų knygelės LDAP nustatymus
+@@ -112,7 +114,8 @@
+ Comment[tg]=Танзимоти Ñерверҳои LDAP-и китоби адреÑ
+ Comment[tr]=Adres Defteri LDAP Ayarlarını Yapılandır
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð² LDAP Ð´Ð»Ñ Ð°Ð´Ñ€ÐµÑної книги
+-Comment[uz]=LDAP манзиллар дафтарини моÑлаш
++Comment[uz]=LDAP manzillar daftarini moslash
++Comment[uz at cyrillic]=LDAP манзиллар дафтарини моÑлаш
+ Comment[zh_CN]=é…置地å€ç°¿ LDAP 设置
+ Comment[zh_TW]=è¨å®šé€šè¨ŠéŒ„ LDAP è¨å®š
+ Keywords=kaddressbook, configure, settings, LDAP
+@@ -140,6 +143,7 @@
+ Keywords[is]=kaddressbook, stillingar, stilla, LDAP
+ Keywords[it]=kaddressbook, configura, impostazioni, LDAP
+ Keywords[ja]=kaddressbook LDAP è¨å®š
++Keywords[ka]=kaddressbook,კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ,პáƒáƒ áƒáƒ›áƒ”ტრები, LDAP
+ Keywords[km]=kaddressbook,កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ,ការ​កំណážáŸ‹,LDAP
+ Keywords[lt]=kaddressbook, configure, settings, LDAP, nustatymai, konfigūruoti
+ Keywords[mk]=kaddressbook, configure, settings, LDAP, кадреÑар, конфигурација, конфигурирање, поÑтавувања
+@@ -163,5 +167,6 @@
+ Keywords[tg]=kaddressbook, configure, settings, LDAP, китоби адреÑ, танзимот
+ Keywords[tr]=adres defteri,yapılandırma,ayarlar,LDAP
+ Keywords[uk]=kaddressbook, налаштуваннÑ, параметри, LDAP
+-Keywords[uz]=kaddressbook, моÑлаш, моÑламалар, манзиллар дафтари, LDAP
++Keywords[uz]=kaddressbook, moslash, moslamalar, manzillar daftari, LDAP
++Keywords[uz at cyrillic]=kaddressbook, моÑлаш, моÑламалар, манзиллар дафтари, LDAP
+ Keywords[zh_CN]=kaddressbook, configure, settings, LDAP, é…ç½®, 设置
+Index: kaddressbook/common/kaddressbook.kcfg
+===================================================================
+--- kaddressbook/common/kaddressbook.kcfg.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/common/kaddressbook.kcfg 2008-06-29 20:10:36.000000000 +0200
+@@ -50,17 +50,24 @@
+ <entry type="Bool" name="DetailsPageVisible">
+ <default>true</default>
+ </entry>
+- <entry type="IntList" name="ExtensionsSplitter">
+- </entry>
+ <entry type="IntList" name="DetailsSplitter">
+ </entry>
++ <entry type="IntList" name="LeftSplitter">
++ </entry>
++ <entry type="Bool" name="ContactListAboveExtensions">
++ <default>true</default>
++ <whatsthis>If true, the contact list will be placed above the extensions on the left (distribution list editor etc.) instead of in the middle of the main window</whatsthis>
++
++ </entry>
+ </group>
+
+ <group name="ExtensionsGeneral">
+ <entry type="String" name="CurrentExtension">
+ <default>resourceselection</default>
+ </entry>
+- <entry type="StringList" name="activeExtensions"/>
++ <entry type="StringList" name="activeExtensions">
++ <default>distribution_list_editor_ng,resourceselection</default>
++ </entry>
+ <entry type="IntList" name="ExtensionsSplitterSizes"/>
+ </group>
+
+Index: kaddressbook/kabcore.h
+===================================================================
+--- kaddressbook/kabcore.h.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/kabcore.h 2008-06-29 20:10:36.000000000 +0200
+@@ -455,6 +455,7 @@
+ QWidget *mDetailsWidget;
+ QHBoxLayout *mDetailsLayout;
+ QSplitter *mDetailsSplitter;
++ QSplitter *mLeftSplitter;
+ QWidgetStack *mDetailsStack;
+ LDAPSearchDialog *mLdapSearchDialog;
+ QDict<AddresseeEditorDialog> mEditorDict;
+Index: kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
+===================================================================
+--- kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -26,6 +26,7 @@
+ Name[is]=Skrár með rafrænum nafnspjöldum
+ Name[it]=Biglietto da visita elettronico
+ Name[ja]=é›»åビジãƒã‚¹ã‚«ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«
++Name[ka]=ელექტრáƒáƒœáƒ£áƒšáƒ˜ სáƒáƒ•áƒ˜áƒ–იტრბáƒáƒ áƒáƒ—ების ფáƒáƒ˜áƒšáƒ”ბი
+ Name[kk]=Ðлектрондық визитка файлдары
+ Name[km]=ឯកសារ​នាមបáŸážŽáŸ’ណ​អáŸáž¡áž·áž…ážáŸ’រូនិច
+ Name[lt]=ElektroninÄ—s verslo kortelÄ—s bylos
+Index: kaddressbook/features/distributionlist.desktop
+===================================================================
+--- kaddressbook/features/distributionlist.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/features/distributionlist.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -28,6 +28,7 @@
+ Name[is]=Ãforrit fyrir KAB dreifilista
+ Name[it]=Plugin lista di distribuzione KAB
+ Name[ja]=KAB é…布リストプラグイン
++Name[ka]=KAB დისტრიბუციის სიის მáƒáƒ“ული
+ Name[kk]=KAB тарату тізімінің плагин модулі
+ Name[km]=កម្មវិធី​ជំនួយ​បញ្ជី​ចែកចាយ​របស់ KAB
+ Name[lt]=KAB platinimo sąrašo priedas
+@@ -51,7 +52,8 @@
+ Name[tg]=Рӯйхати ба ҳар тараф мефириÑтодагӣ
+ Name[tr]=KAB Dağıtım Listesi Eklentisi
+ Name[uk]=Втулок ÑпиÑку розповÑÑŽÐ´Ð¶ÐµÐ½Ð½Ñ KAB
+-Name[uz]=Тарқатиш рўйхат плагини
++Name[uz]=Tarqatish roʻyxat plagini
++Name[uz at cyrillic]=Тарқатиш рўйхат плагини
+ Name[zh_CN]=KAB 分å‘列表æ’件
+ Comment=Plugin for managing distribution lists
+ Comment[af]=Inprop module vir die bestuur van verspreiding lyste
+@@ -81,6 +83,7 @@
+ Comment[is]=Ãforrit til að sjá um dreifilista
+ Comment[it]=Plugin per gestire liste di distribuzione
+ Comment[ja]=é…布リスト管ç†ç”¨ãƒ—ラグイン
++Comment[ka]=სáƒáƒ“ისტრიბუცირსიáƒáƒ—რმáƒáƒ თვის მáƒáƒ“ული
+ Comment[kk]=Тарату тізімімен айналыÑу плагин модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​គ្រប់គ្រង​បញ្ជី​ចែកចាយ
+ Comment[lt]=Priedas platinimo sąrašų tvarkymui
+@@ -105,7 +108,8 @@
+ Comment[tg]=Кор бо рӯйхати ба ҳар тараф мефириÑтодагӣ
+ Comment[tr]=Dağıtım listelerini yönetmek için eklenti
+ Comment[uk]=Втулок Ð´Ð»Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑпиÑками розповÑюдженнÑ
+-Comment[uz]=Тарқатиш рўйхатларни бошқариш учу плагин
++Comment[uz]=Tarqatish roʻyxatlarni boshqarish uchu plagin
++Comment[uz at cyrillic]=Тарқатиш рўйхатларни бошқариш учу плагин
+ Comment[zh_CN]=管ç†åˆ†å‘列表的æ’件
+ Comment[zh_TW]=管ç†åˆ†é…清單外掛程å¼
+ Type=Service
+Index: kaddressbook/features/resourceselection.desktop
+===================================================================
+--- kaddressbook/features/resourceselection.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/features/resourceselection.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=UmsjónarÃforrit vistfangaflettis
+ Name[it]=Plugin per gestire rubriche indirizzi
+ Name[ja]=アドレス帳管ç†ãƒ—ラグイン
++Name[ka]=წიგნáƒáƒ™áƒ˜áƒ¡ მáƒáƒ თვის მáƒáƒ“ული
+ Name[kk]=ÐдреÑтік кітапшамен айналыÑу плагин модулі
+ Name[km]=កម្មវិធី​ជំនួយ​ការ​គ្រប់គ្រង​សៀវភៅ​អាសយដ្ឋាន
+ Name[lt]=Adresų knygelės tvarkymo priedas
+@@ -78,6 +79,7 @@
+ Comment[is]=Ãforrit til að sjá um vistfangaskrár
+ Comment[it]=Plugin per gestire rubriche indirizzi
+ Comment[ja]=アドレス帳管ç†ç”¨ãƒ—ラグイン
++Comment[ka]=წიგნáƒáƒ™áƒ˜áƒ¡ მáƒáƒ თვის მáƒáƒ“ული
+ Comment[kk]=ÐдреÑтік кітапшамен айналыÑу плагин модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​គ្រប់គ្រង​សៀវភៅ​អាសយដ្ឋាន
+ Comment[lt]=Priedas adresų knygelių tvarkymui
+Index: kaddressbook/features/distributionlistng.desktop
+===================================================================
+--- kaddressbook/features/distributionlistng.desktop.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/features/distributionlistng.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -8,14 +8,19 @@
+ Name[de]=Verteilerlisten-Modul für neues Adressbuch
+ Name[el]=Î Ïόσθετο επόμενης γενιάς λίστας διανομής του KAB
+ Name[et]=KAB postiloendi järgmise põlvkonna plugin
++Name[fr]=Module de liste de diffusion nouvelle génération pour KAB
+ Name[it]=Plugin lista di distribuzione KAB di nuova generazione
+ Name[ja]=KAB é…布リスト次世代プラグイン
++Name[km]=កម្មវិធី​ជំនួយ​ជំនាន់​ក្រោយ​របស់​​បញ្ជី​ចែកចាយ​ KAB
+ Name[nds]=Verbetert Verdeellist-Moduul för KAdressbook
+ Name[nl]=Plugin voor KAB Distributielijst (Nieuwe Generatie)
++Name[pl]=Wtyczka KAB do obsługi list wysyłkowych
++Name[ru]=СпиÑки раÑÑылки (Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ)
+ Name[sk]=KAB plugin distribuÄného zoznamu Äaľšej generácie
+ Name[sr]=Прикључак KAB-а наредне генерације за диÑтрибуционе лиÑте
+ Name[sr at Latn]=PrikljuÄak KAB-a naredne generacije za distribucione liste
+ Name[sv]=Adressbokens nästa generation insticksprogram för distributionslistor
++Name[tr]=KAB Dağıtım Listesi Sonraki Kuşak Eklentisi
+ Name[zh_CN]=KAB 分å‘列表生æˆæ’件
+ Name[zh_TW]=KAB 分派清單下一代外掛程å¼
+ Comment=Plugin for managing distribution lists
+@@ -46,6 +51,7 @@
+ Comment[is]=Ãforrit til að sjá um dreifilista
+ Comment[it]=Plugin per gestire liste di distribuzione
+ Comment[ja]=é…布リスト管ç†ç”¨ãƒ—ラグイン
++Comment[ka]=სáƒáƒ“ისტრიბუცირსიáƒáƒ—რმáƒáƒ თვის მáƒáƒ“ული
+ Comment[kk]=Тарату тізімімен айналыÑу плагин модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ដើម្បី​គ្រប់គ្រង​បញ្ជី​ចែកចាយ
+ Comment[lt]=Priedas platinimo sąrašų tvarkymui
+@@ -70,7 +76,8 @@
+ Comment[tg]=Кор бо рӯйхати ба ҳар тараф мефириÑтодагӣ
+ Comment[tr]=Dağıtım listelerini yönetmek için eklenti
+ Comment[uk]=Втулок Ð´Ð»Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑпиÑками розповÑюдженнÑ
+-Comment[uz]=Тарқатиш рўйхатларни бошқариш учу плагин
++Comment[uz]=Tarqatish roʻyxatlarni boshqarish uchu plagin
++Comment[uz at cyrillic]=Тарқатиш рўйхатларни бошқариш учу плагин
+ Comment[zh_CN]=管ç†åˆ†å‘列表的æ’件
+ Comment[zh_TW]=管ç†åˆ†é…清單外掛程å¼
+ Type=Service
+Index: kaddressbook/features/Makefile.am
+===================================================================
+--- kaddressbook/features/Makefile.am.orig 2008-02-13 10:39:43.000000000 +0100
++++ kaddressbook/features/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -4,6 +4,8 @@
+ if compile_newdistrlists
+ TARGET_DISTRIBUTIONLISTNG=libkaddrbk_distributionlistng.la
+ DISTRIBUTIONLISTNG_DESKTOPFILE=distributionlistng.desktop
++else
++DISTRIBUTIONLIST_DESKTOPFILE=distributionlist.desktop
+ endif
+
+ kde_module_LTLIBRARIES = $(TARGET_DISTRIBUTIONLISTNG) libkaddrbk_distributionlist.la libkaddrbk_resourceselection.la
+@@ -11,14 +13,15 @@
+ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
+ $(top_builddir)/libkdepim/libkdepim.la
+
+-libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
+-libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+-libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS)
+
+ if compile_newdistrlists
+ libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp
+ libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+ libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS)
++else
++libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
++libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
++libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS)
+ endif
+
+ libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
+@@ -30,4 +33,4 @@
+ METASOURCES = AUTO
+
+ servicedir = $(kde_servicesdir)/kaddressbook
+-service_DATA = $(DISTRIBUTIONLISTNG_DESKTOPFILE) distributionlist.desktop resourceselection.desktop
++service_DATA = $(DISTRIBUTIONLISTNG_DESKTOPFILE) $(DISTRIBUTIONLIST_DESKTOPFILE) resourceselection.desktop
+Index: Makefile.am.in
+===================================================================
+--- Makefile.am.in.orig 2007-05-14 09:54:54.000000000 +0200
++++ Makefile.am.in 2008-06-29 20:10:36.000000000 +0200
+@@ -8,6 +8,7 @@
+ # don't change these in Makefile.am, but rather in Makefile.am.in!
+ #
+ # Libraries and their upwards dependencies
++COMPILE_AFTER_libkmime = libemailfunctions
+ COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
+ COMPILE_AFTER_libkholidays = korganizer kontact
+ COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange kpilot libkdepim karm knotes kresources kfile-plugins
+Index: libkholidays/holidays/holiday_BelgiumFrench
+===================================================================
+--- libkholidays/holidays/holiday_BelgiumFrench.orig 2005-10-10 17:02:25.000000000 +0200
++++ libkholidays/holidays/holiday_BelgiumFrench 2008-06-29 20:10:36.000000000 +0200
+@@ -1,32 +1,34 @@
+ :
+-: Belgian holiday file. Copy to ~/.holiday
++: Belgian (in french) holiday file. Copy to ~/.holiday
+ :
+-: Author: Guido van Rossum, CWI, Amsterdam <Guido.van.Rossum cwi nl>
+-: Adapted from Dutch holiday by Danny Backx <u27113 kb be>
+-: Adapted to french by JM Remacle <jmremacle tiscali be> and David Mathy <david.mathy at gmail.com>
++: Author: Guido van Rossum, CWI, Amsterdam <Guido.van.Rossum at cwi.nl>
++: Adapted from Dutch holiday by Danny Backx <u27113 at kb.be> and Jean Cayron <jean.cayron at gmail.com>
+ :
+-: Is Jan 1 "Jour de l'An" or "Nouvel-An"???
+-small "Nouvel-An" weekend on 1.1.
+-small "Les trois rois" weekend on 3.1
+-small "Chandeleur" weekend on 2.2
+-small "Mardi Gras" weekend on easter minus 47 days
+-small "Mercredi des cendres" weekend on easter minus 46 days
+-small "Les rameaux" on easter minus 7 days
+-small "Jeudi saint" weekend on easter minus 3 days
+-small "Vendredi Saint" weekend on easter minus 2 days
+-small "Pâques" weekend on easter
++small "Jour de l'an" weekend on 1.1.
++small "Épiphanie" on 6.1
++small "Chandeleur" on 2.2
++small "Mardi-gras" on easter minus 47 days
++small "Mercredi des cendres" on easter minus 46 days
++small "Dimanche des rameaux" on easter minus 7 days
++small "Jeudi saint" on easter minus 3 days
++small "Vendredi saint" on easter minus 2 days
++small "Pâques" weekend on easter
+ small "Lundi de Pâques" weekend on easter plus 1 day
+-small "Fête du travail" on 1.5
+-small "Ascension" weekend on easter plus 39 days
+-small "Fête des mères" on every second sunday in may
++small "Fête du travail" weekend on 1.5
++small "Ascencion" weekend on easter plus 39 days
++small "Fête des mères" on every second sunday in may
+ small "Pentecôte" weekend on easter plus 49 days
+ small "Lundi de Pentecôte" weekend on easter plus 50 days
+-small "Fête des pères" on every third sunday in june
+-small "Vlaamse feestdag" weekend on 11.7
+-small "Fête Nationale Belge" on 21.7
+-small "Assomption" on 15.8
+-small "Fête de Wallonie" weekend on 27.9
+-small "Toussaint" on 1.11
+-small "Jour des morts" weekend on 2.11
+-small "Armistice de 1918" weekend on 11.11
+-small "Noël" on 25.12.
++small "Fête des pères" on every third sunday in june
++small "Fête de la Communauté flamande" on 11.7
++small "Fête nationale - Férié" weekend on 21.7
++small "Assomption" weekend on 15.8
++small "Fête de la Communauté française de Belgique" on 27.9
++small "Fêtes de Wallonie" on every third sunday in september
++small "Toussaint" weekend on 1.11
++small "Jour des morts" on 2.11
++small "Armistice" weekend on 11.11
++smaal "Fête de la Communauté germanophone de Belgique" on 15.11
++small "Saint Nicolas" on 06.12
++small "Noël" weekend on 25.12.
++small "Saint-Sylvestre" on 31.12
+Index: libkholidays/holidays/holiday_BelgiumWalloon
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libkholidays/holidays/holiday_BelgiumWalloon 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,34 @@
++:
++: Belgian (in walloon) holiday file. Copy to ~/.holiday
++:
++: Author: Guido van Rossum, CWI, Amsterdam <Guido.van.Rossum at cwi.nl>
++: Adapted from Dutch holiday by Danny Backx <u27113 at kb.be> and Djan Cayron <jean.cayron at gmail.com>
++:
++small "Novelan" weekend on 1.1.
++small "Fiesse des Rwès" on 6.1
++small "Tchandleuse" on 2.2
++small "Crås mårdi" on easter minus 47 days
++small "Mierkidi des cindes" on easter minus 46 days
++small "Floreye PÃ¥ke" on easter minus 7 days
++small "Djudi sint" on easter minus 3 days
++small "Bon vénrdi" on easter minus 2 days
++small "PÃ¥ke" weekend on easter
++small "Londi d' PÃ¥ke" weekend on easter plus 1 day
++small "Fiesse do boutaedje" weekend on 1.5
++small "Assincion" weekend on easter plus 39 days
++small "Fiesse des méres" on every second sunday in may
++small "Céncweme (Pintcosse)" weekend on easter plus 49 days
++small "Londi d' Céncweme" weekend on easter plus 50 days
++small "Fiesse des péres" on every third sunday in june
++small "Fiesse del Cominålté flaminde" on 11.7
++small "Fiesse nacionåle" weekend on 21.7
++small "Grande Notru Dame" weekend on 15.8
++small "Fiesse del Cominålté francesse di Beldjike" on 27.9
++small "Fiesses di Walonreye" on every third sunday in september
++small "Tossint" weekend on 1.11
++small "Djoû des åmes" on 2.11
++small "Ã…rmistice" weekend on 11.11
++smaal "Fiesse del Cominålté Tîxhon-cåzante di Belgjike" on 15.11
++small "Sint Nicolai" on 06.12
++small "Noyé" weekend on 25.12.
++small "Sint Silvesse" on 31.12
+Index: libkholidays/holidays/holiday_nz
+===================================================================
+--- libkholidays/holidays/holiday_nz.orig 2005-09-10 10:24:19.000000000 +0200
++++ libkholidays/holidays/holiday_nz 2008-06-29 20:10:36.000000000 +0200
+@@ -4,6 +4,7 @@
+ : Author: Miles Leonard-Taylor (m.leonardtaylor at irl.cri.nz)
+ : 13 September 2000 (first version)
+ : 24 September 2004 (update with spelling corrections)
++: 11 February 2008 (change to daylight-savings rules by government)
+ : Thanks to various people for pointing out all my spelling mistakes...
+
+ : Holidays as defined by the government's "Holidays Acts, 1981-1991"
+@@ -35,8 +36,9 @@
+ small "Melbourne Cup" on first tuesday in november
+
+ : Daylight Savings Reminders, defined by Internal Affairs
+-small "Clocks Forward" on first sunday in october
+-small "Clocks Back" on third sunday in march
++: see http://www.dia.govt.nz/diawebsite.nsf/wpg_URL/Services-Daylight-Saving-Index?OpenDocument
++small "Clocks Forward" on last sunday in september
++small "Clocks Back" on first sunday in april
+
+ : Additional Easter dates and other Solemneties, defined by Catholic Church
+ :small "Epiphany on sunday after january 2
+Index: libkholidays/holidays/holiday_at
+===================================================================
+--- libkholidays/holidays/holiday_at.orig 2005-09-10 10:24:19.000000000 +0200
++++ libkholidays/holidays/holiday_at 2008-06-29 20:10:36.000000000 +0200
+@@ -21,6 +21,7 @@
+
+ small "Tag der Arbeit" weekend on 1.5.
+ small "Muttertag" on second sunday in may
++small "Vatertag" on second sunday in june
+
+ small "Maria Himmelfahrt" weekend on 15.8.
+
+Index: libkholidays/holidays/holiday_ua
+===================================================================
+--- libkholidays/holidays/holiday_ua.orig 2007-10-08 11:50:46.000000000 +0200
++++ libkholidays/holidays/holiday_ua 2008-06-29 20:10:36.000000000 +0200
+@@ -1,17 +1,118 @@
+ :
+ : Ukrainian holiday file. Copy to ~/.holiday
+ :
+-: Author: Andriy Gapon <avg at icyb.net.ua>, April 2007.
++: Authors: Andriy Gapon <avg at icyb.net.ua>, April 2007.
++: Oleg Ivashchenko <ol_iva at i.ua>, October 2006.
+ :
+
+ : Official holidays
+-
+ small "Ðовий Рік" weekend on 1.1
+ small "Різдво ХриÑтове" weekend on 7.1
+ small "8 Ð‘ÐµÑ€ÐµÐ·Ð½Ñ - Міжнародний Жіночий День" weekend on 8.3
+ small "Великдень" weekend on pascha
+ small "1 Ð¢Ñ€Ð°Ð²Ð½Ñ - День Праці" weekend on 1.5 length 2 days
+ small "День Перемоги" weekend on 9.5
+-small "ТрійцÑ" weekend on pascha plus 46 days
++small "ТрійцÑ" weekend on pascha plus 49 days
+ small "День КонÑтитуції України" weekend on 28.6
+ small "День ÐезалежноÑÑ‚Ñ– України" weekend on 24.8
++
++: Other holidays
++blue "ХрещеннÑ" on 19.1
++blue "День ÑоборноÑÑ‚Ñ– України" on 22.1
++blue "День пам’ÑÑ‚Ñ– Крутів" on 29.1
++blue "День працівників пожежної охорони" on 29.1
++blue "День Ð²ÑˆÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ ÑƒÑ‡Ð°Ñників бойових дій на території інших держав" on 15.2
++blue "День захиÑника Вітчизни" on 23.2
++blue "День землевпорÑдника" on second saturday in march
++blue "День працівників житлово-комунального гоÑподарÑтва Ñ– побутового обÑÐ»ÑƒÐ³Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°ÑеленнÑ" on third sunday in march
++blue "Ð’ÑеукраїнÑький день працівників культури та аматорів народного миÑтецтва" on 23.3
++blue "Ð’ÑеукраїнÑький день боротьби із захворюваннÑм на туберкульоз" on 24.3
++blue "День Служби безпеки України" on 25.3
++blue "День внутрішніх війÑьк МініÑтерÑтва внутрішніх Ñправ України" on 26.3
++blue "День геолога" on first sunday in april
++blue "День працівників ракетно-коÑмічної галузі України" on 12.4
++blue "День пам'Ñток Ñ–Ñторії та культури" on 18.4
++blue "День довкіллÑ" on third saturday in april
++blue "День охорони праці" on 28.4
++blue "День матері" on second sunday in may
++blue "День банківÑьких працівників" on 20.5
++blue "День науки" on third saturday in may
++blue "День Європи" on third saturday in may
++blue "День працівників видавництв, поліграфії Ñ– книгорозповÑюдженнÑ" on last saturday in may
++blue "День хіміка" on last sunday in may
++blue "Міжнародний день миротворців Організації Об'єднаних Ðацій" on 29.5
++blue "День Ñлов'ÑнÑької пиÑемноÑÑ‚Ñ– Ñ– культури" 24.5
++blue "День прикордонника" on 28.5
++blue "День захиÑту дітей" on 1.6
++blue "День журналіÑта" on 6.6
++blue "День працівників міÑцевої промиÑловоÑÑ‚Ñ–" on first sunday in june
++blue "День працівників водного гоÑподарÑтва" on first sunday in june
++blue "День працівників легкої промиÑловоÑÑ‚Ñ–" on second sunday in june
++blue "День медичного працівника" on third sunday in june
++blue "День Ñкорботи Ñ– Ð²ÑˆÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ð¼'ÑÑ‚Ñ– жертв війни в Україні" on 22.6
++blue "День державної Ñлужби" on 23.6
++blue "День митної Ñлужби України" on 25.6
++blue "День молоді" on last sunday in june
++blue "День архітектури України" on 1.7
++blue "День працівника державної податкової Ñлужби України" on 2.7
++blue "День ВійÑьк ПротиповітрÑної оборони" on first sunday in july
++blue "День ВійÑьково-МорÑьких Сил" on first sunday in july
++blue "День працівників морÑького та річкового флоту" on first sunday in july
++blue "День рибалки" on second sunday in july
++blue "День бухгалтера" on 16.7
++blue "День працівників металургійної та гірничодобувної промиÑловоÑÑ‚Ñ–" on third sunday in july
++blue "День працівників торгівлі" on last sunday in july
++blue "День аеромобільних війÑьк" on 2.8
++blue "День війÑьк зв'Ñзку" on 8.8
++blue "День будівельника" on second sunday in august
++blue "День працівників ветеринарної медицини" on second sunday in august
++blue "День паÑічника" on 19.8
++blue "День Державного Прапора України" on 23.8
++blue "День авіації" on last saturday in august
++blue "День шахтарÑ" on last sunday in august
++blue "День підприємцÑ" on first sunday in september
++blue "День фізичної культури Ñ– Ñпорту" on second saturday in september
++blue "День танкіÑтів" on second sunday in september
++blue "День працівників нафтової, газової та нафтопереробної промиÑловоÑÑ‚Ñ–" on second sunday in september
++blue "День українÑького кіно" on second saturday in september
++blue "День працівників цивільного захиÑту" on 17.9
++blue "День миру" on 21.9
++blue "День партизанÑької Ñлави" on 22.9
++blue "День фармацевтичного працівника" on third saturday in september
++blue "День винахідника і раціоналізатора" on third saturday in september
++blue "День працівника ліÑу" on third sunday in september
++blue "День машинобудівника" on fourth sunday in september
++blue "День туризму" on 27.9
++blue "Ð’ÑеукраїнÑький день бібліотек" on 30.9
++blue "День працівників оÑвіти" on first sunday in october
++blue "День юриÑта" on 8.10
++blue "День працівників Ñтандартизації та метрології" on 10.10
++blue "День працівників державної Ñанітарно-епідеміологічної Ñлужби" on second sunday in october
++blue "День художника" on second sunday in october
++blue "День УкраїнÑького козацтва" on 14.10
++blue "День працівників харчової промиÑловоÑÑ‚Ñ–" on third sunday in october
++blue "День автомобіліÑта Ñ– дорожника" on last sunday in october
++blue "День інженерних війÑьк" on 3.11
++blue "День ракетних війÑьк Ñ– артилерії" on 3.11
++blue "День залізничника" on 4.11
++blue "День працівника Ñоціальної Ñфери" on first sunday in november
++blue "День українÑької пиÑемноÑÑ‚Ñ– та мови" on 9.11
++blue "День працівників радіо, Ñ‚ÐµÐ»ÐµÐ±Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚Ð° зв'Ñзку" on 16.11
++blue "День Ñтудента" on 17.11
++blue "День працівників гідрометеорологічної Ñлужби" on 19.11
++blue "День Ñкловиробника" on 19.11
++blue "День Свободи" on 22.11
++blue "День працівників ÑільÑького гоÑподарÑтва" on third sunday in november
++blue "День пам'ÑÑ‚Ñ– жертв голодоморів та політичних репреÑій" on fourth saturday in november
++blue "День працівників прокуратури" on 1.12
++blue "День працівників ÑтатиÑтики" on 5.12
++blue "День Збройних Сил України" on 6.12
++blue "День міÑцевого ÑамоврÑдуваннÑ" on 7.12
++blue "День Сухопутних війÑьк України" on 12.12
++blue "День Ð²ÑˆÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ ÑƒÑ‡Ð°Ñників ліквідації наÑлідків аварії на ЧорнобильÑькій ÐЕС" on 14.12
++blue "День працівників Ñуду" on 15.12
++blue "День адвокатури" on 19.12
++blue "День міліції" on 20.12
++blue "День працівників дипломатичної Ñлужби" on 22.12
++blue "День енергетика" on 22.12
++blue "День працівників архівних уÑтанов" on 24.12
+Index: libkholidays/holidays/holiday_BelgiumDutch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libkholidays/holidays/holiday_BelgiumDutch 2008-06-29 20:10:36.000000000 +0200
+@@ -0,0 +1,34 @@
++:
++: Belgian (in Dutch) holiday file. Copy to ~/.holiday
++:
++: Author: Guido van Rossum, CWI, Amsterdam <Guido.van.Rossum at cwi.nl>
++: Adapted from Dutch holiday by Danny Backx <u27113 at kb.be> and Jean Cayron <jean.cayron at gmail.com>
++:
++small "Nieuwjaar" weekend on 1.1.
++small "Driekoningen" on 6.1
++small "Lichtmis" on 2.2
++small "Vastenavond" on easter minus 47 days
++small "Aswoensdag" on easter minus 46 days
++small "Palmzondag" on easter minus 7 days
++small "Witte Donderdag" on easter minus 3 days
++small "Goede Vrijdag" on easter minus 2 days
++small "Pasen - Feestdag" weekend on easter
++small "Paasmaandag" weekend on easter plus 1 day
++small "Feest van de Arbeid" weekend on 1.5
++small "Hemelvaart" weekend on easter plus 39 days
++small "Moederdag" on every second sunday in may
++small "Pinksteren" weekend on easter plus 49 days length 2 days
++small "Vaderdag" on every third sunday in june
++small "Vlaamse Gemeenschap feestdag" on 11.7
++small "Nationale feestdag" weekend on 21.7
++small "OLV Hemelvaart" weekend on 15.8
++small "Franse Gemeenschap feestdag" on 27.9
++small "Waalse feesten" on every third sunday in september
++small "Allerheiligen" weekend on 1.11
++small "Allerzielen" on 2.11
++small "Wapenstilstand" weekend on 11.11
++smaal "Duitstalige Gemeenschap feestdag" on 15.11
++small "Sinterklaas" on 06.12
++small "Kerstmis" weekend on 25.12.
++small "Tweede kerstdag" on 26.12.
++small "Oudjaar" on 31.12
+Index: libkholidays/holidays/Makefile.am
+===================================================================
+--- libkholidays/holidays/Makefile.am.orig 2007-10-08 11:50:46.000000000 +0200
++++ libkholidays/holidays/Makefile.am 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,8 @@
+ holidaysdir = $(kde_datadir)/libkholidays
+
+ holidays_DATA = holiday_ar holiday_at holiday_au \
+- holiday_bavarian holiday_be holiday_br \
++ holiday_bavarian holiday_br \
++ holiday_BelgiumDutch holiday_BelgiumFrench holiday_BelgiumWalloon \
+ holiday_ca holiday_catalan holiday_co \
+ holiday_ch holiday_cz holiday_de holiday_dk holiday_ee \
+ holiday_es holiday_fi holiday_fr holiday_frswiss holiday_gb \
+Index: plugins/kmail/bodypartformatter/text_calendar.desktop
+===================================================================
+--- plugins/kmail/bodypartformatter/text_calendar.desktop.orig 2008-02-13 10:39:44.000000000 +0100
++++ plugins/kmail/bodypartformatter/text_calendar.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -15,6 +15,7 @@
+ Name[gl]=Aplicación Octetstream
+ Name[hu]=Alkalmazás-adatfolyam
+ Name[ja]=アプリケーション オクテット ストリーãƒ
++Name[ka]=რვáƒáƒ“ინებიáƒáƒœáƒ˜ პრáƒáƒ’რáƒáƒ›áƒ
+ Name[kk]=Қолданбаның бинарлы ағымы
+ Name[km]=Octetstream កម្មវិធី
+ Name[ms]=Aliran Oktet Aplikasi
+@@ -55,6 +56,7 @@
+ Comment[is]=Sniðmátstól fyrir text/calendar
+ Comment[it]=Un plugin per formattare il corpo di text/calendar
+ Comment[ja]=text/calendar 用㮠Bodypart フォーマッタ プラグイン
++Comment[ka]=კáƒáƒ›áƒžáƒáƒœáƒ”ნტური დáƒáƒ›áƒ¤áƒáƒ მáƒáƒ¢áƒ”ბელი მáƒáƒ“ული text/calendar
+ Comment[kk]=Text/calendar бөлімін пішімдеу модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​កម្មវិធី​ធ្វើ​ទ្រង់ទ្រាយ​ផ្នែក​ážáž½ សម្រាប់​អážáŸ’ážáž”áž‘/ប្រážáž·áž‘áž·áž“
+ Comment[lt]=text/calendar formatavimo priedas
+Index: plugins/kmail/bodypartformatter/text_vcard.desktop
+===================================================================
+--- plugins/kmail/bodypartformatter/text_vcard.desktop.orig 2008-02-13 10:39:44.000000000 +0100
++++ plugins/kmail/bodypartformatter/text_vcard.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -15,6 +15,7 @@
+ Name[gl]=Aplicación Octetstream
+ Name[hu]=Alkalmazás-adatfolyam
+ Name[ja]=アプリケーション オクテット ストリーãƒ
++Name[ka]=რვáƒáƒ“ინებიáƒáƒœáƒ˜ პრáƒáƒ’რáƒáƒ›áƒ
+ Name[kk]=Қолданбаның бинарлы ағымы
+ Name[km]=Octetstream កម្មវិធី
+ Name[ms]=Aliran Oktet Aplikasi
+@@ -56,6 +57,7 @@
+ Comment[is]=Sniðmátstól fyrir text/vcard
+ Comment[it]=Un plugin per formattare il corpo di text/vcard
+ Comment[ja]=text/vcard 用㮠Bodypart フォーマッタ プラグイン
++Comment[ka]=კáƒáƒ›áƒžáƒáƒœáƒ”ნტური დáƒáƒ›áƒ¤áƒáƒ მáƒáƒ¢áƒ”ბელი მáƒáƒ“ული text/vcard
+ Comment[kk]=Text/vcard бөлімін пішімдеу модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​កម្មវិធី​ធ្វើ​ទ្រង់ទ្រាយ​ផ្នែក​ážáž½ សម្រាប់​អážáŸ’ážáž”áž‘/vcard
+ Comment[lt]= Teksto/vcard formatavimo priedas
+Index: plugins/kmail/bodypartformatter/text_xdiff.desktop
+===================================================================
+--- plugins/kmail/bodypartformatter/text_xdiff.desktop.orig 2008-02-13 10:39:44.000000000 +0100
++++ plugins/kmail/bodypartformatter/text_xdiff.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -15,6 +15,7 @@
+ Name[gl]=Aplicación Octetstream
+ Name[hu]=Alkalmazás-adatfolyam
+ Name[ja]=アプリケーション オクテット ストリーãƒ
++Name[ka]=რვáƒáƒ“ინებიáƒáƒœáƒ˜ პრáƒáƒ’რáƒáƒ›áƒ
+ Name[kk]=Қолданбаның бинарлы ағымы
+ Name[km]=Octetstream កម្មវិធី
+ Name[ms]=Aliran Oktet Aplikasi
+@@ -54,6 +55,7 @@
+ Comment[is]=Sniðmátstól fyrir text/x-diff
+ Comment[it]=Un plugin per formattare il corpo di text/x-diff
+ Comment[ja]=text/x-diff 用㮠bodypart フォーマッタプラグイン
++Comment[ka]=კáƒáƒ›áƒžáƒáƒœáƒ”ნტური დáƒáƒ›áƒ¤áƒáƒ მáƒáƒ¢áƒ”ბელი მáƒáƒ“ული text/x-diff
+ Comment[kk]=Text/x-diff бөлімін пішімдеу модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​កម្មវិធី​ធ្វើ​ទ្រង់ទ្រាយ​ផ្នែក​ážáž½ សម្រាប់​អážáŸ’ážáž”áž‘/x-diff
+ Comment[lt]=text/x-diff formatavimo priedas
+Index: kitchensync/src/kitchensync.desktop
+===================================================================
+--- kitchensync/src/kitchensync.desktop.orig 2008-02-13 10:39:44.000000000 +0100
++++ kitchensync/src/kitchensync.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ GenericName[is]=Samstilling
+ GenericName[it]=Sincronizzazione
+ GenericName[ja]=åŒæœŸ
++GenericName[ka]=სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ
+ GenericName[kk]=ҚадамдаÑтыру
+ GenericName[km]=ការ​​ធ្វើ​សមកាលកម្ម
+ GenericName[lt]=Sinchronizacija
+Index: libkdepim/configure.in.in
+===================================================================
+--- libkdepim/configure.in.in.orig 2008-02-13 10:39:45.000000000 +0100
++++ libkdepim/configure.in.in 2008-06-29 20:10:36.000000000 +0200
+@@ -1,20 +1,14 @@
+ AC_MSG_CHECKING([whether to use new-style distribution lists])
+ AC_ARG_ENABLE(newdistrlists,
+-[AC_HELP_STRING([--enable-newdistrlists],
+- [Whether to use new distribution lists, to store them like normal contacts; useful for Kolab])],
+-[case "${enableval}" in
+- yes)
+- AC_MSG_RESULT([yes])
+- AC_DEFINE(KDEPIM_NEW_DISTRLISTS, 1, [Define to 1 if you want to use the new distribution lists])
+- enable_new_distrlists="yes"
+- ;;
+- no)
+- AC_MSG_RESULT([no])
+- ;;
+- *)
+- AC_MSG_ERROR([bad value ${enableval} for --enable-newdistrlists])
+- ;;
+-esac
+-], [AC_MSG_RESULT([no])])
++AC_HELP_STRING([--disable-newdistrlists],
++ [Disables the new distribution lists (which are saved as addressee in the address book as normal contacts, useful for Kolab)]),
++ [ enable_new_distrlists=$enableval], [enable_new_distrlists=yes])dnl
++if test "$enable_new_distrlists" = "yes" ; then
++ AC_DEFINE_UNQUOTED(KDEPIM_NEW_DISTRLISTS, 1, [Define if you want to use the new distribution lists])
++ AC_MSG_RESULT(yes)
++else
++ AC_MSG_RESULT(no)
++fi
+
+ AM_CONDITIONAL(compile_newdistrlists, test "x$enable_new_distrlists" = "xyes")
++
+Index: libkdepim/komposer/plugins/default/defaulteditor.desktop
+===================================================================
+--- libkdepim/komposer/plugins/default/defaulteditor.desktop.orig 2008-02-13 10:39:44.000000000 +0100
++++ libkdepim/komposer/plugins/default/defaulteditor.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -39,6 +39,7 @@
+ Name[is]=Komposer ritill
+ Name[it]=Editor Komposer
+ Name[ja]=Komposer エディタ
++Name[ka]=Komposer რედáƒáƒ¥áƒ¢áƒáƒ ი
+ Name[kk]=Komposer өңдегіші
+ Name[km]=កម្មវិធី​និពន្ធ Komposer
+ Name[lt]=Komposer redaktorius
+@@ -84,6 +85,7 @@
+ Comment[is]=Sjálfgefinn ritill Komposer
+ Comment[it]=Editor di default per Komposer
+ Comment[ja]=Komposer 標準エディタ
++Comment[ka]=Komposer ნáƒáƒ’ულისხმევი რედáƒáƒ¥áƒ¢áƒáƒ ი
+ Comment[kk]=Komposer әдетті өңдегіші
+ Comment[km]=កម្មវិធី​និពន្ធ​លំនាំដើម​របស់ Komposer
+ Comment[ko]=Komposer 기본 편집기
+Index: libkdepim/komposer/core/komposerplugin.desktop
+===================================================================
+--- libkdepim/komposer/core/komposerplugin.desktop.orig 2008-02-13 10:39:45.000000000 +0100
++++ libkdepim/komposer/core/komposerplugin.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -29,6 +29,7 @@
+ Name[is]=Komposer Ãforrit
+ Name[it]=Plugin Komposer
+ Name[ja]=Komposer プラグイン
++Name[ka]=Komposer მáƒáƒ“ული
+ Name[kk]=Komposer плагин модулі
+ Name[km]=កម្មវិធី​ជំនួយ Komposer
+ Name[ko]=Komposer 플러그ì¸
+Index: libkdepim/komposer/core/komposerconfig.desktop
+===================================================================
+--- libkdepim/komposer/core/komposerconfig.desktop.orig 2007-05-14 09:54:47.000000000 +0200
++++ libkdepim/komposer/core/komposerconfig.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -28,6 +28,7 @@
+ Comment[fr]=Komposer KDE
+ Comment[ga]=Komposer KDE
+ Comment[hi]=केडीई कमà¥à¤ªà¥‹à¤œà¤¼à¤°
++Comment[ka]=KDE კáƒáƒ›áƒžáƒáƒ–იტáƒáƒ ი
+ Comment[ms]=Penggubah KDE
+ Comment[nds]=Nettbreef-Editor vun KDE
+ Comment[ne]=केडीई कमà¥à¤ªà¥‹à¤œà¤°
+@@ -46,6 +47,7 @@
+ Keywords[de]=Komposer
+ Keywords[fy]=komposer,opstellen, opsteller
+ Keywords[hi]=कमà¥à¤ªà¥‹à¤œà¤¼à¤°
++Keywords[ka]=komposer,ნáƒáƒ¢áƒ”ბი
+ Keywords[nds]=Komposer
+ Keywords[ne]=कमà¥à¤ªà¥‹à¤œà¤°
+ Keywords[nl]=komposer,opstellen
+Index: libkdepim/komposer/core/komposereditor.desktop
+===================================================================
+--- libkdepim/komposer/core/komposereditor.desktop.orig 2008-02-13 10:39:45.000000000 +0100
++++ libkdepim/komposer/core/komposereditor.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Comment[is]=Komposer ritill
+ Comment[it]=Komposer editor
+ Comment[ja]=Komposer,エディタ
++Comment[ka]=Komposer-ის რედáƒáƒ¥áƒ¢áƒáƒ ი
+ Comment[kk]=Komposer өңдегіші
+ Comment[km]=កម្មវិធី​និពន្ធ Komposer
+ Comment[ko]=Komposer 편집기
+Index: libkdepim/addresseelineedit.cpp
+===================================================================
+--- libkdepim/addresseelineedit.cpp.orig 2008-02-13 10:39:45.000000000 +0100
++++ libkdepim/addresseelineedit.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -539,9 +539,8 @@
+ int weight = config.readNumEntry( resource->identifier(), 60 );
+ s_completionSources->append( resource->resourceName() );
+ KABC::Resource::Iterator it;
+- if ( resource->type() != "ldapkio" )
+- for ( it = resource->begin(); it != resource->end(); ++it )
+- addContact( *it, weight, s_completionSources->size()-1 );
++ for ( it = resource->begin(); it != resource->end(); ++it )
++ addContact( *it, weight, s_completionSources->size()-1 );
+ }
+ }
+
+Index: libkcal/resourcelocaldir.cpp
+===================================================================
+--- libkcal/resourcelocaldir.cpp.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/resourcelocaldir.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+
+ #include <qdatetime.h>
++#include <qfileinfo.h>
+ #include <qstring.h>
+ #include <qptrlist.h>
+
+@@ -112,39 +113,50 @@
+ delete mLock;
+ }
+
++bool ResourceLocalDir::doOpen()
++{
++ QFileInfo dirInfo( mURL.path() );
++ return dirInfo.isDir() && dirInfo.isReadable() &&
++ ( dirInfo.isWritable() || readOnly() );
++}
++
+ bool ResourceLocalDir::doLoad()
+ {
+ kdDebug(5800) << "ResourceLocalDir::load()" << endl;
+
+ mCalendar.close();
+ QString dirName = mURL.path();
+- bool success = true;
+
+ if ( !( KStandardDirs::exists( dirName ) || KStandardDirs::exists( dirName + "/") ) ) {
+- kdDebug(5800) << "ResourceLocalDir::load(): Directory '" << dirName << "' doesn't exist yet. Creating it..." << endl;
+-
++ kdDebug(5800) << "ResourceLocalDir::load(): Directory '" << dirName
++ << "' doesn't exist yet. Creating it..." << endl;
+ // Create the directory. Use 0775 to allow group-writable if the umask
+ // allows it (permissions will be 0775 & ~umask). This is desired e.g. for
+ // group-shared directories!
+- success = KStandardDirs::makeDir( dirName, 0775 );
+- } else {
++ return KStandardDirs::makeDir( dirName, 0775 );
++ }
+
+- kdDebug(5800) << "ResourceLocalDir::load(): '" << dirName << "'" << endl;
+- QDir dir( dirName );
++ // The directory exists. Now try to open (the files in) it.
++ kdDebug(5800) << "ResourceLocalDir::load(): '" << dirName << "'" << endl;
++ QFileInfo dirInfo( dirName );
++ if ( !( dirInfo.isDir() && dirInfo.isReadable() &&
++ ( dirInfo.isWritable() || readOnly() ) ) )
++ return false;
+
+- QStringList entries = dir.entryList( QDir::Files | QDir::Readable );
++ QDir dir( dirName );
++ QStringList entries = dir.entryList( QDir::Files | QDir::Readable );
+
+- QStringList::ConstIterator it;
+- for( it = entries.begin(); it != entries.end(); ++it ) {
+- if ( (*it).endsWith( "~" ) ) // is backup file, ignore it
+- continue;
+-
+- QString fileName = dirName + "/" + *it;
+- kdDebug(5800) << " read '" << fileName << "'" << endl;
+- CalendarLocal cal( mCalendar.timeZoneId() );
+- if ( !doFileLoad( cal, fileName ) ) {
+- success = false;
+- }
++ bool success = true;
++ QStringList::ConstIterator it;
++ for( it = entries.constBegin(); it != entries.constEnd(); ++it ) {
++ if ( (*it).endsWith( "~" ) ) // is backup file, ignore it
++ continue;
++
++ QString fileName = dirName + "/" + *it;
++ kdDebug(5800) << " read '" << fileName << "'" << endl;
++ CalendarLocal cal( mCalendar.timeZoneId() );
++ if ( !doFileLoad( cal, fileName ) ) {
++ success = false;
+ }
+ }
+
+Index: libkcal/localdir.desktop
+===================================================================
+--- libkcal/localdir.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/localdir.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=Dagatal à staðbundinni möppu
+ Name[it]=Calendario nella directory locale
+ Name[ja]=ãƒãƒ¼ã‚«ãƒ«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი ლáƒáƒ™áƒáƒšáƒ£áƒ დირექტáƒáƒ იáƒáƒ¨áƒ˜
+ Name[kk]=Жергілікті каталогтағы күнтізбе
+ Name[km]=ប្រážáž·áž‘ិន​នៅ​ក្នុង​ážážâ€‹áž˜áž¼áž›ážŠáŸ’ឋាន
+ Name[lt]=Kalendorius vietiniame aplanke
+Index: libkcal/local.desktop
+===================================================================
+--- libkcal/local.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/local.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=Dagatal à staðbundinni skrá
+ Name[it]=Calendario in file locale
+ Name[ja]=ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი ლáƒáƒ™áƒáƒšáƒ£áƒ ფáƒáƒ˜áƒšáƒ¨áƒ˜
+ Name[kk]=Жергілікті файлдағы күнтізбе
+ Name[km]=ប្រážáž·áž‘ិន​នៅ​ក្នុង​ឯកសារ​មូលដ្ឋាន
+ Name[lt]=Kalendorius vietinÄ—je byloje
+Index: libkcal/kcal_manager.desktop
+===================================================================
+--- libkcal/kcal_manager.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/kcal_manager.desktop 2008-06-29 20:10:36.000000000 +0200
+@@ -30,6 +30,7 @@
+ Name[is]=Dagatal
+ Name[it]=Calendario
+ Name[ja]=カレンダー
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი
+ Name[kk]=Күнтізбе
+ Name[km]=ប្រážáž·áž‘áž·áž“
+ Name[lt]=Kalendorius
+@@ -56,7 +57,8 @@
+ Name[th]=บันทึà¸à¸›à¸£à¸°à¸ˆà¸³à¸§à¸±à¸™
+ Name[tr]=Takvim
+ Name[uk]=Календар
+-Name[uz]=Календар
++Name[uz]=Kalendar
++Name[uz at cyrillic]=Календар
+ Name[zh_CN]=日历
+ Name[zh_TW]=行事曆
+ Type=Service
+Index: libkcal/calendarresources.cpp
+===================================================================
+--- libkcal/calendarresources.cpp.orig 2007-01-15 12:29:00.000000000 +0100
++++ libkcal/calendarresources.cpp 2008-06-29 20:10:36.000000000 +0200
+@@ -183,12 +183,12 @@
+ {
+ return mDestinationPolicy->parent();
+ }
++
+ void CalendarResources::setDialogParentWidget( QWidget *parent )
+ {
+ mDestinationPolicy->setParent( parent );
+ }
+
+-
+ void CalendarResources::close()
+ {
+ kdDebug(5800) << "CalendarResources::close" << endl;
+Index: libkcal/libical/tzdata/iso3166.tab
+===================================================================
+--- libkcal/libical/tzdata/iso3166.tab.orig 2007-05-14 09:54:48.000000000 +0200
++++ libkcal/libical/tzdata/iso3166.tab 2008-06-29 20:10:36.000000000 +0200
+@@ -1,12 +1,12 @@
+ # ISO 3166 alpha-2 country codes
+ #
+-# @(#)iso3166.tab 8.4
++# @(#)iso3166.tab 8.5
+ #
+ # From Paul Eggert (2006-09-27):
+ #
+ # This file contains a table with the following columns:
+ # 1. ISO 3166-1 alpha-2 country code, current as of
+-# ISO 3166-1 Newsletter No. V-12 (2006-09-26). See:
++# ISO 3166-1 Newsletter VI-1 (2007-09-21). See:
+ # <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html">
+ # ISO 3166 Maintenance agency (ISO 3166/MA)
+ # </a>.
+@@ -47,6 +47,7 @@
+ BH Bahrain
+ BI Burundi
+ BJ Benin
++BL St Barthelemy
+ BM Bermuda
+ BN Brunei
+ BO Bolivia
+@@ -159,6 +160,7 @@
+ MC Monaco
+ MD Moldova
+ ME Montenegro
++MF St Martin (French part)
+ MG Madagascar
+ MH Marshall Islands
+ MK Macedonia
+Index: libkcal/libical/tzdata/zone.tab
+===================================================================
+--- libkcal/libical/tzdata/zone.tab.orig 2007-10-08 11:50:47.000000000 +0200
++++ libkcal/libical/tzdata/zone.tab 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-# @(#)zone.tab 8.11
++# @(#)zone.tab 8.16
+ #
+ # TZ zone descriptions
+ #
+@@ -42,7 +42,8 @@
+ AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
+ AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
+ AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
+-AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
++AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF)
++AR -3319-06621 America/Argentina/San_Luis San Luis (SL)
+ AR -2411-06518 America/Argentina/Jujuy Jujuy (JY)
+ AR -2649-06513 America/Argentina/Tucuman Tucuman (TM)
+ AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH)
+@@ -77,6 +78,7 @@
+ BH +2623+05035 Asia/Bahrain
+ BI -0323+02922 Africa/Bujumbura
+ BJ +0629+00237 Africa/Porto-Novo
++BL +1753-06251 America/St_Barthelemy
+ BM +3217-06446 Atlantic/Bermuda
+ BN +0456+11455 Asia/Brunei
+ BO -1630-06809 America/La_Paz
+@@ -208,7 +210,7 @@
+ IE +5320-00615 Europe/Dublin
+ IL +3146+03514 Asia/Jerusalem
+ IM +5409-00428 Europe/Isle_of_Man
+-IN +2232+08822 Asia/Calcutta
++IN +2232+08822 Asia/Kolkata
+ IO -0720+07225 Indian/Chagos
+ IQ +3321+04425 Asia/Baghdad
+ IR +3540+05126 Asia/Tehran
+@@ -250,6 +252,7 @@
+ MC +4342+00723 Europe/Monaco
+ MD +4700+02850 Europe/Chisinau
+ ME +4226+01916 Europe/Podgorica
++MF +1804-06305 America/Marigot
+ MG -1855+04731 Indian/Antananarivo
+ MH +0709+17112 Pacific/Majuro most locations
+ MH +0905+16720 Pacific/Kwajalein Kwajalein
+@@ -339,8 +342,7 @@
+ SG +0117+10351 Asia/Singapore
+ SH -1555-00542 Atlantic/St_Helena
+ SI +4603+01431 Europe/Ljubljana
+-SJ +7800+01600 Arctic/Longyearbyen Svalbard
+-SJ +7059-00805 Atlantic/Jan_Mayen Jan Mayen
++SJ +7800+01600 Arctic/Longyearbyen
+ SK +4809+01707 Europe/Bratislava
+ SL +0830-01315 Africa/Freetown
+ SM +4355+01228 Europe/San_Marino
+@@ -410,7 +412,7 @@
+ VE +1030-06656 America/Caracas
+ VG +1827-06437 America/Tortola
+ VI +1821-06456 America/St_Thomas
+-VN +1045+10640 Asia/Saigon
++VN +1045+10640 Asia/Ho_Chi_Minh
+ VU -1740+16825 Pacific/Efate
+ WF -1318-17610 Pacific/Wallis
+ WS -1350-17144 Pacific/Apia
+Index: libkcal/libical/tzdata/southamerica
+===================================================================
+--- libkcal/libical/tzdata/southamerica.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/tzdata/southamerica 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-# @(#)southamerica 8.12
++# @(#)southamerica 8.19
+ # <pre>
+
+ # This data is by no means authoritative; if you think you know better,
+@@ -105,7 +105,11 @@
+ # which did not result in the switch of a time zone, as they stayed 9 hours
+ # from the International Date Line.
+ Rule Arg 1999 only - Oct Sun>=1 0:00 1:00 S
+-Rule Arg 2000 only - Mar Sun>=1 0:00 0 -
++# From Paul Eggert (2007-12-28):
++# DST was set to expire on March 5, not March 3, but since it was converted
++# to standard time on March 3 it's more convenient for us to pretend that
++# it ended on March 3.
++Rule Arg 2000 only - Mar 3 0:00 0 -
+ #
+ # From Peter Gradelski via Steffen Thorsen (2000-03-01):
+ # We just checked with our Sao Paulo office and they say the government of
+@@ -140,6 +144,30 @@
+ # This kind of things had always been done this way in Argentina.
+ # We are still -03:00 all year round in all of the country.
+ #
++# From Steffen Thorsen (2007-12-21):
++# A user (Leonardo Chaim) reported that Argentina will adopt DST....
++# all of the country (all Zone-entries) are affected. News reports like
++# http://www.lanacion.com.ar/opinion/nota.asp?nota_id=973037 indicate
++# that Argentina will use DST next year as well, from October to
++# March, although exact rules are not given.
++#
++# From Jesper Norgaard Welen (2007-12-26)
++# The last hurdle of Argentina DST is over, the proposal was approved in
++# the lower chamber too (Deputados) with a vote 192 for and 2 against.
++# By the way thanks to Mariano Absatz and Daniel Mario Vega for the link to
++# the original scanned proposal, where the dates and the zero hours are
++# clear and unambiguous...This is the article about final approval:
++# <a href="http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996">
++# http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996
++# </a>
++#
++# From Paul Eggert (2007-12-22):
++# For dates after mid-2008, the following rules are my guesses and
++# are quite possibly wrong, but are more likely than no DST at all.
++Rule Arg 2007 only - Dec 30 0:00 1:00 S
++Rule Arg 2008 max - Mar Sun>=15 0:00 0 -
++Rule Arg 2008 max - Oct Sun>=1 0:00 1:00 S
++
+ # From Mariano Absatz (2004-05-21):
+ # Today it was officially published that the Province of Mendoza is changing
+ # its timezone this winter... starting tomorrow night....
+@@ -200,6 +228,76 @@
+ # http://www.sanjuan.gov.ar/prensa/archivo/000426.html
+ # http://www.sanjuan.gov.ar/prensa/archivo/000441.html
+
++# From Alex Krivenyshev (2008-01-17):
++# Here are articles that Argentina Province San Luis is planning to end DST
++# as earlier as upcoming Monday January 21, 2008 or February 2008:
++#
++# Provincia argentina retrasa reloj y marca diferencia con resto del pais
++# (Argentine Province delayed clock and mark difference with the rest of the
++# country)
++# <a href="http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel">
++# http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel
++# </a>
++#
++# Es inminente que en San Luis atrasen una hora los relojes
++# (It is imminent in San Luis clocks one hour delay)
++# <a href="http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414">
++# http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414
++# </a>
++#
++# <a href="http://www.worldtimezone.net/dst_news/dst_news_argentina02.html">
++# http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
++# </a>
++
++# From Jesper Norgaard Welen (2008-01-18):
++# The page of the San Luis provincial government
++# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812">
++# http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812
++# </a>
++# confirms what Alex Krivenyshev has earlier sent to the tz
++# emailing list about that San Luis plans to return to standard
++# time much earlier than the rest of the country. It also
++# confirms that upon request the provinces San Juan and Mendoza
++# refused to follow San Luis in this change.
++#
++# The change is supposed to take place Monday the 21.st at 0:00
++# hours. As far as I understand it if this goes ahead, we need
++# a new timezone for San Luis (although there are also documented
++# independent changes in the southamerica file of San Luis in
++# 1990 and 1991 which has not been confirmed).
++
++# From Jesper Norgaard Welen (2008-01-25):
++# Unfortunately the below page has become defunct, about the San Luis
++# time change. Perhaps because it now is part of a group of pages "Most
++# important pages of 2008."
++#
++# You can use
++# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834">
++# http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834
++# </a>
++# instead it seems. Or use "Buscador" from the main page of the San Luis
++# government, and fill in "huso" and click OK, and you will get 3 pages
++# from which the first one is identical to the above.
++
++# From Mariano Absatz (2008-01-28):
++# I can confirm that the Province of San Luis (and so far only that
++# province) decided to go back to UTC-3 effective midnight Jan 20th 2008
++# (that is, Monday 21st at 0:00 is the time the clocks were delayed back
++# 1 hour), and they intend to keep UTC-3 as their timezone all year round
++# (that is, unless they change their mind any minute now).
++#
++# So we'll have to add yet another city to 'southamerica' (I think San
++# Luis city is the mos populated city in the Province, so it'd be
++# America/Argentina/San_Luis... of course I can't remember if San Luis's
++# history of particular changes goes along with Mendoza or San Juan :-(
++# (I only remember not being able to collect hard facts about San Luis
++# back in 2004, when these provinces changed to UTC-4 for a few days, I
++# mailed them personally and never got an answer).
++
++# From Arthur David Olson (2008-03-15):
++# Until there's better information, asssume San Luis was like San Juan
++# rather than Mendoza (since San Juan has a simpler DST history).
++
+ # Unless otherwise specified, data are from Shanks & Pottenger through 1992,
+ # from the IATA otherwise. As noted below, Shanks & Pottenger say that
+ # America/Cordoba split into 6 subregions during 1991/1992, but we
+@@ -214,7 +312,7 @@
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+- -3:00 - ART
++ -3:00 Arg AR%sT
+ #
+ # Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
+ # Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
+@@ -237,7 +335,7 @@
+ -4:00 - WART 1991 Oct 20
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+- -3:00 - ART
++ -3:00 Arg AR%sT
+ #
+ # Tucuman (TM)
+ Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
+@@ -250,7 +348,7 @@
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 Jun 1
+ -4:00 - WART 2004 Jun 13
+- -3:00 - ART
++ -3:00 Arg AR%sT
+ #
+ # La Rioja (LR)
+ Zone America/Argentina/La_Rioja -4:27:24 - LMT 1894 Oct 31
+@@ -263,7 +361,7 @@
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 Jun 1
+ -4:00 - WART 2004 Jun 20
+- -3:00 - ART
++ -3:00 Arg AR%sT
+ #
+ # San Juan (SJ)
+ Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31
+@@ -276,7 +374,7 @@
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 May 31
+ -4:00 - WART 2004 Jul 25
+- -3:00 - ART
++ -3:00 Arg AR%sT
+ #
+ # Jujuy (JY)
+ Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31
+@@ -290,7 +388,7 @@
+ -3:00 1:00 ARST 1992
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+- -3:00 - ART
++ -3:00 Arg AR%sT
+ #
+ # Catamarca (CT), Chubut (CH)
+ Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31
+@@ -303,7 +401,7 @@
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 Jun 1
+ -4:00 - WART 2004 Jun 20
+- -3:00 - ART
++ -3:00 Arg AR%sT
+ #
+ # Mendoza (MZ)
+ Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31
+@@ -320,6 +418,20 @@
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 May 23
+ -4:00 - WART 2004 Sep 26
++ -3:00 Arg AR%sT
++#
++# San Luis (SL)
++Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
++ -4:16:48 - CMT 1920 May
++ -4:00 - ART 1930 Dec
++ -4:00 Arg AR%sT 1969 Oct 5
++ -3:00 Arg AR%sT 1991 Mar 1
++ -4:00 - WART 1991 May 7
++ -3:00 Arg AR%sT 1999 Oct 3
++ -4:00 Arg AR%sT 2000 Mar 3
++ -3:00 - ART 2004 May 31
++ -4:00 - WART 2004 Jul 25
++ -3:00 Arg AR%sT 2008 Jan 21
+ -3:00 - ART
+ #
+ # Santa Cruz (SC)
+@@ -331,7 +443,7 @@
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 Jun 1
+ -4:00 - WART 2004 Jun 20
+- -3:00 - ART
++ -3:00 Arg AR%sT
+ #
+ # Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
+ Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
+@@ -342,7 +454,7 @@
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 May 30
+ -4:00 - WART 2004 Jun 20
+- -3:00 - ART
++ -3:00 Arg AR%sT
+
+ # Aruba
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -731,6 +843,26 @@
+ # America/Santiago. The pre-1980 Pacific/Easter data are dubious,
+ # but we have no other source.
+
++# From German Poo-Caaman~o (2008-03-03):
++# Due to drought, Chile extends Daylight Time in three weeks. This
++# is one-time change (Saturday 3/29 at 24:00 for America/Santiago
++# and Saturday 3/29 at 22:00 for Pacific/Easter)
++# The Supreme Decree is located at
++# <a href="http://www.shoa.cl/servicios/supremo316.pdf">
++# http://www.shoa.cl/servicios/supremo316.pdf
++# </a>
++# and the instructions for 2008 are located in:
++# <a href="http://www.horaoficial.cl/cambio.htm">
++# http://www.horaoficial.cl/cambio.htm
++# </a>.
++
++# From José Miguel Garrido (2008-03-05):
++# ...
++# You could see the announces of the change on
++# <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm">
++# http://www.shoa.cl/noticias/2008/04hora/hora.htm
++# </a>.
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Chile 1927 1932 - Sep 1 0:00 1:00 S
+ Rule Chile 1928 1932 - Apr 1 0:00 0 -
+@@ -761,7 +893,11 @@
+ Rule Chile 1998 only - Sep 27 4:00u 1:00 S
+ Rule Chile 1999 only - Apr 4 3:00u 0 -
+ Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S
+-Rule Chile 2000 max - Mar Sun>=9 3:00u 0 -
++Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 -
++# N.B.: the end of March 29 in Chile is March 30 in Universal time,
++# which is used below in specifying the transition.
++Rule Chile 2008 only - Mar 30 3:00u 0 -
++Rule Chile 2009 max - Mar Sun>=9 3:00u 0 -
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+ # (1996-09) says 1998-03-08. Ignore these.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -1107,19 +1243,17 @@
+
+ # Venezuela
+ #
+-# From Kiraz Janicke (2007-09-25), in
+-# http://www.venezuelanalysis.com/analysis/2645:
+-# The proposal ... involves turning the clock back half an hour from
+-# +4.00 Greenwich Mean Time (GMT), to +4.30GMT, the time zone
+-# Venezuela had until December 31, 1964, when the current time zone
+-# was adopted. The change was due to take place on September 17 and
+-# then on September 24, but has since been postponed until December
+-# 31, to allow for compliance with international organizations, such
+-# as the International Office of Weights and Measures.
++# From John Stainforth (2007-11-28):
++# ... the change for Venezuela originally expected for 2007-12-31 has
++# been brought forward to 2007-12-09. The official announcement was
++# published today in the "Gaceta Oficial de la Republica Bolivariana
++# de Venezuela, numero 38.819" (official document for all laws or
++# resolution publication)
++# http://www.globovision.com/news.php?nid=72208
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Caracas -4:27:44 - LMT 1890
+ -4:27:40 - CMT 1912 Feb 12 # Caracas Mean Time?
+ -4:30 - VET 1965 # Venezuela Time
+- -4:00 - VET 2008
++ -4:00 - VET 2007 Dec 9 03:00
+ -4:30 - VET
+Index: libkcal/libical/tzdata/europe
+===================================================================
+--- libkcal/libical/tzdata/europe.orig 2007-10-08 11:50:47.000000000 +0200
++++ libkcal/libical/tzdata/europe 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-# @(#)europe 8.11
++# @(#)europe 8.12
+ # <pre>
+
+ # This data is by no means authoritative; if you think you know better,
+@@ -1714,7 +1714,6 @@
+ # come up with more definitive info about the timekeeping during the
+ # war years it's probably best just do do the following for now:
+ Link Europe/Oslo Arctic/Longyearbyen
+-Link Europe/Oslo Atlantic/Jan_Mayen
+
+ # Poland
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Index: libkcal/libical/tzdata/leapseconds
+===================================================================
+--- libkcal/libical/tzdata/leapseconds.orig 2007-10-08 11:50:47.000000000 +0200
++++ libkcal/libical/tzdata/leapseconds 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-# @(#)leapseconds 8.4
++# @(#)leapseconds 8.5
+
+ # Allowance for leapseconds added to each timezone file.
+
+@@ -46,26 +46,27 @@
+ Leap 2005 Dec 31 23:59:60 + S
+
+ # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
++#
+ # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
+ #
+ # SERVICE DE LA ROTATION TERRESTRE
+-# OBSERVATOIRE DE PARIS
++# OBSERVATOIRE DE PARIS
+ # 61, Av. de l'Observatoire 75014 PARIS (France)
+ # Tel. : 33 (0) 1 40 51 22 26
+ # FAX : 33 (0) 1 40 51 22 91
+ # Internet : services.iers at obspm.fr
+ #
+-# Paris, 28 June 2007
++# Paris, 18 January 2008
+ #
+-# Bulletin C 34
++# Bulletin C 35
+ #
+-# To authorities responsible
++# To authorities responsible
+ # for the measurement and
+-# distribution of time
++# distribution of time
+ #
+ # INFORMATION ON UTC - TAI
+ #
+-# NO positive leap second will be introduced at the end of December 2007.
++# NO positive leap second will be introduced at the end of June 2008.
+ # The difference between Coordinated Universal Time UTC and the
+ # International Atomic Time TAI is :
+ #
+@@ -77,6 +78,6 @@
+ # will be no time step at the next possible date.
+ #
+ # Daniel GAMBIS
+-# Director
+-# Earth Orientation Center of IERS
++# Head
++# Earth Orientation Center of the IERS
+ # Observatoire de Paris, France
+Index: libkcal/libical/tzdata/northamerica
+===================================================================
+--- libkcal/libical/tzdata/northamerica.orig 2007-10-08 11:50:48.000000000 +0200
++++ libkcal/libical/tzdata/northamerica 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-# @(#)northamerica 8.18
++# @(#)northamerica 8.23
+ # <pre>
+
+ # also includes Central America and the Caribbean
+@@ -2187,6 +2187,69 @@
+ # says Cuban clocks will advance at midnight on March 10.
+ # For lack of better information, assume Cuba will use US rules,
+ # except that it switches at midnight standard time as usual.
++#
++# From Steffen Thorsen (2007-10-25):
++# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week
++# earlier - on the last Sunday of October, just like in 2006.
++#
++# He supplied these references:
++#
++# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
++# http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
++#
++# From Alex Kryvenishev (2007-10-25):
++# Here is also article from Granma (Cuba):
++#
++# [Regira] el Horario Normal desde el [proximo] domingo 28 de octubre
++# http://www.granma.cubaweb.cu/2007/10/24/nacional/artic07.html
++#
++# http://www.worldtimezone.com/dst_news/dst_news_cuba03.html
++
++# From Arthur David Olson (2008-03-09):
++# I'm in Maryland which is now observing United States Eastern Daylight
++# Time. At 9:44 local time I used RealPlayer to listen to
++# <a href="http://media.enet.cu/radioreloj">
++# http://media.enet.cu/radioreloj
++# </a>, a Cuban information station, and heard
++# the time announced as "ocho cuarenta y cuatro" ("eight forty-four"),
++# indicating that Cuba is still on standard time.
++
++# From Steffen Thorsen (2008-03-12):
++# It seems that Cuba will start DST on Sunday, 2007-03-16...
++# It was announced yesterday, according to this source (in Spanish):
++# <a href="http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm">
++# http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm
++# </a>
++#
++# Some more background information is posted here:
++# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html">
++# http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
++# </a>
++#
++# The article also says that Cuba has been observing DST since 1963,
++# while Shanks (and tzdata) has 1965 as the first date (except in the
++# 1940's). Many other web pages in Cuba also claim that it has been
++# observed since 1963, but with the exception of 1970 - an exception
++# which is not present in tzdata/Shanks. So there is a chance we need to
++# change some historic records as well.
++#
++# One example:
++# <a href="http://www.radiohc.cu/espanol/noticias/mar07/11mar/hor.htm">
++# http://www.radiohc.cu/espanol/noticias/mar07/11mar/hor.htm
++# </a>
++
++# From Jesper Norgaard Welen (2008-03-13):
++# The Cuban time change has just been confirmed on the most authoritative
++# web site, the Granma. Please check out
++# <a href="http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html">
++# http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html
++# </a>
++#
++# Basically as expected after Steffen Thorsens information, the change
++# will take place midnight between Saturday and Sunday.
++
++# From Arthur David Olson (2008-03-12):
++# Assume Sun>=15 (third Sunday) going forward.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Cuba 1928 only - Jun 10 0:00 1:00 D
+@@ -2218,9 +2281,9 @@
+ Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
+ Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
+ Rule Cuba 2000 2006 - Apr Sun>=1 0:00s 1:00 D
+-Rule Cuba 2006 only - Oct lastSun 0:00s 0 S
+-Rule Cuba 2007 max - Mar Sun>=8 0:00s 1:00 D
+-Rule Cuba 2007 max - Nov Sun>=1 0:00s 0 S
++Rule Cuba 2006 max - Oct lastSun 0:00s 0 S
++Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D
++Rule Cuba 2008 max - Mar Sun>=15 0:00s 1:00 D
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Havana -5:29:28 - LMT 1890
+@@ -2287,6 +2350,10 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre
+ -4:00 - AST
++# St Barthelemy
++Link America/Guadeloupe America/St_Barthelemy
++# St Martin (French part)
++Link America/Guadeloupe America/Marigot
+
+ # Guatemala
+ #
+Index: libkcal/libical/tzdata/asia
+===================================================================
+--- libkcal/libical/tzdata/asia.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/tzdata/asia 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-# @(#)asia 8.12
++# @(#)asia 8.18
+ # <pre>
+
+ # This data is by no means authoritative; if you think you know better,
+@@ -446,13 +446,13 @@
+
+ # India
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Calcutta 5:53:28 - LMT 1880 # Kolkata
++Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
+ 5:53:20 - HMT 1941 Oct # Howrah Mean Time?
+ 6:30 - BURT 1942 May 15 # Burma Time
+ 5:30 - IST 1942 Sep
+ 5:30 1:00 IST 1945 Oct 15
+ 5:30 - IST
+-# The following are like Asia/Calcutta:
++# The following are like Asia/Kolkata:
+ # Andaman Is
+ # Lakshadweep (Laccadive, Minicoy and Amindivi Is)
+ # Nicobar Is
+@@ -577,6 +577,15 @@
+ # daylight saving time ...
+ # http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
+ #
++# From Roozbeh Pournader (2007-11-05):
++# This is quoted from Official Gazette of the Islamic Republic of
++# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
++# [2007-10-16]. I am doing the best translation I can:...
++# The official time of the country will be moved forward for one hour
++# on the 24 hours of the first day of the month of Farvardin and will
++# be changed back to its previous state on the 24 hours of the
++# thirtieth day of Shahrivar.
++#
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Iran 1978 1980 - Mar 21 0:00 1:00 D
+ Rule Iran 1978 only - Oct 21 0:00 0 S
+@@ -651,6 +660,21 @@
+ #
+ # So we'll ignore the Economist's claim.
+
++# From Steffen Thorsen (2008-03-10):
++# The cabinet in Iraq abolished DST last week, according to the following
++# news sources (in Arabic):
++# <a href="http://www.aljeeran.net/wesima_articles/news-20080305-98602.html">
++# http://www.aljeeran.net/wesima_articles/news-20080305-98602.html
++# </a>
++# <a href="http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10">
++# http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
++# </a>
++#
++# We have published a short article in English about the change:
++# <a href="http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html">
++# http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
++# </a>
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Iraq 1982 only - May 1 0:00 1:00 D
+ Rule Iraq 1982 1984 - Oct 1 0:00 0 S
+@@ -661,8 +685,8 @@
+ # IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the `:01' is a typo.
+ # Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
+ #
+-Rule Iraq 1991 max - Apr 1 3:00s 1:00 D
+-Rule Iraq 1991 max - Oct 1 3:00s 0 S
++Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 D
++Rule Iraq 1991 2007 - Oct 1 3:00s 0 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Baghdad 2:57:40 - LMT 1890
+ 2:57:36 - BMT 1918 # Baghdad Mean Time?
+@@ -1678,7 +1702,7 @@
+ # kept their clocks set five and a half hours ahead of Greenwich Mean
+ # Time (GMT), in line with neighbor India.
+ # From Paul Eggert (2006-04-18):
+-# People who live in regions under Tamil control can use TZ='Asia/Calcutta',
++# People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
+ # as that zone has agreed with the Tamil areas since our cutoff date of 1970.
+
+ # From K Sethu (2006-04-25):
+@@ -1768,10 +1792,62 @@
+ # From Paul Eggert (2007-03-29):
+ # Today the AP reported "Syria will switch to summertime at midnight Thursday."
+ # http://www.iht.com/articles/ap/2007/03/29/africa/ME-GEN-Syria-Time-Change.php
+-# For lack of better info, assume the rule changed to "last Friday in March"
+-# this year.
+-Rule Syria 2007 max - Mar lastFri 0:00 1:00 S
+-Rule Syria 2007 max - Oct 1 0:00 0 -
++Rule Syria 2007 only - Mar lastFri 0:00 1:00 S
++# From Jesper Norgard (2007-10-27):
++# The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
++# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or
++# rather Midnight between Thursday and Friday. This does make more sence than
++# having it between Wednesday and Thursday (two workdays in Syria) since the
++# weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now
++# it is implemented at midnight of the last workday before weekend...
++#
++# From Steffen Thorsen (2007-10-27):
++# Jesper Norgaard Welen wrote:
++#
++# > "Winter local time in Syria will be observed at midnight of Thursday 1
++# > November 2007, and the clock will be put back 1 hour."
++#
++# I found confirmation on this in this gov.sy-article (Arabic):
++# http://wehda.alwehda.gov.sy/_print_veiw.asp?FileName=12521710520070926111247
++#
++# which using Google's translate tools says:
++# Council of Ministers also approved the commencement of work on
++# identifying the winter time as of Friday, 2/11/2007 where the 60th
++# minute delay at midnight Thursday 1/11/2007.
++Rule Syria 2007 only - Nov Fri>=1 0:00 0 -
++
++# From Stephen Colebourne (2008-03-17):
++# For everyone's info, I saw an IATA time zone change for [Syria] for
++# this month (March 2008) in the last day or so...This is the data IATA
++# are now using:
++# Country Time Standard --- DST Start --- --- DST End --- DST
++# Name Zone Variation Time Date Time Date
++# Variation
++# Syrian Arab
++# Republic SY +0200 2200 03APR08 2100 30SEP08 +0300
++# 2200 02APR09 2100 30SEP09 +0300
++# 2200 01APR10 2100 30SEP10 +0300
++
++# From Arthur David Olson (2008-03-17):
++# Here's a link to English-language coverage by the Syrian Arab News
++# Agency (SANA)...
++# <a href="http://www.sana.sy/eng/21/2008/03/11/165173.htm">
++# http://www.sana.sy/eng/21/2008/03/11/165173.htm
++# </a>...which reads (in part) "The Cabinet approved the suggestion of the
++# Ministry of Electricity to begin daylight savings time on Friday April
++# 4th, advancing clocks one hour ahead on midnight of Thursday April 3rd."
++# Since Syria is two hours east of UTC, the 2200 and 2100 transition times
++# shown above match up with midnight in Syria.
++
++# From Arthur David Olson (2008-03-18):
++# My buest guess at a Syrian rule is "the Friday nearest April 1";
++# coding that involves either using a "Mar Fri>=29" construct that old time zone
++# compilers can't handle or having multiple Rules (a la Israel).
++# For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
++
++Rule Syria 2008 max - Apr Fri>=1 0:00 1:00 S
++Rule Syria 2008 max - Oct 1 0:00 0 -
++
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
+ 2:00 Syria EE%sT
+@@ -1825,13 +1901,13 @@
+
+ # Vietnam
+
+-# From Paul Eggert (1993-11-18):
+-# Saigon's official name is Thanh-Pho Ho Chi Minh, but it's too long.
+-# We'll stick with the traditional name for now.
++# From Arthur David Olson (2008-03-18):
++# The English-language name of Vietnam's most populous city is "Ho Chi Min City";
++# we use Ho_Chi_Minh below to avoid a name of more than 14 characters.
+
+ # From Shanks & Pottenger:
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Saigon 7:06:40 - LMT 1906 Jun 9
++Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jun 9
+ 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT?
+ 7:00 - ICT 1912 May
+ 8:00 - ICT 1931 May
+Index: libkcal/libical/tzdata/backward
+===================================================================
+--- libkcal/libical/tzdata/backward.orig 2007-05-14 09:54:48.000000000 +0200
++++ libkcal/libical/tzdata/backward 2008-06-29 20:10:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-# @(#)backward 8.3
++# @(#)backward 8.6
+
+ # This file provides links between current names for time zones
+ # and their old names. Many names changed in late 1993.
+@@ -24,12 +24,15 @@
+ Link Asia/Ashgabat Asia/Ashkhabad
+ Link Asia/Chongqing Asia/Chungking
+ Link Asia/Dhaka Asia/Dacca
++Link Asia/Kolkata Asia/Calcutta
+ Link Asia/Macau Asia/Macao
+ Link Asia/Jerusalem Asia/Tel_Aviv
++Link Asia/Ho_Chi_Minh Asia/Saigon
+ Link Asia/Thimphu Asia/Thimbu
+ Link Asia/Makassar Asia/Ujung_Pandang
+ Link Asia/Ulaanbaatar Asia/Ulan_Bator
+ Link Atlantic/Faroe Atlantic/Faeroe
++Link Europe/Oslo Atlantic/Jan_Mayen
+ Link Australia/Sydney Australia/ACT
+ Link Australia/Sydney Australia/Canberra
+ Link Australia/Lord_Howe Australia/LHI
+Index: libkcal/libical/zoneinfo/Atlantic/Madeira.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/Madeira.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/Madeira.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/Madeira
++TZID:/kde.org/Olson_20080523_1/Atlantic/Madeira
+ X-LIC-LOCATION:Atlantic/Madeira
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Atlantic/St_Helena.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/St_Helena.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/St_Helena.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/St_Helena
++TZID:/kde.org/Olson_20080523_1/Atlantic/St_Helena
+ X-LIC-LOCATION:Atlantic/St_Helena
+ BEGIN:STANDARD
+ TZOFFSETFROM:-002248
+Index: libkcal/libical/zoneinfo/Atlantic/Azores.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/Azores.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/Azores.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/Azores
++TZID:/kde.org/Olson_20080523_1/Atlantic/Azores
+ X-LIC-LOCATION:Atlantic/Azores
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0100
+Index: libkcal/libical/zoneinfo/Atlantic/Faroe.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/Faroe.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/Faroe.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/Faroe
++TZID:/kde.org/Olson_20080523_1/Atlantic/Faroe
+ X-LIC-LOCATION:Atlantic/Faroe
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Atlantic/Canary.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/Canary.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/Canary.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/Canary
++TZID:/kde.org/Olson_20080523_1/Atlantic/Canary
+ X-LIC-LOCATION:Atlantic/Canary
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Atlantic/Cape_Verde.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/Cape_Verde.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/Cape_Verde.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/Cape_Verde
++TZID:/kde.org/Olson_20080523_1/Atlantic/Cape_Verde
+ X-LIC-LOCATION:Atlantic/Cape_Verde
+ BEGIN:STANDARD
+ TZOFFSETFROM:-013404
+Index: libkcal/libical/zoneinfo/Atlantic/Bermuda.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/Bermuda.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/Bermuda.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/Bermuda
++TZID:/kde.org/Olson_20080523_1/Atlantic/Bermuda
+ X-LIC-LOCATION:Atlantic/Bermuda
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/Atlantic/Reykjavik.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/Reykjavik.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/Reykjavik.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/Reykjavik
++TZID:/kde.org/Olson_20080523_1/Atlantic/Reykjavik
+ X-LIC-LOCATION:Atlantic/Reykjavik
+ BEGIN:STANDARD
+ TZOFFSETFROM:-012724
+Index: libkcal/libical/zoneinfo/Atlantic/South_Georgia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/South_Georgia.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/South_Georgia.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/South_Georgia
++TZID:/kde.org/Olson_20080523_1/Atlantic/South_Georgia
+ X-LIC-LOCATION:Atlantic/South_Georgia
+ BEGIN:STANDARD
+ TZOFFSETFROM:-022608
+Index: libkcal/libical/zoneinfo/Atlantic/Stanley.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Atlantic/Stanley.ics.orig 2008-02-13 10:39:46.000000000 +0100
++++ libkcal/libical/zoneinfo/Atlantic/Stanley.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Atlantic/Stanley
++TZID:/kde.org/Olson_20080523_1/Atlantic/Stanley
+ X-LIC-LOCATION:Atlantic/Stanley
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0300
+Index: libkcal/libical/zoneinfo/Europe/Rome.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Rome.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Rome.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Rome
++TZID:/kde.org/Olson_20080523_1/Europe/Rome
+ X-LIC-LOCATION:Europe/Rome
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Chisinau.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Chisinau.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Chisinau.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Chisinau
++TZID:/kde.org/Olson_20080523_1/Europe/Chisinau
+ X-LIC-LOCATION:Europe/Chisinau
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Warsaw.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Warsaw.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Warsaw.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Warsaw
++TZID:/kde.org/Olson_20080523_1/Europe/Warsaw
+ X-LIC-LOCATION:Europe/Warsaw
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Helsinki.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Helsinki.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Helsinki.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Helsinki
++TZID:/kde.org/Olson_20080523_1/Europe/Helsinki
+ X-LIC-LOCATION:Europe/Helsinki
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Podgorica.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Podgorica.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Podgorica.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Podgorica
++TZID:/kde.org/Olson_20080523_1/Europe/Podgorica
+ X-LIC-LOCATION:Europe/Podgorica
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Berlin.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Berlin.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Berlin.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Berlin
++TZID:/kde.org/Olson_20080523_1/Europe/Berlin
+ X-LIC-LOCATION:Europe/Berlin
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Oslo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Oslo.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Oslo.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Oslo
++TZID:/kde.org/Olson_20080523_1/Europe/Oslo
+ X-LIC-LOCATION:Europe/Oslo
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Dublin.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Dublin.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Dublin.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Dublin
++TZID:/kde.org/Olson_20080523_1/Europe/Dublin
+ X-LIC-LOCATION:Europe/Dublin
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Europe/Paris.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Paris.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Paris.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Paris
++TZID:/kde.org/Olson_20080523_1/Europe/Paris
+ X-LIC-LOCATION:Europe/Paris
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Simferopol.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Simferopol.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Simferopol.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Simferopol
++TZID:/kde.org/Olson_20080523_1/Europe/Simferopol
+ X-LIC-LOCATION:Europe/Simferopol
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0300
+Index: libkcal/libical/zoneinfo/Europe/Vienna.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Vienna.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Vienna.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Vienna
++TZID:/kde.org/Olson_20080523_1/Europe/Vienna
+ X-LIC-LOCATION:Europe/Vienna
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Minsk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Minsk.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Minsk.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Minsk
++TZID:/kde.org/Olson_20080523_1/Europe/Minsk
+ X-LIC-LOCATION:Europe/Minsk
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Istanbul.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Istanbul.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Istanbul.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Istanbul
++TZID:/kde.org/Olson_20080523_1/Europe/Istanbul
+ X-LIC-LOCATION:Europe/Istanbul
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Athens.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Athens.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Athens.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Athens
++TZID:/kde.org/Olson_20080523_1/Europe/Athens
+ X-LIC-LOCATION:Europe/Athens
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Kaliningrad.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Kaliningrad.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Kaliningrad.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Kaliningrad
++TZID:/kde.org/Olson_20080523_1/Europe/Kaliningrad
+ X-LIC-LOCATION:Europe/Kaliningrad
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Bratislava.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Bratislava.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Bratislava.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Bratislava
++TZID:/kde.org/Olson_20080523_1/Europe/Bratislava
+ X-LIC-LOCATION:Europe/Bratislava
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/London.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/London.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/London.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/London
++TZID:/kde.org/Olson_20080523_1/Europe/London
+ X-LIC-LOCATION:Europe/London
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Europe/Vaduz.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Vaduz.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Vaduz.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Vaduz
++TZID:/kde.org/Olson_20080523_1/Europe/Vaduz
+ X-LIC-LOCATION:Europe/Vaduz
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Malta.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Malta.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Malta.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Malta
++TZID:/kde.org/Olson_20080523_1/Europe/Malta
+ X-LIC-LOCATION:Europe/Malta
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Kiev.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Kiev.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Kiev.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Kiev
++TZID:/kde.org/Olson_20080523_1/Europe/Kiev
+ X-LIC-LOCATION:Europe/Kiev
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Madrid.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Madrid.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Madrid.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Madrid
++TZID:/kde.org/Olson_20080523_1/Europe/Madrid
+ X-LIC-LOCATION:Europe/Madrid
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Jersey.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Jersey.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Jersey.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Jersey
++TZID:/kde.org/Olson_20080523_1/Europe/Jersey
+ X-LIC-LOCATION:Europe/Jersey
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Europe/Ljubljana.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Ljubljana.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Ljubljana.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Ljubljana
++TZID:/kde.org/Olson_20080523_1/Europe/Ljubljana
+ X-LIC-LOCATION:Europe/Ljubljana
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Brussels.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Brussels.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Brussels.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Brussels
++TZID:/kde.org/Olson_20080523_1/Europe/Brussels
+ X-LIC-LOCATION:Europe/Brussels
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Stockholm.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Stockholm.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Stockholm.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Stockholm
++TZID:/kde.org/Olson_20080523_1/Europe/Stockholm
+ X-LIC-LOCATION:Europe/Stockholm
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Samara.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Samara.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Samara.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Samara
++TZID:/kde.org/Olson_20080523_1/Europe/Samara
+ X-LIC-LOCATION:Europe/Samara
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0400
+Index: libkcal/libical/zoneinfo/Europe/Zurich.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Zurich.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Zurich.ics 2008-06-29 20:10:36.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Zurich
++TZID:/kde.org/Olson_20080523_1/Europe/Zurich
+ X-LIC-LOCATION:Europe/Zurich
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Belgrade.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Belgrade.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Belgrade.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Belgrade
++TZID:/kde.org/Olson_20080523_1/Europe/Belgrade
+ X-LIC-LOCATION:Europe/Belgrade
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Moscow.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Moscow.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Moscow.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Moscow
++TZID:/kde.org/Olson_20080523_1/Europe/Moscow
+ X-LIC-LOCATION:Europe/Moscow
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0300
+Index: libkcal/libical/zoneinfo/Europe/Budapest.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Budapest.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Budapest.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Budapest
++TZID:/kde.org/Olson_20080523_1/Europe/Budapest
+ X-LIC-LOCATION:Europe/Budapest
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Copenhagen.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Copenhagen.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Copenhagen.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Copenhagen
++TZID:/kde.org/Olson_20080523_1/Europe/Copenhagen
+ X-LIC-LOCATION:Europe/Copenhagen
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Gibraltar.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Gibraltar.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Gibraltar.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Gibraltar
++TZID:/kde.org/Olson_20080523_1/Europe/Gibraltar
+ X-LIC-LOCATION:Europe/Gibraltar
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Sarajevo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Sarajevo.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Sarajevo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Sarajevo
++TZID:/kde.org/Olson_20080523_1/Europe/Sarajevo
+ X-LIC-LOCATION:Europe/Sarajevo
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Zagreb.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Zagreb.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Zagreb.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Zagreb
++TZID:/kde.org/Olson_20080523_1/Europe/Zagreb
+ X-LIC-LOCATION:Europe/Zagreb
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Zaporozhye.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Zaporozhye.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Zaporozhye.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Zaporozhye
++TZID:/kde.org/Olson_20080523_1/Europe/Zaporozhye
+ X-LIC-LOCATION:Europe/Zaporozhye
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Isle_of_Man.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Isle_of_Man.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Isle_of_Man.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Isle_of_Man
++TZID:/kde.org/Olson_20080523_1/Europe/Isle_of_Man
+ X-LIC-LOCATION:Europe/Isle_of_Man
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Europe/Monaco.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Monaco.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Monaco.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Monaco
++TZID:/kde.org/Olson_20080523_1/Europe/Monaco
+ X-LIC-LOCATION:Europe/Monaco
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Amsterdam.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Amsterdam.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Amsterdam.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Amsterdam
++TZID:/kde.org/Olson_20080523_1/Europe/Amsterdam
+ X-LIC-LOCATION:Europe/Amsterdam
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Bucharest.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Bucharest.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Bucharest.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Bucharest
++TZID:/kde.org/Olson_20080523_1/Europe/Bucharest
+ X-LIC-LOCATION:Europe/Bucharest
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Riga.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Riga.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Riga.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Riga
++TZID:/kde.org/Olson_20080523_1/Europe/Riga
+ X-LIC-LOCATION:Europe/Riga
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Tirane.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Tirane.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Tirane.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Tirane
++TZID:/kde.org/Olson_20080523_1/Europe/Tirane
+ X-LIC-LOCATION:Europe/Tirane
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Prague.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Prague.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Prague.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Prague
++TZID:/kde.org/Olson_20080523_1/Europe/Prague
+ X-LIC-LOCATION:Europe/Prague
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Volgograd.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Volgograd.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Volgograd.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Volgograd
++TZID:/kde.org/Olson_20080523_1/Europe/Volgograd
+ X-LIC-LOCATION:Europe/Volgograd
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0300
+Index: libkcal/libical/zoneinfo/Europe/Nicosia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Nicosia.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Nicosia.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Nicosia
++TZID:/kde.org/Olson_20080523_1/Europe/Nicosia
+ X-LIC-LOCATION:Europe/Nicosia
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0300
+Index: libkcal/libical/zoneinfo/Europe/Vatican.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Vatican.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Vatican.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Vatican
++TZID:/kde.org/Olson_20080523_1/Europe/Vatican
+ X-LIC-LOCATION:Europe/Vatican
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Lisbon.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Lisbon.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Lisbon.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Lisbon
++TZID:/kde.org/Olson_20080523_1/Europe/Lisbon
+ X-LIC-LOCATION:Europe/Lisbon
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Andorra.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Andorra.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Andorra.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Andorra
++TZID:/kde.org/Olson_20080523_1/Europe/Andorra
+ X-LIC-LOCATION:Europe/Andorra
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/San_Marino.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/San_Marino.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/San_Marino.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/San_Marino
++TZID:/kde.org/Olson_20080523_1/Europe/San_Marino
+ X-LIC-LOCATION:Europe/San_Marino
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Luxembourg.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Luxembourg.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Luxembourg.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Luxembourg
++TZID:/kde.org/Olson_20080523_1/Europe/Luxembourg
+ X-LIC-LOCATION:Europe/Luxembourg
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Vilnius.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Vilnius.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Vilnius.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Vilnius
++TZID:/kde.org/Olson_20080523_1/Europe/Vilnius
+ X-LIC-LOCATION:Europe/Vilnius
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Skopje.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Skopje.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Skopje.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Skopje
++TZID:/kde.org/Olson_20080523_1/Europe/Skopje
+ X-LIC-LOCATION:Europe/Skopje
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Europe/Mariehamn.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Mariehamn.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Mariehamn.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Mariehamn
++TZID:/kde.org/Olson_20080523_1/Europe/Mariehamn
+ X-LIC-LOCATION:Europe/Mariehamn
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Guernsey.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Guernsey.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Guernsey.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Guernsey
++TZID:/kde.org/Olson_20080523_1/Europe/Guernsey
+ X-LIC-LOCATION:Europe/Guernsey
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Europe/Sofia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Sofia.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Sofia.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Sofia
++TZID:/kde.org/Olson_20080523_1/Europe/Sofia
+ X-LIC-LOCATION:Europe/Sofia
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Tallinn.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Tallinn.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Tallinn.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Tallinn
++TZID:/kde.org/Olson_20080523_1/Europe/Tallinn
+ X-LIC-LOCATION:Europe/Tallinn
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Europe/Uzhgorod.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Europe/Uzhgorod.ics.orig 2008-02-13 10:39:48.000000000 +0100
++++ libkcal/libical/zoneinfo/Europe/Uzhgorod.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Europe/Uzhgorod
++TZID:/kde.org/Olson_20080523_1/Europe/Uzhgorod
+ X-LIC-LOCATION:Europe/Uzhgorod
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/America/Marigot.ics
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libkcal/libical/zoneinfo/America/Marigot.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -0,0 +1,15 @@
++BEGIN:VCALENDAR
++PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
++VERSION:2.0
++BEGIN:VTIMEZONE
++TZID:/kde.org/Olson_20080523_1/America/Marigot
++X-LIC-LOCATION:America/Marigot
++BEGIN:STANDARD
++TZOFFSETFROM:-040608
++TZOFFSETTO:-0400
++TZNAME:AST
++DTSTART:19110608T000000
++RDATE:19110608T000000
++END:STANDARD
++END:VTIMEZONE
++END:VCALENDAR
+Index: libkcal/libical/zoneinfo/America/Port_of_Spain.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Port_of_Spain.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Port_of_Spain.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Port_of_Spain
++TZID:/kde.org/Olson_20080523_1/America/Port_of_Spain
+ X-LIC-LOCATION:America/Port_of_Spain
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040604
+Index: libkcal/libical/zoneinfo/America/Regina.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Regina.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Regina.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Regina
++TZID:/kde.org/Olson_20080523_1/America/Regina
+ X-LIC-LOCATION:America/Regina
+ BEGIN:STANDARD
+ TZOFFSETFROM:-065836
+Index: libkcal/libical/zoneinfo/America/Glace_Bay.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Glace_Bay.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Glace_Bay.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Glace_Bay
++TZID:/kde.org/Olson_20080523_1/America/Glace_Bay
+ X-LIC-LOCATION:America/Glace_Bay
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Mazatlan.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Mazatlan.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Mazatlan.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Mazatlan
++TZID:/kde.org/Olson_20080523_1/America/Mazatlan
+ X-LIC-LOCATION:America/Mazatlan
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/St_Vincent.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/St_Vincent.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/St_Vincent.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/St_Vincent
++TZID:/kde.org/Olson_20080523_1/America/St_Vincent
+ X-LIC-LOCATION:America/St_Vincent
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040456
+Index: libkcal/libical/zoneinfo/America/Asuncion.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Asuncion.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Asuncion.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Asuncion
++TZID:/kde.org/Olson_20080523_1/America/Asuncion
+ X-LIC-LOCATION:America/Asuncion
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Campo_Grande.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Campo_Grande.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Campo_Grande.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Campo_Grande
++TZID:/kde.org/Olson_20080523_1/America/Campo_Grande
+ X-LIC-LOCATION:America/Campo_Grande
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Montreal.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Montreal.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Montreal.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Montreal
++TZID:/kde.org/Olson_20080523_1/America/Montreal
+ X-LIC-LOCATION:America/Montreal
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Thule.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Thule.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Thule.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Thule
++TZID:/kde.org/Olson_20080523_1/America/Thule
+ X-LIC-LOCATION:America/Thule
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Cayenne.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Cayenne.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Cayenne.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Cayenne
++TZID:/kde.org/Olson_20080523_1/America/Cayenne
+ X-LIC-LOCATION:America/Cayenne
+ BEGIN:STANDARD
+ TZOFFSETFROM:-032920
+Index: libkcal/libical/zoneinfo/America/Yakutat.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Yakutat.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Yakutat.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Yakutat
++TZID:/kde.org/Olson_20080523_1/America/Yakutat
+ X-LIC-LOCATION:America/Yakutat
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0900
+Index: libkcal/libical/zoneinfo/America/Denver.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Denver.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Denver.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Denver
++TZID:/kde.org/Olson_20080523_1/America/Denver
+ X-LIC-LOCATION:America/Denver
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/Scoresbysund.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Scoresbysund.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Scoresbysund.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Scoresbysund
++TZID:/kde.org/Olson_20080523_1/America/Scoresbysund
+ X-LIC-LOCATION:America/Scoresbysund
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0100
+Index: libkcal/libical/zoneinfo/America/Monterrey.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Monterrey.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Monterrey.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Monterrey
++TZID:/kde.org/Olson_20080523_1/America/Monterrey
+ X-LIC-LOCATION:America/Monterrey
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Jamaica.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Jamaica.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Jamaica.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Jamaica
++TZID:/kde.org/Olson_20080523_1/America/Jamaica
+ X-LIC-LOCATION:America/Jamaica
+ BEGIN:STANDARD
+ TZOFFSETFROM:-050712
+Index: libkcal/libical/zoneinfo/America/Indiana/Petersburg.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Indiana/Petersburg.ics.orig 2008-02-13 10:39:49.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Indiana/Petersburg.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Indiana/Petersburg
++TZID:/kde.org/Olson_20080523_1/America/Indiana/Petersburg
+ X-LIC-LOCATION:America/Indiana/Petersburg
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Indiana/Marengo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Indiana/Marengo.ics.orig 2008-02-13 10:39:49.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Indiana/Marengo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Indiana/Marengo
++TZID:/kde.org/Olson_20080523_1/America/Indiana/Marengo
+ X-LIC-LOCATION:America/Indiana/Marengo
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Indiana/Tell_City.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Indiana/Tell_City.ics.orig 2008-02-13 10:39:49.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Indiana/Tell_City.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Indiana/Tell_City
++TZID:/kde.org/Olson_20080523_1/America/Indiana/Tell_City
+ X-LIC-LOCATION:America/Indiana/Tell_City
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Indiana/Vincennes.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Indiana/Vincennes.ics.orig 2008-02-13 10:39:49.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Indiana/Vincennes.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Indiana/Vincennes
++TZID:/kde.org/Olson_20080523_1/America/Indiana/Vincennes
+ X-LIC-LOCATION:America/Indiana/Vincennes
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Indiana/Indianapolis.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Indiana/Indianapolis.ics.orig 2008-02-13 10:39:49.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Indiana/Indianapolis.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Indiana/Indianapolis
++TZID:/kde.org/Olson_20080523_1/America/Indiana/Indianapolis
+ X-LIC-LOCATION:America/Indiana/Indianapolis
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Indiana/Vevay.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Indiana/Vevay.ics.orig 2008-02-13 10:39:49.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Indiana/Vevay.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Indiana/Vevay
++TZID:/kde.org/Olson_20080523_1/America/Indiana/Vevay
+ X-LIC-LOCATION:America/Indiana/Vevay
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Indiana/Knox.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Indiana/Knox.ics.orig 2008-02-13 10:39:49.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Indiana/Knox.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Indiana/Knox
++TZID:/kde.org/Olson_20080523_1/America/Indiana/Knox
+ X-LIC-LOCATION:America/Indiana/Knox
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Indiana/Winamac.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Indiana/Winamac.ics.orig 2008-02-13 10:39:49.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Indiana/Winamac.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Indiana/Winamac
++TZID:/kde.org/Olson_20080523_1/America/Indiana/Winamac
+ X-LIC-LOCATION:America/Indiana/Winamac
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Juneau.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Juneau.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Juneau.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Juneau
++TZID:/kde.org/Olson_20080523_1/America/Juneau
+ X-LIC-LOCATION:America/Juneau
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0900
+Index: libkcal/libical/zoneinfo/America/Fortaleza.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Fortaleza.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Fortaleza.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Fortaleza
++TZID:/kde.org/Olson_20080523_1/America/Fortaleza
+ X-LIC-LOCATION:America/Fortaleza
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0234
+Index: libkcal/libical/zoneinfo/America/Araguaina.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Araguaina.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Araguaina.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Araguaina
++TZID:/kde.org/Olson_20080523_1/America/Araguaina
+ X-LIC-LOCATION:America/Araguaina
+ BEGIN:STANDARD
+ TZOFFSETFROM:-031248
+Index: libkcal/libical/zoneinfo/America/Yellowknife.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Yellowknife.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Yellowknife.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Yellowknife
++TZID:/kde.org/Olson_20080523_1/America/Yellowknife
+ X-LIC-LOCATION:America/Yellowknife
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/Miquelon.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Miquelon.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Miquelon.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Miquelon
++TZID:/kde.org/Olson_20080523_1/America/Miquelon
+ X-LIC-LOCATION:America/Miquelon
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0300
+Index: libkcal/libical/zoneinfo/America/Guadeloupe.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Guadeloupe.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Guadeloupe.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Guadeloupe
++TZID:/kde.org/Olson_20080523_1/America/Guadeloupe
+ X-LIC-LOCATION:America/Guadeloupe
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040608
+Index: libkcal/libical/zoneinfo/America/Los_Angeles.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Los_Angeles.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Los_Angeles.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Los_Angeles
++TZID:/kde.org/Olson_20080523_1/America/Los_Angeles
+ X-LIC-LOCATION:America/Los_Angeles
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0800
+Index: libkcal/libical/zoneinfo/America/Tijuana.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Tijuana.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Tijuana.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Tijuana
++TZID:/kde.org/Olson_20080523_1/America/Tijuana
+ X-LIC-LOCATION:America/Tijuana
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/Anguilla.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Anguilla.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Anguilla.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Anguilla
++TZID:/kde.org/Olson_20080523_1/America/Anguilla
+ X-LIC-LOCATION:America/Anguilla
+ BEGIN:STANDARD
+ TZOFFSETFROM:-041216
+Index: libkcal/libical/zoneinfo/America/Caracas.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Caracas.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Caracas.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Caracas
++TZID:/kde.org/Olson_20080523_1/America/Caracas
+ X-LIC-LOCATION:America/Caracas
+ BEGIN:STANDARD
+ TZOFFSETFROM:-042744
+@@ -29,8 +29,8 @@
+ TZOFFSETFROM:-0400
+ TZOFFSETTO:-0430
+ TZNAME:VET
+-DTSTART:20080101T000000
+-RDATE:20080101T000000
++DTSTART:20071209T030000
++RDATE:20071209T030000
+ END:STANDARD
+ END:VTIMEZONE
+ END:VCALENDAR
+Index: libkcal/libical/zoneinfo/America/Montserrat.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Montserrat.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Montserrat.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Montserrat
++TZID:/kde.org/Olson_20080523_1/America/Montserrat
+ X-LIC-LOCATION:America/Montserrat
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040852
+Index: libkcal/libical/zoneinfo/America/Chihuahua.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Chihuahua.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Chihuahua.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Chihuahua
++TZID:/kde.org/Olson_20080523_1/America/Chihuahua
+ X-LIC-LOCATION:America/Chihuahua
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/Porto_Velho.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Porto_Velho.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Porto_Velho.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Porto_Velho
++TZID:/kde.org/Olson_20080523_1/America/Porto_Velho
+ X-LIC-LOCATION:America/Porto_Velho
+ BEGIN:STANDARD
+ TZOFFSETFROM:-041536
+Index: libkcal/libical/zoneinfo/America/Santo_Domingo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Santo_Domingo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Santo_Domingo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Santo_Domingo
++TZID:/kde.org/Olson_20080523_1/America/Santo_Domingo
+ X-LIC-LOCATION:America/Santo_Domingo
+ BEGIN:STANDARD
+ TZOFFSETFROM:-043936
+Index: libkcal/libical/zoneinfo/America/Guatemala.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Guatemala.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Guatemala.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Guatemala
++TZID:/kde.org/Olson_20080523_1/America/Guatemala
+ X-LIC-LOCATION:America/Guatemala
+ BEGIN:STANDARD
+ TZOFFSETFROM:-060204
+Index: libkcal/libical/zoneinfo/America/North_Dakota/New_Salem.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/North_Dakota/New_Salem.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/North_Dakota/New_Salem.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/North_Dakota/New_Salem
++TZID:/kde.org/Olson_20080523_1/America/North_Dakota/New_Salem
+ X-LIC-LOCATION:America/North_Dakota/New_Salem
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/North_Dakota/Center.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/North_Dakota/Center.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/North_Dakota/Center.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/North_Dakota/Center
++TZID:/kde.org/Olson_20080523_1/America/North_Dakota/Center
+ X-LIC-LOCATION:America/North_Dakota/Center
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/St_Thomas.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/St_Thomas.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/St_Thomas.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/St_Thomas
++TZID:/kde.org/Olson_20080523_1/America/St_Thomas
+ X-LIC-LOCATION:America/St_Thomas
+ BEGIN:STANDARD
+ TZOFFSETFROM:-041944
+Index: libkcal/libical/zoneinfo/America/St_Barthelemy.ics
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libkcal/libical/zoneinfo/America/St_Barthelemy.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -0,0 +1,15 @@
++BEGIN:VCALENDAR
++PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
++VERSION:2.0
++BEGIN:VTIMEZONE
++TZID:/kde.org/Olson_20080523_1/America/St_Barthelemy
++X-LIC-LOCATION:America/St_Barthelemy
++BEGIN:STANDARD
++TZOFFSETFROM:-040608
++TZOFFSETTO:-0400
++TZNAME:AST
++DTSTART:19110608T000000
++RDATE:19110608T000000
++END:STANDARD
++END:VTIMEZONE
++END:VCALENDAR
+Index: libkcal/libical/zoneinfo/America/St_Lucia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/St_Lucia.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/St_Lucia.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/St_Lucia
++TZID:/kde.org/Olson_20080523_1/America/St_Lucia
+ X-LIC-LOCATION:America/St_Lucia
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0404
+Index: libkcal/libical/zoneinfo/America/Bahia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Bahia.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Bahia.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Bahia
++TZID:/kde.org/Olson_20080523_1/America/Bahia
+ X-LIC-LOCATION:America/Bahia
+ BEGIN:STANDARD
+ TZOFFSETFROM:-023404
+Index: libkcal/libical/zoneinfo/America/Noronha.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Noronha.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Noronha.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Noronha
++TZID:/kde.org/Olson_20080523_1/America/Noronha
+ X-LIC-LOCATION:America/Noronha
+ BEGIN:STANDARD
+ TZOFFSETFROM:-020940
+Index: libkcal/libical/zoneinfo/America/Santiago.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Santiago.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Santiago.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Santiago
++TZID:/kde.org/Olson_20080523_1/America/Santiago
+ X-LIC-LOCATION:America/Santiago
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+@@ -15,7 +15,7 @@
+ TZOFFSETFROM:-0300
+ TZOFFSETTO:-0400
+ TZNAME:CLT
+-DTSTART:20000312T000000
++DTSTART:20090315T000000
+ RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
+ END:STANDARD
+ BEGIN:STANDARD
+@@ -179,6 +179,15 @@
+ RDATE:19970330T000000
+ RDATE:19980315T000000
+ RDATE:19990404T000000
++RDATE:20000312T000000
++RDATE:20010311T000000
++RDATE:20020310T000000
++RDATE:20030309T000000
++RDATE:20040314T000000
++RDATE:20050313T000000
++RDATE:20060312T000000
++RDATE:20070311T000000
++RDATE:20080330T000000
+ END:STANDARD
+ END:VTIMEZONE
+ END:VCALENDAR
+Index: libkcal/libical/zoneinfo/America/Boa_Vista.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Boa_Vista.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Boa_Vista.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Boa_Vista
++TZID:/kde.org/Olson_20080523_1/America/Boa_Vista
+ X-LIC-LOCATION:America/Boa_Vista
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040240
+Index: libkcal/libical/zoneinfo/America/Cancun.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Cancun.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Cancun.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Cancun
++TZID:/kde.org/Olson_20080523_1/America/Cancun
+ X-LIC-LOCATION:America/Cancun
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Costa_Rica.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Costa_Rica.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Costa_Rica.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Costa_Rica
++TZID:/kde.org/Olson_20080523_1/America/Costa_Rica
+ X-LIC-LOCATION:America/Costa_Rica
+ BEGIN:STANDARD
+ TZOFFSETFROM:-053620
+Index: libkcal/libical/zoneinfo/America/Cambridge_Bay.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Cambridge_Bay.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Cambridge_Bay.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Cambridge_Bay
++TZID:/kde.org/Olson_20080523_1/America/Cambridge_Bay
+ X-LIC-LOCATION:America/Cambridge_Bay
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/Managua.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Managua.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Managua.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Managua
++TZID:/kde.org/Olson_20080523_1/America/Managua
+ X-LIC-LOCATION:America/Managua
+ BEGIN:STANDARD
+ TZOFFSETFROM:-054508
+Index: libkcal/libical/zoneinfo/America/Phoenix.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Phoenix.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Phoenix.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Phoenix
++TZID:/kde.org/Olson_20080523_1/America/Phoenix
+ X-LIC-LOCATION:America/Phoenix
+ BEGIN:STANDARD
+ TZOFFSETFROM:-072818
+Index: libkcal/libical/zoneinfo/America/Halifax.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Halifax.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Halifax.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Halifax
++TZID:/kde.org/Olson_20080523_1/America/Halifax
+ X-LIC-LOCATION:America/Halifax
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Menominee.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Menominee.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Menominee.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Menominee
++TZID:/kde.org/Olson_20080523_1/America/Menominee
+ X-LIC-LOCATION:America/Menominee
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Hermosillo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Hermosillo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Hermosillo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Hermosillo
++TZID:/kde.org/Olson_20080523_1/America/Hermosillo
+ X-LIC-LOCATION:America/Hermosillo
+ BEGIN:STANDARD
+ TZOFFSETFROM:-072352
+Index: libkcal/libical/zoneinfo/America/Curacao.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Curacao.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Curacao.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Curacao
++TZID:/kde.org/Olson_20080523_1/America/Curacao
+ X-LIC-LOCATION:America/Curacao
+ BEGIN:STANDARD
+ TZOFFSETFROM:-043544
+Index: libkcal/libical/zoneinfo/America/Paramaribo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Paramaribo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Paramaribo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Paramaribo
++TZID:/kde.org/Olson_20080523_1/America/Paramaribo
+ X-LIC-LOCATION:America/Paramaribo
+ BEGIN:STANDARD
+ TZOFFSETFROM:-034040
+Index: libkcal/libical/zoneinfo/America/Martinique.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Martinique.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Martinique.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Martinique
++TZID:/kde.org/Olson_20080523_1/America/Martinique
+ X-LIC-LOCATION:America/Martinique
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040420
+Index: libkcal/libical/zoneinfo/America/Winnipeg.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Winnipeg.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Winnipeg.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Winnipeg
++TZID:/kde.org/Olson_20080523_1/America/Winnipeg
+ X-LIC-LOCATION:America/Winnipeg
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Lima.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Lima.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Lima.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Lima
++TZID:/kde.org/Olson_20080523_1/America/Lima
+ X-LIC-LOCATION:America/Lima
+ BEGIN:STANDARD
+ TZOFFSETFROM:-050812
+Index: libkcal/libical/zoneinfo/America/Shiprock.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Shiprock.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Shiprock.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Shiprock
++TZID:/kde.org/Olson_20080523_1/America/Shiprock
+ X-LIC-LOCATION:America/Shiprock
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/Edmonton.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Edmonton.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Edmonton.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Edmonton
++TZID:/kde.org/Olson_20080523_1/America/Edmonton
+ X-LIC-LOCATION:America/Edmonton
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/Dominica.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Dominica.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Dominica.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Dominica
++TZID:/kde.org/Olson_20080523_1/America/Dominica
+ X-LIC-LOCATION:America/Dominica
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040536
+Index: libkcal/libical/zoneinfo/America/Belem.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Belem.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Belem.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Belem
++TZID:/kde.org/Olson_20080523_1/America/Belem
+ X-LIC-LOCATION:America/Belem
+ BEGIN:STANDARD
+ TZOFFSETFROM:-031356
+Index: libkcal/libical/zoneinfo/America/Anchorage.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Anchorage.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Anchorage.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Anchorage
++TZID:/kde.org/Olson_20080523_1/America/Anchorage
+ X-LIC-LOCATION:America/Anchorage
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0900
+Index: libkcal/libical/zoneinfo/America/Rainy_River.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Rainy_River.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Rainy_River.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Rainy_River
++TZID:/kde.org/Olson_20080523_1/America/Rainy_River
+ X-LIC-LOCATION:America/Rainy_River
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Argentina/Jujuy.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/Jujuy.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/Jujuy.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/Jujuy
++TZID:/kde.org/Olson_20080523_1/America/Argentina/Jujuy
+ X-LIC-LOCATION:America/Argentina/Jujuy
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-042112
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -86,6 +100,7 @@
+ RDATE:19881201T000000
+ RDATE:19891015T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/Rio_Gallegos.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/Rio_Gallegos.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/Rio_Gallegos.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/Rio_Gallegos
++TZID:/kde.org/Olson_20080523_1/America/Argentina/Rio_Gallegos
+ X-LIC-LOCATION:America/Argentina/Rio_Gallegos
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-043652
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -89,6 +103,7 @@
+ RDATE:19901021T000000
+ RDATE:19911020T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/Cordoba.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/Cordoba.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/Cordoba.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/Cordoba
++TZID:/kde.org/Olson_20080523_1/America/Argentina/Cordoba
+ X-LIC-LOCATION:America/Argentina/Cordoba
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-041648
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -87,6 +101,7 @@
+ RDATE:19891015T000000
+ RDATE:19901021T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/Catamarca.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/Catamarca.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/Catamarca.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/Catamarca
++TZID:/kde.org/Olson_20080523_1/America/Argentina/Catamarca
+ X-LIC-LOCATION:America/Argentina/Catamarca
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-042308
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -88,6 +102,7 @@
+ RDATE:19891015T000000
+ RDATE:19901021T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/Tucuman.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/Tucuman.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/Tucuman.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/Tucuman
++TZID:/kde.org/Olson_20080523_1/America/Argentina/Tucuman
+ X-LIC-LOCATION:America/Argentina/Tucuman
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-042052
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -88,6 +102,7 @@
+ RDATE:19891015T000000
+ RDATE:19901021T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/Mendoza.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/Mendoza.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/Mendoza.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/Mendoza
++TZID:/kde.org/Olson_20080523_1/America/Argentina/Mendoza
+ X-LIC-LOCATION:America/Argentina/Mendoza
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-043516
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -86,6 +100,7 @@
+ RDATE:19740123T000000
+ RDATE:19881201T000000
+ RDATE:19891015T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/San_Luis.ics
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libkcal/libical/zoneinfo/America/Argentina/San_Luis.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -0,0 +1,141 @@
++BEGIN:VCALENDAR
++PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
++VERSION:2.0
++BEGIN:VTIMEZONE
++TZID:/kde.org/Olson_20080523_1/America/Argentina/San_Luis
++X-LIC-LOCATION:America/Argentina/San_Luis
++BEGIN:STANDARD
++TZOFFSETFROM:-042524
++TZOFFSETTO:-041648
++TZNAME:CMT
++DTSTART:18941031T000000
++RDATE:18941031T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:-041648
++TZOFFSETTO:-0400
++TZNAME:ART
++DTSTART:19200501T000000
++RDATE:19200501T000000
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0400
++TZOFFSETTO:-0300
++TZNAME:ARST
++DTSTART:19301201T000000
++RDATE:19301201T000000
++RDATE:19311015T000000
++RDATE:19321101T000000
++RDATE:19331101T000000
++RDATE:19341101T000000
++RDATE:19351101T000000
++RDATE:19361101T000000
++RDATE:19371101T000000
++RDATE:19381101T000000
++RDATE:19391101T000000
++RDATE:19400701T000000
++RDATE:19411015T000000
++RDATE:19431015T000000
++RDATE:19461001T000000
++RDATE:19631215T000000
++RDATE:19641015T000000
++RDATE:19651015T000000
++RDATE:19661015T000000
++RDATE:19671001T000000
++RDATE:19681006T000000
++END:DAYLIGHT
++BEGIN:STANDARD
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0400
++TZNAME:ART
++DTSTART:19310401T000000
++RDATE:19310401T000000
++RDATE:19320301T000000
++RDATE:19330301T000000
++RDATE:19340301T000000
++RDATE:19350301T000000
++RDATE:19360301T000000
++RDATE:19370301T000000
++RDATE:19380301T000000
++RDATE:19390301T000000
++RDATE:19400301T000000
++RDATE:19410615T000000
++RDATE:19430801T000000
++RDATE:19460301T000000
++RDATE:19631001T000000
++RDATE:19640301T000000
++RDATE:19650301T000000
++RDATE:19660301T000000
++RDATE:19670402T000000
++RDATE:19680407T000000
++RDATE:19690406T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:-0400
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:19691005T000000
++RDATE:19691005T000000
++RDATE:19910507T000000
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:19740123T000000
++RDATE:19740123T000000
++RDATE:19881201T000000
++RDATE:19891015T000000
++RDATE:19901021T000000
++RDATE:19911020T000000
++RDATE:19921018T000000
++RDATE:20071230T000000
++END:DAYLIGHT
++BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:19740501T000000
++RDATE:19740501T000000
++RDATE:19890305T000000
++RDATE:19900304T000000
++RDATE:19920301T000000
++RDATE:19930307T000000
++RDATE:20080121T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0400
++TZNAME:WART
++DTSTART:19910301T000000
++RDATE:19910301T000000
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0300
++TZNAME:ARST
++DTSTART:19991003T000000
++RDATE:19991003T000000
++END:DAYLIGHT
++BEGIN:STANDARD
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20000303T000000
++RDATE:20000303T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0400
++TZNAME:WART
++DTSTART:20040531T000000
++RDATE:20040531T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:-0400
++TZOFFSETTO:-0300
++DTSTART:20040725T000000
++RDATE:20040725T000000
++END:STANDARD
++END:VTIMEZONE
++END:VCALENDAR
+Index: libkcal/libical/zoneinfo/America/Argentina/Buenos_Aires.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/Buenos_Aires.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/Buenos_Aires.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/Buenos_Aires
++TZID:/kde.org/Olson_20080523_1/America/Argentina/Buenos_Aires
+ X-LIC-LOCATION:America/Argentina/Buenos_Aires
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-035348
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -88,6 +102,7 @@
+ RDATE:19901021T000000
+ RDATE:19911020T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/San_Juan.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/San_Juan.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/San_Juan.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/San_Juan
++TZID:/kde.org/Olson_20080523_1/America/Argentina/San_Juan
+ X-LIC-LOCATION:America/Argentina/San_Juan
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-043404
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -90,6 +104,7 @@
+ RDATE:19901021T000000
+ RDATE:19911020T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/Ushuaia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/Ushuaia.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/Ushuaia.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/Ushuaia
++TZID:/kde.org/Olson_20080523_1/America/Argentina/Ushuaia
+ X-LIC-LOCATION:America/Argentina/Ushuaia
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-043312
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -89,6 +103,7 @@
+ RDATE:19901021T000000
+ RDATE:19911020T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Argentina/La_Rioja.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Argentina/La_Rioja.ics.orig 2008-02-13 10:39:50.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Argentina/La_Rioja.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,9 +2,23 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Argentina/La_Rioja
++TZID:/kde.org/Olson_20080523_1/America/Argentina/La_Rioja
+ X-LIC-LOCATION:America/Argentina/La_Rioja
+ BEGIN:STANDARD
++TZOFFSETFROM:-0200
++TZOFFSETTO:-0300
++TZNAME:ART
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0300
++TZOFFSETTO:-0200
++TZNAME:ARST
++DTSTART:20081005T000000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++END:DAYLIGHT
++BEGIN:STANDARD
+ TZOFFSETFROM:-042724
+ TZOFFSETTO:-041648
+ TZNAME:CMT
+@@ -90,6 +104,7 @@
+ RDATE:19901021T000000
+ RDATE:19911020T000000
+ RDATE:19921018T000000
++RDATE:20071230T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0200
+Index: libkcal/libical/zoneinfo/America/Pangnirtung.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Pangnirtung.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Pangnirtung.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Pangnirtung
++TZID:/kde.org/Olson_20080523_1/America/Pangnirtung
+ X-LIC-LOCATION:America/Pangnirtung
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Maceio.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Maceio.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Maceio.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Maceio
++TZID:/kde.org/Olson_20080523_1/America/Maceio
+ X-LIC-LOCATION:America/Maceio
+ BEGIN:STANDARD
+ TZOFFSETFROM:-022252
+Index: libkcal/libical/zoneinfo/America/New_York.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/New_York.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/New_York.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/New_York
++TZID:/kde.org/Olson_20080523_1/America/New_York
+ X-LIC-LOCATION:America/New_York
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Panama.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Panama.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Panama.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Panama
++TZID:/kde.org/Olson_20080523_1/America/Panama
+ X-LIC-LOCATION:America/Panama
+ BEGIN:STANDARD
+ TZOFFSETFROM:-051808
+Index: libkcal/libical/zoneinfo/America/Adak.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Adak.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Adak.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Adak
++TZID:/kde.org/Olson_20080523_1/America/Adak
+ X-LIC-LOCATION:America/Adak
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-1000
+Index: libkcal/libical/zoneinfo/America/Merida.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Merida.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Merida.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Merida
++TZID:/kde.org/Olson_20080523_1/America/Merida
+ X-LIC-LOCATION:America/Merida
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Resolute.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Resolute.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Resolute.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Resolute
++TZID:/kde.org/Olson_20080523_1/America/Resolute
+ X-LIC-LOCATION:America/Resolute
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/America/Nipigon.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Nipigon.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Nipigon.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Nipigon
++TZID:/kde.org/Olson_20080523_1/America/Nipigon
+ X-LIC-LOCATION:America/Nipigon
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Dawson_Creek.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Dawson_Creek.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Dawson_Creek.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Dawson_Creek
++TZID:/kde.org/Olson_20080523_1/America/Dawson_Creek
+ X-LIC-LOCATION:America/Dawson_Creek
+ BEGIN:STANDARD
+ TZOFFSETFROM:-080056
+Index: libkcal/libical/zoneinfo/America/Thunder_Bay.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Thunder_Bay.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Thunder_Bay.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Thunder_Bay
++TZID:/kde.org/Olson_20080523_1/America/Thunder_Bay
+ X-LIC-LOCATION:America/Thunder_Bay
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Toronto.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Toronto.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Toronto.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Toronto
++TZID:/kde.org/Olson_20080523_1/America/Toronto
+ X-LIC-LOCATION:America/Toronto
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Port-au-Prince.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Port-au-Prince.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Port-au-Prince.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Port-au-Prince
++TZID:/kde.org/Olson_20080523_1/America/Port-au-Prince
+ X-LIC-LOCATION:America/Port-au-Prince
+ BEGIN:STANDARD
+ TZOFFSETFROM:-044920
+Index: libkcal/libical/zoneinfo/America/La_Paz.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/La_Paz.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/La_Paz.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/La_Paz
++TZID:/kde.org/Olson_20080523_1/America/La_Paz
+ X-LIC-LOCATION:America/La_Paz
+ BEGIN:STANDARD
+ TZOFFSETFROM:-043236
+Index: libkcal/libical/zoneinfo/America/Goose_Bay.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Goose_Bay.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Goose_Bay.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Goose_Bay
++TZID:/kde.org/Olson_20080523_1/America/Goose_Bay
+ X-LIC-LOCATION:America/Goose_Bay
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Godthab.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Godthab.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Godthab.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Godthab
++TZID:/kde.org/Olson_20080523_1/America/Godthab
+ X-LIC-LOCATION:America/Godthab
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0300
+Index: libkcal/libical/zoneinfo/America/Cayman.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Cayman.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Cayman.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Cayman
++TZID:/kde.org/Olson_20080523_1/America/Cayman
+ X-LIC-LOCATION:America/Cayman
+ BEGIN:STANDARD
+ TZOFFSETFROM:-052532
+Index: libkcal/libical/zoneinfo/America/Vancouver.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Vancouver.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Vancouver.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Vancouver
++TZID:/kde.org/Olson_20080523_1/America/Vancouver
+ X-LIC-LOCATION:America/Vancouver
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0800
+Index: libkcal/libical/zoneinfo/America/Bogota.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Bogota.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Bogota.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Bogota
++TZID:/kde.org/Olson_20080523_1/America/Bogota
+ X-LIC-LOCATION:America/Bogota
+ BEGIN:STANDARD
+ TZOFFSETFROM:-045620
+Index: libkcal/libical/zoneinfo/America/Moncton.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Moncton.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Moncton.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Moncton
++TZID:/kde.org/Olson_20080523_1/America/Moncton
+ X-LIC-LOCATION:America/Moncton
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Rio_Branco.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Rio_Branco.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Rio_Branco.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Rio_Branco
++TZID:/kde.org/Olson_20080523_1/America/Rio_Branco
+ X-LIC-LOCATION:America/Rio_Branco
+ BEGIN:STANDARD
+ TZOFFSETFROM:-043112
+Index: libkcal/libical/zoneinfo/America/Whitehorse.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Whitehorse.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Whitehorse.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Whitehorse
++TZID:/kde.org/Olson_20080523_1/America/Whitehorse
+ X-LIC-LOCATION:America/Whitehorse
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0800
+Index: libkcal/libical/zoneinfo/America/Cuiaba.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Cuiaba.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Cuiaba.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Cuiaba
++TZID:/kde.org/Olson_20080523_1/America/Cuiaba
+ X-LIC-LOCATION:America/Cuiaba
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/Tortola.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Tortola.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Tortola.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Tortola
++TZID:/kde.org/Olson_20080523_1/America/Tortola
+ X-LIC-LOCATION:America/Tortola
+ BEGIN:STANDARD
+ TZOFFSETFROM:-041828
+Index: libkcal/libical/zoneinfo/America/St_Johns.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/St_Johns.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/St_Johns.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/St_Johns
++TZID:/kde.org/Olson_20080523_1/America/St_Johns
+ X-LIC-LOCATION:America/St_Johns
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0330
+Index: libkcal/libical/zoneinfo/America/Antigua.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Antigua.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Antigua.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Antigua
++TZID:/kde.org/Olson_20080523_1/America/Antigua
+ X-LIC-LOCATION:America/Antigua
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040712
+Index: libkcal/libical/zoneinfo/America/Puerto_Rico.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Puerto_Rico.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Puerto_Rico.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Puerto_Rico
++TZID:/kde.org/Olson_20080523_1/America/Puerto_Rico
+ X-LIC-LOCATION:America/Puerto_Rico
+ BEGIN:STANDARD
+ TZOFFSETFROM:-042425
+Index: libkcal/libical/zoneinfo/America/Havana.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Havana.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Havana.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,22 +2,22 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Havana
++TZID:/kde.org/Olson_20080523_1/America/Havana
+ X-LIC-LOCATION:America/Havana
+-BEGIN:DAYLIGHT
+-TZOFFSETFROM:-0500
+-TZOFFSETTO:-0400
+-TZNAME:CDT
+-DTSTART:20070311T000000
+-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+-END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0400
+ TZOFFSETTO:-0500
+ TZNAME:CST
+-DTSTART:20071104T010000
+-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
++DTSTART:20061029T010000
++RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+ END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:-0500
++TZOFFSETTO:-0400
++TZNAME:CDT
++DTSTART:20080316T000000
++RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
++END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-052928
+ TZOFFSETTO:-052936
+@@ -83,6 +83,7 @@
+ RDATE:20020407T000000
+ RDATE:20030406T000000
+ RDATE:20040404T000000
++RDATE:20070311T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0400
+@@ -134,7 +135,6 @@
+ RDATE:20011028T010000
+ RDATE:20021027T010000
+ RDATE:20031026T010000
+-RDATE:20061029T010000
+ END:STANDARD
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/America/St_Kitts.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/St_Kitts.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/St_Kitts.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/St_Kitts
++TZID:/kde.org/Olson_20080523_1/America/St_Kitts
+ X-LIC-LOCATION:America/St_Kitts
+ BEGIN:STANDARD
+ TZOFFSETFROM:-041052
+Index: libkcal/libical/zoneinfo/America/Inuvik.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Inuvik.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Inuvik.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Inuvik
++TZID:/kde.org/Olson_20080523_1/America/Inuvik
+ X-LIC-LOCATION:America/Inuvik
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/America/Iqaluit.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Iqaluit.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Iqaluit.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Iqaluit
++TZID:/kde.org/Olson_20080523_1/America/Iqaluit
+ X-LIC-LOCATION:America/Iqaluit
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Montevideo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Montevideo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Montevideo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Montevideo
++TZID:/kde.org/Olson_20080523_1/America/Montevideo
+ X-LIC-LOCATION:America/Montevideo
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0300
+Index: libkcal/libical/zoneinfo/America/Detroit.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Detroit.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Detroit.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Detroit
++TZID:/kde.org/Olson_20080523_1/America/Detroit
+ X-LIC-LOCATION:America/Detroit
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Belize.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Belize.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Belize.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Belize
++TZID:/kde.org/Olson_20080523_1/America/Belize
+ X-LIC-LOCATION:America/Belize
+ BEGIN:STANDARD
+ TZOFFSETFROM:-055248
+Index: libkcal/libical/zoneinfo/America/Eirunepe.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Eirunepe.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Eirunepe.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Eirunepe
++TZID:/kde.org/Olson_20080523_1/America/Eirunepe
+ X-LIC-LOCATION:America/Eirunepe
+ BEGIN:STANDARD
+ TZOFFSETFROM:-043928
+Index: libkcal/libical/zoneinfo/America/Mexico_City.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Mexico_City.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Mexico_City.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Mexico_City
++TZID:/kde.org/Olson_20080523_1/America/Mexico_City
+ X-LIC-LOCATION:America/Mexico_City
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Barbados.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Barbados.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Barbados.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Barbados
++TZID:/kde.org/Olson_20080523_1/America/Barbados
+ X-LIC-LOCATION:America/Barbados
+ BEGIN:STANDARD
+ TZOFFSETFROM:-035828
+Index: libkcal/libical/zoneinfo/America/Danmarkshavn.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Danmarkshavn.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Danmarkshavn.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Danmarkshavn
++TZID:/kde.org/Olson_20080523_1/America/Danmarkshavn
+ X-LIC-LOCATION:America/Danmarkshavn
+ BEGIN:STANDARD
+ TZOFFSETFROM:-011440
+Index: libkcal/libical/zoneinfo/America/Rankin_Inlet.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Rankin_Inlet.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Rankin_Inlet.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Rankin_Inlet
++TZID:/kde.org/Olson_20080523_1/America/Rankin_Inlet
+ X-LIC-LOCATION:America/Rankin_Inlet
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Kentucky/Monticello.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Kentucky/Monticello.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Kentucky/Monticello.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Kentucky/Monticello
++TZID:/kde.org/Olson_20080523_1/America/Kentucky/Monticello
+ X-LIC-LOCATION:America/Kentucky/Monticello
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Kentucky/Louisville.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Kentucky/Louisville.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Kentucky/Louisville.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Kentucky/Louisville
++TZID:/kde.org/Olson_20080523_1/America/Kentucky/Louisville
+ X-LIC-LOCATION:America/Kentucky/Louisville
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Sao_Paulo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Sao_Paulo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Sao_Paulo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Sao_Paulo
++TZID:/kde.org/Olson_20080523_1/America/Sao_Paulo
+ X-LIC-LOCATION:America/Sao_Paulo
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0300
+Index: libkcal/libical/zoneinfo/America/Manaus.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Manaus.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Manaus.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Manaus
++TZID:/kde.org/Olson_20080523_1/America/Manaus
+ X-LIC-LOCATION:America/Manaus
+ BEGIN:STANDARD
+ TZOFFSETFROM:-040004
+Index: libkcal/libical/zoneinfo/America/Guyana.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Guyana.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Guyana.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Guyana
++TZID:/kde.org/Olson_20080523_1/America/Guyana
+ X-LIC-LOCATION:America/Guyana
+ BEGIN:STANDARD
+ TZOFFSETFROM:-035240
+Index: libkcal/libical/zoneinfo/America/Tegucigalpa.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Tegucigalpa.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Tegucigalpa.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Tegucigalpa
++TZID:/kde.org/Olson_20080523_1/America/Tegucigalpa
+ X-LIC-LOCATION:America/Tegucigalpa
+ BEGIN:STANDARD
+ TZOFFSETFROM:-054852
+Index: libkcal/libical/zoneinfo/America/Aruba.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Aruba.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Aruba.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Aruba
++TZID:/kde.org/Olson_20080523_1/America/Aruba
+ X-LIC-LOCATION:America/Aruba
+ BEGIN:STANDARD
+ TZOFFSETFROM:-044024
+Index: libkcal/libical/zoneinfo/America/Nassau.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Nassau.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Nassau.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Nassau
++TZID:/kde.org/Olson_20080523_1/America/Nassau
+ X-LIC-LOCATION:America/Nassau
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/El_Salvador.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/El_Salvador.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/El_Salvador.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/El_Salvador
++TZID:/kde.org/Olson_20080523_1/America/El_Salvador
+ X-LIC-LOCATION:America/El_Salvador
+ BEGIN:STANDARD
+ TZOFFSETFROM:-055648
+Index: libkcal/libical/zoneinfo/America/Blanc-Sablon.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Blanc-Sablon.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Blanc-Sablon.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Blanc-Sablon
++TZID:/kde.org/Olson_20080523_1/America/Blanc-Sablon
+ X-LIC-LOCATION:America/Blanc-Sablon
+ BEGIN:STANDARD
+ TZOFFSETFROM:-034828
+Index: libkcal/libical/zoneinfo/America/Dawson.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Dawson.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Dawson.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Dawson
++TZID:/kde.org/Olson_20080523_1/America/Dawson
+ X-LIC-LOCATION:America/Dawson
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0800
+Index: libkcal/libical/zoneinfo/America/Chicago.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Chicago.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Chicago.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Chicago
++TZID:/kde.org/Olson_20080523_1/America/Chicago
+ X-LIC-LOCATION:America/Chicago
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+Index: libkcal/libical/zoneinfo/America/Recife.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Recife.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Recife.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Recife
++TZID:/kde.org/Olson_20080523_1/America/Recife
+ X-LIC-LOCATION:America/Recife
+ BEGIN:STANDARD
+ TZOFFSETFROM:-021936
+Index: libkcal/libical/zoneinfo/America/Nome.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Nome.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Nome.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Nome
++TZID:/kde.org/Olson_20080523_1/America/Nome
+ X-LIC-LOCATION:America/Nome
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0900
+Index: libkcal/libical/zoneinfo/America/Swift_Current.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Swift_Current.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Swift_Current.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Swift_Current
++TZID:/kde.org/Olson_20080523_1/America/Swift_Current
+ X-LIC-LOCATION:America/Swift_Current
+ BEGIN:STANDARD
+ TZOFFSETFROM:-071120
+Index: libkcal/libical/zoneinfo/America/Grand_Turk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Grand_Turk.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Grand_Turk.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Grand_Turk
++TZID:/kde.org/Olson_20080523_1/America/Grand_Turk
+ X-LIC-LOCATION:America/Grand_Turk
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0500
+Index: libkcal/libical/zoneinfo/America/Guayaquil.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Guayaquil.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Guayaquil.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Guayaquil
++TZID:/kde.org/Olson_20080523_1/America/Guayaquil
+ X-LIC-LOCATION:America/Guayaquil
+ BEGIN:STANDARD
+ TZOFFSETFROM:-051920
+Index: libkcal/libical/zoneinfo/America/Grenada.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Grenada.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Grenada.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Grenada
++TZID:/kde.org/Olson_20080523_1/America/Grenada
+ X-LIC-LOCATION:America/Grenada
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0407
+Index: libkcal/libical/zoneinfo/America/Atikokan.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Atikokan.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Atikokan.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Atikokan
++TZID:/kde.org/Olson_20080523_1/America/Atikokan
+ X-LIC-LOCATION:America/Atikokan
+ BEGIN:STANDARD
+ TZOFFSETFROM:-060628
+Index: libkcal/libical/zoneinfo/America/Boise.ics
+===================================================================
+--- libkcal/libical/zoneinfo/America/Boise.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/America/Boise.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/America/Boise
++TZID:/kde.org/Olson_20080523_1/America/Boise
+ X-LIC-LOCATION:America/Boise
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0700
+Index: libkcal/libical/zoneinfo/Indian/Mauritius.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Mauritius.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Mauritius.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Mauritius
++TZID:/kde.org/Olson_20080523_1/Indian/Mauritius
+ X-LIC-LOCATION:Indian/Mauritius
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0350
+Index: libkcal/libical/zoneinfo/Indian/Mayotte.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Mayotte.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Mayotte.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Mayotte
++TZID:/kde.org/Olson_20080523_1/Indian/Mayotte
+ X-LIC-LOCATION:Indian/Mayotte
+ BEGIN:STANDARD
+ TZOFFSETFROM:+030056
+Index: libkcal/libical/zoneinfo/Indian/Chagos.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Chagos.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Chagos.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Chagos
++TZID:/kde.org/Olson_20080523_1/Indian/Chagos
+ X-LIC-LOCATION:Indian/Chagos
+ BEGIN:STANDARD
+ TZOFFSETFROM:+044940
+Index: libkcal/libical/zoneinfo/Indian/Maldives.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Maldives.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Maldives.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Maldives
++TZID:/kde.org/Olson_20080523_1/Indian/Maldives
+ X-LIC-LOCATION:Indian/Maldives
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0454
+Index: libkcal/libical/zoneinfo/Indian/Cocos.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Cocos.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Cocos.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Cocos
++TZID:/kde.org/Olson_20080523_1/Indian/Cocos
+ X-LIC-LOCATION:Indian/Cocos
+ BEGIN:STANDARD
+ TZOFFSETFROM:+062740
+Index: libkcal/libical/zoneinfo/Indian/Mahe.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Mahe.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Mahe.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Mahe
++TZID:/kde.org/Olson_20080523_1/Indian/Mahe
+ X-LIC-LOCATION:Indian/Mahe
+ BEGIN:STANDARD
+ TZOFFSETFROM:+034148
+Index: libkcal/libical/zoneinfo/Indian/Christmas.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Christmas.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Christmas.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Christmas
++TZID:/kde.org/Olson_20080523_1/Indian/Christmas
+ X-LIC-LOCATION:Indian/Christmas
+ BEGIN:STANDARD
+ TZOFFSETFROM:+070252
+Index: libkcal/libical/zoneinfo/Indian/Comoro.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Comoro.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Comoro.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Comoro
++TZID:/kde.org/Olson_20080523_1/Indian/Comoro
+ X-LIC-LOCATION:Indian/Comoro
+ BEGIN:STANDARD
+ TZOFFSETFROM:+025304
+Index: libkcal/libical/zoneinfo/Indian/Reunion.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Reunion.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Reunion.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Reunion
++TZID:/kde.org/Olson_20080523_1/Indian/Reunion
+ X-LIC-LOCATION:Indian/Reunion
+ BEGIN:STANDARD
+ TZOFFSETFROM:+034152
+Index: libkcal/libical/zoneinfo/Indian/Antananarivo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Antananarivo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Antananarivo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Antananarivo
++TZID:/kde.org/Olson_20080523_1/Indian/Antananarivo
+ X-LIC-LOCATION:Indian/Antananarivo
+ BEGIN:STANDARD
+ TZOFFSETFROM:+031004
+Index: libkcal/libical/zoneinfo/Indian/Kerguelen.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Indian/Kerguelen.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Indian/Kerguelen.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Indian/Kerguelen
++TZID:/kde.org/Olson_20080523_1/Indian/Kerguelen
+ X-LIC-LOCATION:Indian/Kerguelen
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/zones.tab
+===================================================================
+--- libkcal/libical/zoneinfo/zones.tab.orig 2007-10-08 11:50:50.000000000 +0200
++++ libkcal/libical/zoneinfo/zones.tab 2008-06-29 20:10:37.000000000 +0200
+@@ -62,6 +62,7 @@
+ -0325300 -0684900 America/Argentina/Mendoza
+ -0513800 -0691300 America/Argentina/Rio_Gallegos
+ -0313200 -0683100 America/Argentina/San_Juan
++-0331900 -0662100 America/Argentina/San_Luis
+ -0264900 -0651300 America/Argentina/Tucuman
+ -0544800 -0681800 America/Argentina/Ushuaia
+ +0123000 -0695800 America/Aruba
+@@ -128,6 +129,7 @@
+ -0094000 -0354300 America/Maceio
+ +0120900 -0861700 America/Managua
+ -0030800 -0600100 America/Manaus
+++0180400 -0630500 America/Marigot
+ +0143600 -0610500 America/Martinique
+ +0231300 -1062500 America/Mazatlan
+ +0450628 -0873651 America/Menominee
+@@ -165,6 +167,7 @@
+ -0233200 -0463700 America/Sao_Paulo
+ +0702900 -0215800 America/Scoresbysund
+ +0364708 -1084111 America/Shiprock
+++0175300 -0625100 America/St_Barthelemy
+ +0473400 -0524300 America/St_Johns
+ +0171800 -0624300 America/St_Kitts
+ +0140100 -0610000 America/St_Lucia
+@@ -207,7 +210,6 @@
+ +0335300 +0353000 Asia/Beirut
+ +0425400 +0743600 Asia/Bishkek
+ +0045600 +1145500 Asia/Brunei
+-+0223200 +0882200 Asia/Calcutta
+ +0480400 +1143000 Asia/Choibalsan
+ +0293400 +1063500 Asia/Chongqing
+ +0065600 +0795100 Asia/Colombo
+@@ -218,6 +220,7 @@
+ +0383500 +0684800 Asia/Dushanbe
+ +0313000 +0342800 Asia/Gaza
+ +0454500 +1264100 Asia/Harbin
+++0104500 +1064000 Asia/Ho_Chi_Minh
+ +0221700 +1140900 Asia/Hong_Kong
+ +0480100 +0913900 Asia/Hovd
+ +0521600 +1042000 Asia/Irkutsk
+@@ -230,6 +233,7 @@
+ +0245200 +0670300 Asia/Karachi
+ +0392900 +0755900 Asia/Kashgar
+ +0274300 +0851900 Asia/Katmandu
+++0223200 +0882200 Asia/Kolkata
+ +0560100 +0925000 Asia/Krasnoyarsk
+ +0031000 +1014200 Asia/Kuala_Lumpur
+ +0013300 +1102000 Asia/Kuching
+@@ -250,7 +254,6 @@
+ +0444800 +0652800 Asia/Qyzylorda
+ +0164700 +0961000 Asia/Rangoon
+ +0243800 +0464300 Asia/Riyadh
+-+0104500 +1064000 Asia/Saigon
+ +0465800 +1424200 Asia/Sakhalin
+ +0394000 +0664800 Asia/Samarkand
+ +0373300 +1265800 Asia/Seoul
+@@ -274,7 +277,6 @@
+ +0280600 -0152400 Atlantic/Canary
+ +0145500 -0233100 Atlantic/Cape_Verde
+ +0620100 -0064600 Atlantic/Faroe
+-+0705900 -0080500 Atlantic/Jan_Mayen
+ +0323800 -0165400 Atlantic/Madeira
+ +0640900 -0215100 Atlantic/Reykjavik
+ -0541600 -0363200 Atlantic/South_Georgia
+Index: libkcal/libical/zoneinfo/zones.h
+===================================================================
+--- libkcal/libical/zoneinfo/zones.h.orig 2007-10-08 11:50:50.000000000 +0200
++++ libkcal/libical/zoneinfo/zones.h 2008-06-29 20:10:37.000000000 +0200
+@@ -62,6 +62,7 @@
+ N_("America/Argentina/Mendoza");
+ N_("America/Argentina/Rio_Gallegos");
+ N_("America/Argentina/San_Juan");
++N_("America/Argentina/San_Luis");
+ N_("America/Argentina/Tucuman");
+ N_("America/Argentina/Ushuaia");
+ N_("America/Aruba");
+@@ -128,6 +129,7 @@
+ N_("America/Maceio");
+ N_("America/Managua");
+ N_("America/Manaus");
++N_("America/Marigot");
+ N_("America/Martinique");
+ N_("America/Mazatlan");
+ N_("America/Menominee");
+@@ -165,6 +167,7 @@
+ N_("America/Sao_Paulo");
+ N_("America/Scoresbysund");
+ N_("America/Shiprock");
++N_("America/St_Barthelemy");
+ N_("America/St_Johns");
+ N_("America/St_Kitts");
+ N_("America/St_Lucia");
+@@ -207,7 +210,6 @@
+ N_("Asia/Beirut");
+ N_("Asia/Bishkek");
+ N_("Asia/Brunei");
+-N_("Asia/Calcutta");
+ N_("Asia/Choibalsan");
+ N_("Asia/Chongqing");
+ N_("Asia/Colombo");
+@@ -218,6 +220,7 @@
+ N_("Asia/Dushanbe");
+ N_("Asia/Gaza");
+ N_("Asia/Harbin");
++N_("Asia/Ho_Chi_Minh");
+ N_("Asia/Hong_Kong");
+ N_("Asia/Hovd");
+ N_("Asia/Irkutsk");
+@@ -230,6 +233,7 @@
+ N_("Asia/Karachi");
+ N_("Asia/Kashgar");
+ N_("Asia/Katmandu");
++N_("Asia/Kolkata");
+ N_("Asia/Krasnoyarsk");
+ N_("Asia/Kuala_Lumpur");
+ N_("Asia/Kuching");
+@@ -250,7 +254,6 @@
+ N_("Asia/Qyzylorda");
+ N_("Asia/Rangoon");
+ N_("Asia/Riyadh");
+-N_("Asia/Saigon");
+ N_("Asia/Sakhalin");
+ N_("Asia/Samarkand");
+ N_("Asia/Seoul");
+@@ -274,7 +277,6 @@
+ N_("Atlantic/Canary");
+ N_("Atlantic/Cape_Verde");
+ N_("Atlantic/Faroe");
+-N_("Atlantic/Jan_Mayen");
+ N_("Atlantic/Madeira");
+ N_("Atlantic/Reykjavik");
+ N_("Atlantic/South_Georgia");
+Index: libkcal/libical/zoneinfo/Africa/Luanda.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Luanda.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Luanda.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Luanda
++TZID:/kde.org/Olson_20080523_1/Africa/Luanda
+ X-LIC-LOCATION:Africa/Luanda
+ BEGIN:STANDARD
+ TZOFFSETFROM:+005256
+Index: libkcal/libical/zoneinfo/Africa/Lagos.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Lagos.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Lagos.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Lagos
++TZID:/kde.org/Olson_20080523_1/Africa/Lagos
+ X-LIC-LOCATION:Africa/Lagos
+ BEGIN:STANDARD
+ TZOFFSETFROM:+001336
+Index: libkcal/libical/zoneinfo/Africa/Douala.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Douala.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Douala.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Douala
++TZID:/kde.org/Olson_20080523_1/Africa/Douala
+ X-LIC-LOCATION:Africa/Douala
+ BEGIN:STANDARD
+ TZOFFSETFROM:+003848
+Index: libkcal/libical/zoneinfo/Africa/Bangui.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Bangui.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Bangui.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Bangui
++TZID:/kde.org/Olson_20080523_1/Africa/Bangui
+ X-LIC-LOCATION:Africa/Bangui
+ BEGIN:STANDARD
+ TZOFFSETFROM:+011420
+Index: libkcal/libical/zoneinfo/Africa/Sao_Tome.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Sao_Tome.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Sao_Tome.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Sao_Tome
++TZID:/kde.org/Olson_20080523_1/Africa/Sao_Tome
+ X-LIC-LOCATION:Africa/Sao_Tome
+ BEGIN:STANDARD
+ TZOFFSETFROM:+002656
+Index: libkcal/libical/zoneinfo/Africa/Windhoek.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Windhoek.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Windhoek.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Windhoek
++TZID:/kde.org/Olson_20080523_1/Africa/Windhoek
+ X-LIC-LOCATION:Africa/Windhoek
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Africa/Djibouti.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Djibouti.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Djibouti.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Djibouti
++TZID:/kde.org/Olson_20080523_1/Africa/Djibouti
+ X-LIC-LOCATION:Africa/Djibouti
+ BEGIN:STANDARD
+ TZOFFSETFROM:+025236
+Index: libkcal/libical/zoneinfo/Africa/Accra.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Accra.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Accra.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Accra
++TZID:/kde.org/Olson_20080523_1/Africa/Accra
+ X-LIC-LOCATION:Africa/Accra
+ BEGIN:STANDARD
+ TZOFFSETFROM:-000052
+Index: libkcal/libical/zoneinfo/Africa/Banjul.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Banjul.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Banjul.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Banjul
++TZID:/kde.org/Olson_20080523_1/Africa/Banjul
+ X-LIC-LOCATION:Africa/Banjul
+ BEGIN:STANDARD
+ TZOFFSETFROM:-010636
+Index: libkcal/libical/zoneinfo/Africa/El_Aaiun.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/El_Aaiun.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/El_Aaiun.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/El_Aaiun
++TZID:/kde.org/Olson_20080523_1/Africa/El_Aaiun
+ X-LIC-LOCATION:Africa/El_Aaiun
+ BEGIN:STANDARD
+ TZOFFSETFROM:-005248
+Index: libkcal/libical/zoneinfo/Africa/Ndjamena.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Ndjamena.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Ndjamena.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Ndjamena
++TZID:/kde.org/Olson_20080523_1/Africa/Ndjamena
+ X-LIC-LOCATION:Africa/Ndjamena
+ BEGIN:STANDARD
+ TZOFFSETFROM:+010012
+Index: libkcal/libical/zoneinfo/Africa/Ouagadougou.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Ouagadougou.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Ouagadougou.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Ouagadougou
++TZID:/kde.org/Olson_20080523_1/Africa/Ouagadougou
+ X-LIC-LOCATION:Africa/Ouagadougou
+ BEGIN:STANDARD
+ TZOFFSETFROM:-000604
+Index: libkcal/libical/zoneinfo/Africa/Mogadishu.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Mogadishu.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Mogadishu.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Mogadishu
++TZID:/kde.org/Olson_20080523_1/Africa/Mogadishu
+ X-LIC-LOCATION:Africa/Mogadishu
+ BEGIN:STANDARD
+ TZOFFSETFROM:+030128
+Index: libkcal/libical/zoneinfo/Africa/Porto-Novo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Porto-Novo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Porto-Novo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Porto-Novo
++TZID:/kde.org/Olson_20080523_1/Africa/Porto-Novo
+ X-LIC-LOCATION:Africa/Porto-Novo
+ BEGIN:STANDARD
+ TZOFFSETFROM:+001028
+Index: libkcal/libical/zoneinfo/Africa/Johannesburg.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Johannesburg.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Johannesburg.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Johannesburg
++TZID:/kde.org/Olson_20080523_1/Africa/Johannesburg
+ X-LIC-LOCATION:Africa/Johannesburg
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0152
+Index: libkcal/libical/zoneinfo/Africa/Brazzaville.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Brazzaville.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Brazzaville.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Brazzaville
++TZID:/kde.org/Olson_20080523_1/Africa/Brazzaville
+ X-LIC-LOCATION:Africa/Brazzaville
+ BEGIN:STANDARD
+ TZOFFSETFROM:+010108
+Index: libkcal/libical/zoneinfo/Africa/Abidjan.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Abidjan.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Abidjan.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Abidjan
++TZID:/kde.org/Olson_20080523_1/Africa/Abidjan
+ X-LIC-LOCATION:Africa/Abidjan
+ BEGIN:STANDARD
+ TZOFFSETFROM:-001608
+Index: libkcal/libical/zoneinfo/Africa/Libreville.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Libreville.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Libreville.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Libreville
++TZID:/kde.org/Olson_20080523_1/Africa/Libreville
+ X-LIC-LOCATION:Africa/Libreville
+ BEGIN:STANDARD
+ TZOFFSETFROM:+003748
+Index: libkcal/libical/zoneinfo/Africa/Freetown.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Freetown.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Freetown.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Freetown
++TZID:/kde.org/Olson_20080523_1/Africa/Freetown
+ X-LIC-LOCATION:Africa/Freetown
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0053
+Index: libkcal/libical/zoneinfo/Africa/Addis_Ababa.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Addis_Ababa.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Addis_Ababa.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Addis_Ababa
++TZID:/kde.org/Olson_20080523_1/Africa/Addis_Ababa
+ X-LIC-LOCATION:Africa/Addis_Ababa
+ BEGIN:STANDARD
+ TZOFFSETFROM:+023448
+Index: libkcal/libical/zoneinfo/Africa/Bamako.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Bamako.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Bamako.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Bamako
++TZID:/kde.org/Olson_20080523_1/Africa/Bamako
+ X-LIC-LOCATION:Africa/Bamako
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0032
+Index: libkcal/libical/zoneinfo/Africa/Lubumbashi.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Lubumbashi.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Lubumbashi.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Lubumbashi
++TZID:/kde.org/Olson_20080523_1/Africa/Lubumbashi
+ X-LIC-LOCATION:Africa/Lubumbashi
+ BEGIN:STANDARD
+ TZOFFSETFROM:+014952
+Index: libkcal/libical/zoneinfo/Africa/Gaborone.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Gaborone.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Gaborone.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Gaborone
++TZID:/kde.org/Olson_20080523_1/Africa/Gaborone
+ X-LIC-LOCATION:Africa/Gaborone
+ BEGIN:STANDARD
+ TZOFFSETFROM:+014340
+Index: libkcal/libical/zoneinfo/Africa/Cairo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Cairo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Cairo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Cairo
++TZID:/kde.org/Olson_20080523_1/Africa/Cairo
+ X-LIC-LOCATION:Africa/Cairo
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Africa/Kigali.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Kigali.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Kigali.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Kigali
++TZID:/kde.org/Olson_20080523_1/Africa/Kigali
+ X-LIC-LOCATION:Africa/Kigali
+ BEGIN:STANDARD
+ TZOFFSETFROM:+020016
+Index: libkcal/libical/zoneinfo/Africa/Ceuta.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Ceuta.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Ceuta.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Ceuta
++TZID:/kde.org/Olson_20080523_1/Africa/Ceuta
+ X-LIC-LOCATION:Africa/Ceuta
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Africa/Harare.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Harare.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Harare.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Harare
++TZID:/kde.org/Olson_20080523_1/Africa/Harare
+ X-LIC-LOCATION:Africa/Harare
+ BEGIN:STANDARD
+ TZOFFSETFROM:+020412
+Index: libkcal/libical/zoneinfo/Africa/Tunis.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Tunis.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Tunis.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Tunis
++TZID:/kde.org/Olson_20080523_1/Africa/Tunis
+ X-LIC-LOCATION:Africa/Tunis
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Africa/Asmara.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Asmara.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Asmara.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Asmara
++TZID:/kde.org/Olson_20080523_1/Africa/Asmara
+ X-LIC-LOCATION:Africa/Asmara
+ BEGIN:STANDARD
+ TZOFFSETFROM:+023532
+Index: libkcal/libical/zoneinfo/Africa/Maputo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Maputo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Maputo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Maputo
++TZID:/kde.org/Olson_20080523_1/Africa/Maputo
+ X-LIC-LOCATION:Africa/Maputo
+ BEGIN:STANDARD
+ TZOFFSETFROM:+021020
+Index: libkcal/libical/zoneinfo/Africa/Kampala.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Kampala.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Kampala.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Kampala
++TZID:/kde.org/Olson_20080523_1/Africa/Kampala
+ X-LIC-LOCATION:Africa/Kampala
+ BEGIN:STANDARD
+ TZOFFSETFROM:+020940
+Index: libkcal/libical/zoneinfo/Africa/Conakry.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Conakry.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Conakry.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Conakry
++TZID:/kde.org/Olson_20080523_1/Africa/Conakry
+ X-LIC-LOCATION:Africa/Conakry
+ BEGIN:STANDARD
+ TZOFFSETFROM:-005452
+Index: libkcal/libical/zoneinfo/Africa/Casablanca.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Casablanca.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Casablanca.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Casablanca
++TZID:/kde.org/Olson_20080523_1/Africa/Casablanca
+ X-LIC-LOCATION:Africa/Casablanca
+ BEGIN:STANDARD
+ TZOFFSETFROM:-003020
+Index: libkcal/libical/zoneinfo/Africa/Dar_es_Salaam.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Dar_es_Salaam.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Dar_es_Salaam.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Dar_es_Salaam
++TZID:/kde.org/Olson_20080523_1/Africa/Dar_es_Salaam
+ X-LIC-LOCATION:Africa/Dar_es_Salaam
+ BEGIN:STANDARD
+ TZOFFSETFROM:+023708
+Index: libkcal/libical/zoneinfo/Africa/Nouakchott.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Nouakchott.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Nouakchott.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Nouakchott
++TZID:/kde.org/Olson_20080523_1/Africa/Nouakchott
+ X-LIC-LOCATION:Africa/Nouakchott
+ BEGIN:STANDARD
+ TZOFFSETFROM:-010348
+Index: libkcal/libical/zoneinfo/Africa/Blantyre.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Blantyre.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Blantyre.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Blantyre
++TZID:/kde.org/Olson_20080523_1/Africa/Blantyre
+ X-LIC-LOCATION:Africa/Blantyre
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0220
+Index: libkcal/libical/zoneinfo/Africa/Lusaka.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Lusaka.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Lusaka.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Lusaka
++TZID:/kde.org/Olson_20080523_1/Africa/Lusaka
+ X-LIC-LOCATION:Africa/Lusaka
+ BEGIN:STANDARD
+ TZOFFSETFROM:+015308
+Index: libkcal/libical/zoneinfo/Africa/Dakar.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Dakar.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Dakar.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Dakar
++TZID:/kde.org/Olson_20080523_1/Africa/Dakar
+ X-LIC-LOCATION:Africa/Dakar
+ BEGIN:STANDARD
+ TZOFFSETFROM:-010944
+Index: libkcal/libical/zoneinfo/Africa/Niamey.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Niamey.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Niamey.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Niamey
++TZID:/kde.org/Olson_20080523_1/Africa/Niamey
+ X-LIC-LOCATION:Africa/Niamey
+ BEGIN:STANDARD
+ TZOFFSETFROM:+000828
+Index: libkcal/libical/zoneinfo/Africa/Tripoli.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Tripoli.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Tripoli.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Tripoli
++TZID:/kde.org/Olson_20080523_1/Africa/Tripoli
+ X-LIC-LOCATION:Africa/Tripoli
+ BEGIN:STANDARD
+ TZOFFSETFROM:+005244
+Index: libkcal/libical/zoneinfo/Africa/Nairobi.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Nairobi.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Nairobi.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Nairobi
++TZID:/kde.org/Olson_20080523_1/Africa/Nairobi
+ X-LIC-LOCATION:Africa/Nairobi
+ BEGIN:STANDARD
+ TZOFFSETFROM:+022716
+Index: libkcal/libical/zoneinfo/Africa/Mbabane.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Mbabane.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Mbabane.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Mbabane
++TZID:/kde.org/Olson_20080523_1/Africa/Mbabane
+ X-LIC-LOCATION:Africa/Mbabane
+ BEGIN:STANDARD
+ TZOFFSETFROM:+020424
+Index: libkcal/libical/zoneinfo/Africa/Algiers.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Algiers.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Algiers.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Algiers
++TZID:/kde.org/Olson_20080523_1/Africa/Algiers
+ X-LIC-LOCATION:Africa/Algiers
+ BEGIN:STANDARD
+ TZOFFSETFROM:+001212
+Index: libkcal/libical/zoneinfo/Africa/Bissau.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Bissau.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Bissau.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Bissau
++TZID:/kde.org/Olson_20080523_1/Africa/Bissau
+ X-LIC-LOCATION:Africa/Bissau
+ BEGIN:STANDARD
+ TZOFFSETFROM:-010220
+Index: libkcal/libical/zoneinfo/Africa/Khartoum.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Khartoum.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Khartoum.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Khartoum
++TZID:/kde.org/Olson_20080523_1/Africa/Khartoum
+ X-LIC-LOCATION:Africa/Khartoum
+ BEGIN:STANDARD
+ TZOFFSETFROM:+021008
+Index: libkcal/libical/zoneinfo/Africa/Monrovia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Monrovia.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Monrovia.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Monrovia
++TZID:/kde.org/Olson_20080523_1/Africa/Monrovia
+ X-LIC-LOCATION:Africa/Monrovia
+ BEGIN:STANDARD
+ TZOFFSETFROM:-004308
+Index: libkcal/libical/zoneinfo/Africa/Malabo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Malabo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Malabo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Malabo
++TZID:/kde.org/Olson_20080523_1/Africa/Malabo
+ X-LIC-LOCATION:Africa/Malabo
+ BEGIN:STANDARD
+ TZOFFSETFROM:+003508
+Index: libkcal/libical/zoneinfo/Africa/Lome.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Lome.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Lome.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Lome
++TZID:/kde.org/Olson_20080523_1/Africa/Lome
+ X-LIC-LOCATION:Africa/Lome
+ BEGIN:STANDARD
+ TZOFFSETFROM:+000452
+Index: libkcal/libical/zoneinfo/Africa/Bujumbura.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Bujumbura.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Bujumbura.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Bujumbura
++TZID:/kde.org/Olson_20080523_1/Africa/Bujumbura
+ X-LIC-LOCATION:Africa/Bujumbura
+ BEGIN:STANDARD
+ TZOFFSETFROM:+015728
+Index: libkcal/libical/zoneinfo/Africa/Maseru.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Maseru.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Maseru.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Maseru
++TZID:/kde.org/Olson_20080523_1/Africa/Maseru
+ X-LIC-LOCATION:Africa/Maseru
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0150
+Index: libkcal/libical/zoneinfo/Africa/Kinshasa.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Africa/Kinshasa.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Africa/Kinshasa.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Africa/Kinshasa
++TZID:/kde.org/Olson_20080523_1/Africa/Kinshasa
+ X-LIC-LOCATION:Africa/Kinshasa
+ BEGIN:STANDARD
+ TZOFFSETFROM:+010112
+Index: libkcal/libical/zoneinfo/Arctic/Longyearbyen.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Arctic/Longyearbyen.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Arctic/Longyearbyen.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Arctic/Longyearbyen
++TZID:/kde.org/Olson_20080523_1/Arctic/Longyearbyen
+ X-LIC-LOCATION:Arctic/Longyearbyen
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0100
+Index: libkcal/libical/zoneinfo/Australia/Lord_Howe.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Lord_Howe.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Lord_Howe.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Lord_Howe
++TZID:/kde.org/Olson_20080523_1/Australia/Lord_Howe
+ X-LIC-LOCATION:Australia/Lord_Howe
+ BEGIN:STANDARD
+ TZOFFSETFROM:+1100
+Index: libkcal/libical/zoneinfo/Australia/Perth.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Perth.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Perth.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Perth
++TZID:/kde.org/Olson_20080523_1/Australia/Perth
+ X-LIC-LOCATION:Australia/Perth
+ BEGIN:STANDARD
+ TZOFFSETFROM:+074324
+Index: libkcal/libical/zoneinfo/Australia/Darwin.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Darwin.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Darwin.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Darwin
++TZID:/kde.org/Olson_20080523_1/Australia/Darwin
+ X-LIC-LOCATION:Australia/Darwin
+ BEGIN:STANDARD
+ TZOFFSETFROM:+084320
+Index: libkcal/libical/zoneinfo/Australia/Brisbane.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Brisbane.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Brisbane.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Brisbane
++TZID:/kde.org/Olson_20080523_1/Australia/Brisbane
+ X-LIC-LOCATION:Australia/Brisbane
+ BEGIN:STANDARD
+ TZOFFSETFROM:+101208
+Index: libkcal/libical/zoneinfo/Australia/Lindeman.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Lindeman.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Lindeman.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Lindeman
++TZID:/kde.org/Olson_20080523_1/Australia/Lindeman
+ X-LIC-LOCATION:Australia/Lindeman
+ BEGIN:STANDARD
+ TZOFFSETFROM:+095556
+Index: libkcal/libical/zoneinfo/Australia/Adelaide.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Adelaide.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Adelaide.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Adelaide
++TZID:/kde.org/Olson_20080523_1/Australia/Adelaide
+ X-LIC-LOCATION:Australia/Adelaide
+ BEGIN:STANDARD
+ TZOFFSETFROM:+1030
+Index: libkcal/libical/zoneinfo/Australia/Broken_Hill.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Broken_Hill.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Broken_Hill.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Broken_Hill
++TZID:/kde.org/Olson_20080523_1/Australia/Broken_Hill
+ X-LIC-LOCATION:Australia/Broken_Hill
+ BEGIN:STANDARD
+ TZOFFSETFROM:+1030
+Index: libkcal/libical/zoneinfo/Australia/Melbourne.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Melbourne.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Melbourne.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Melbourne
++TZID:/kde.org/Olson_20080523_1/Australia/Melbourne
+ X-LIC-LOCATION:Australia/Melbourne
+ BEGIN:STANDARD
+ TZOFFSETFROM:+1100
+Index: libkcal/libical/zoneinfo/Australia/Currie.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Currie.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Currie.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Currie
++TZID:/kde.org/Olson_20080523_1/Australia/Currie
+ X-LIC-LOCATION:Australia/Currie
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1000
+Index: libkcal/libical/zoneinfo/Australia/Eucla.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Eucla.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Eucla.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Eucla
++TZID:/kde.org/Olson_20080523_1/Australia/Eucla
+ X-LIC-LOCATION:Australia/Eucla
+ BEGIN:STANDARD
+ TZOFFSETFROM:+083528
+Index: libkcal/libical/zoneinfo/Australia/Sydney.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Sydney.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Sydney.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Sydney
++TZID:/kde.org/Olson_20080523_1/Australia/Sydney
+ X-LIC-LOCATION:Australia/Sydney
+ BEGIN:STANDARD
+ TZOFFSETFROM:+1100
+Index: libkcal/libical/zoneinfo/Australia/Hobart.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Australia/Hobart.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Australia/Hobart.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Australia/Hobart
++TZID:/kde.org/Olson_20080523_1/Australia/Hobart
+ X-LIC-LOCATION:Australia/Hobart
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1000
+Index: libkcal/libical/zoneinfo/Antarctica/Syowa.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/Syowa.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/Syowa.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/Syowa
++TZID:/kde.org/Olson_20080523_1/Antarctica/Syowa
+ X-LIC-LOCATION:Antarctica/Syowa
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Antarctica/Casey.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/Casey.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/Casey.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/Casey
++TZID:/kde.org/Olson_20080523_1/Antarctica/Casey
+ X-LIC-LOCATION:Antarctica/Casey
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Antarctica/Mawson.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/Mawson.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/Mawson.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/Mawson
++TZID:/kde.org/Olson_20080523_1/Antarctica/Mawson
+ X-LIC-LOCATION:Antarctica/Mawson
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Antarctica/Rothera.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/Rothera.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/Rothera.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/Rothera
++TZID:/kde.org/Olson_20080523_1/Antarctica/Rothera
+ X-LIC-LOCATION:Antarctica/Rothera
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Antarctica/Vostok.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/Vostok.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/Vostok.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/Vostok
++TZID:/kde.org/Olson_20080523_1/Antarctica/Vostok
+ X-LIC-LOCATION:Antarctica/Vostok
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Antarctica/Davis.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/Davis.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/Davis.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/Davis
++TZID:/kde.org/Olson_20080523_1/Antarctica/Davis
+ X-LIC-LOCATION:Antarctica/Davis
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Antarctica/McMurdo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/McMurdo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/McMurdo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/McMurdo
++TZID:/kde.org/Olson_20080523_1/Antarctica/McMurdo
+ X-LIC-LOCATION:Antarctica/McMurdo
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1200
+Index: libkcal/libical/zoneinfo/Antarctica/DumontDUrville.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/DumontDUrville.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/DumontDUrville.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/DumontDUrville
++TZID:/kde.org/Olson_20080523_1/Antarctica/DumontDUrville
+ X-LIC-LOCATION:Antarctica/DumontDUrville
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0000
+Index: libkcal/libical/zoneinfo/Antarctica/Palmer.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/Palmer.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/Palmer.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/Palmer
++TZID:/kde.org/Olson_20080523_1/Antarctica/Palmer
+ X-LIC-LOCATION:Antarctica/Palmer
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0400
+Index: libkcal/libical/zoneinfo/Antarctica/South_Pole.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Antarctica/South_Pole.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Antarctica/South_Pole.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Antarctica/South_Pole
++TZID:/kde.org/Olson_20080523_1/Antarctica/South_Pole
+ X-LIC-LOCATION:Antarctica/South_Pole
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1200
+Index: libkcal/libical/zoneinfo/Asia/Makassar.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Makassar.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Makassar.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Makassar
++TZID:/kde.org/Olson_20080523_1/Asia/Makassar
+ X-LIC-LOCATION:Asia/Makassar
+ BEGIN:STANDARD
+ TZOFFSETFROM:+075736
+Index: libkcal/libical/zoneinfo/Asia/Karachi.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Karachi.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Karachi.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Karachi
++TZID:/kde.org/Olson_20080523_1/Asia/Karachi
+ X-LIC-LOCATION:Asia/Karachi
+ BEGIN:STANDARD
+ TZOFFSETFROM:+042812
+Index: libkcal/libical/zoneinfo/Asia/Rangoon.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Rangoon.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Rangoon.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Rangoon
++TZID:/kde.org/Olson_20080523_1/Asia/Rangoon
+ X-LIC-LOCATION:Asia/Rangoon
+ BEGIN:STANDARD
+ TZOFFSETFROM:+062440
+Index: libkcal/libical/zoneinfo/Asia/Harbin.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Harbin.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Harbin.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Harbin
++TZID:/kde.org/Olson_20080523_1/Asia/Harbin
+ X-LIC-LOCATION:Asia/Harbin
+ BEGIN:STANDARD
+ TZOFFSETFROM:+082644
+Index: libkcal/libical/zoneinfo/Asia/Novosibirsk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Novosibirsk.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Novosibirsk.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Novosibirsk
++TZID:/kde.org/Olson_20080523_1/Asia/Novosibirsk
+ X-LIC-LOCATION:Asia/Novosibirsk
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0600
+Index: libkcal/libical/zoneinfo/Asia/Yerevan.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Yerevan.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Yerevan.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Yerevan
++TZID:/kde.org/Olson_20080523_1/Asia/Yerevan
+ X-LIC-LOCATION:Asia/Yerevan
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0400
+Index: libkcal/libical/zoneinfo/Asia/Ashgabat.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Ashgabat.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Ashgabat.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Ashgabat
++TZID:/kde.org/Olson_20080523_1/Asia/Ashgabat
+ X-LIC-LOCATION:Asia/Ashgabat
+ BEGIN:STANDARD
+ TZOFFSETFROM:+035332
+Index: libkcal/libical/zoneinfo/Asia/Ulaanbaatar.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Ulaanbaatar.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Ulaanbaatar.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Ulaanbaatar
++TZID:/kde.org/Olson_20080523_1/Asia/Ulaanbaatar
+ X-LIC-LOCATION:Asia/Ulaanbaatar
+ BEGIN:STANDARD
+ TZOFFSETFROM:+070732
+Index: libkcal/libical/zoneinfo/Asia/Jakarta.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Jakarta.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Jakarta.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Jakarta
++TZID:/kde.org/Olson_20080523_1/Asia/Jakarta
+ X-LIC-LOCATION:Asia/Jakarta
+ BEGIN:STANDARD
+ TZOFFSETFROM:+070712
+Index: libkcal/libical/zoneinfo/Asia/Thimphu.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Thimphu.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Thimphu.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Thimphu
++TZID:/kde.org/Olson_20080523_1/Asia/Thimphu
+ X-LIC-LOCATION:Asia/Thimphu
+ BEGIN:STANDARD
+ TZOFFSETFROM:+055836
+Index: libkcal/libical/zoneinfo/Asia/Riyadh.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Riyadh.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Riyadh.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Riyadh
++TZID:/kde.org/Olson_20080523_1/Asia/Riyadh
+ X-LIC-LOCATION:Asia/Riyadh
+ BEGIN:STANDARD
+ TZOFFSETFROM:+030652
+Index: libkcal/libical/zoneinfo/Asia/Bishkek.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Bishkek.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Bishkek.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Bishkek
++TZID:/kde.org/Olson_20080523_1/Asia/Bishkek
+ X-LIC-LOCATION:Asia/Bishkek
+ BEGIN:STANDARD
+ TZOFFSETFROM:+045824
+Index: libkcal/libical/zoneinfo/Asia/Dili.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Dili.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Dili.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Dili
++TZID:/kde.org/Olson_20080523_1/Asia/Dili
+ X-LIC-LOCATION:Asia/Dili
+ BEGIN:STANDARD
+ TZOFFSETFROM:+082220
+Index: libkcal/libical/zoneinfo/Asia/Istanbul.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Istanbul.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Istanbul.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Istanbul
++TZID:/kde.org/Olson_20080523_1/Asia/Istanbul
+ X-LIC-LOCATION:Asia/Istanbul
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Asia/Pontianak.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Pontianak.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Pontianak.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Pontianak
++TZID:/kde.org/Olson_20080523_1/Asia/Pontianak
+ X-LIC-LOCATION:Asia/Pontianak
+ BEGIN:STANDARD
+ TZOFFSETFROM:+071720
+Index: libkcal/libical/zoneinfo/Asia/Kamchatka.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Kamchatka.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Kamchatka.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Kamchatka
++TZID:/kde.org/Olson_20080523_1/Asia/Kamchatka
+ X-LIC-LOCATION:Asia/Kamchatka
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1200
+Index: libkcal/libical/zoneinfo/Asia/Kolkata.ics
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libkcal/libical/zoneinfo/Asia/Kolkata.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -0,0 +1,37 @@
++BEGIN:VCALENDAR
++PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
++VERSION:2.0
++BEGIN:VTIMEZONE
++TZID:/kde.org/Olson_20080523_1/Asia/Kolkata
++X-LIC-LOCATION:Asia/Kolkata
++BEGIN:STANDARD
++TZOFFSETFROM:+055328
++TZOFFSETTO:+055320
++TZNAME:HMT
++DTSTART:18800101T000000
++RDATE:18800101T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:+055320
++TZOFFSETTO:+0630
++TZNAME:BURT
++DTSTART:19411001T000000
++RDATE:19411001T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:+0630
++TZOFFSETTO:+0530
++TZNAME:IST
++DTSTART:19420515T000000
++RDATE:19420515T000000
++RDATE:19451015T000000
++END:STANDARD
++BEGIN:DAYLIGHT
++TZOFFSETFROM:+0530
++TZOFFSETTO:+0630
++TZNAME:IST
++DTSTART:19420901T000000
++RDATE:19420901T000000
++END:DAYLIGHT
++END:VTIMEZONE
++END:VCALENDAR
+Index: libkcal/libical/zoneinfo/Asia/Seoul.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Seoul.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Seoul.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Seoul
++TZID:/kde.org/Olson_20080523_1/Asia/Seoul
+ X-LIC-LOCATION:Asia/Seoul
+ BEGIN:STANDARD
+ TZOFFSETFROM:+082752
+Index: libkcal/libical/zoneinfo/Asia/Oral.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Oral.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Oral.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Oral
++TZID:/kde.org/Olson_20080523_1/Asia/Oral
+ X-LIC-LOCATION:Asia/Oral
+ BEGIN:STANDARD
+ TZOFFSETFROM:+032524
+Index: libkcal/libical/zoneinfo/Asia/Choibalsan.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Choibalsan.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Choibalsan.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Choibalsan
++TZID:/kde.org/Olson_20080523_1/Asia/Choibalsan
+ X-LIC-LOCATION:Asia/Choibalsan
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0738
+Index: libkcal/libical/zoneinfo/Asia/Kuwait.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Kuwait.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Kuwait.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Kuwait
++TZID:/kde.org/Olson_20080523_1/Asia/Kuwait
+ X-LIC-LOCATION:Asia/Kuwait
+ BEGIN:STANDARD
+ TZOFFSETFROM:+031156
+Index: libkcal/libical/zoneinfo/Asia/Krasnoyarsk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Krasnoyarsk.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Krasnoyarsk.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Krasnoyarsk
++TZID:/kde.org/Olson_20080523_1/Asia/Krasnoyarsk
+ X-LIC-LOCATION:Asia/Krasnoyarsk
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0700
+Index: libkcal/libical/zoneinfo/Asia/Omsk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Omsk.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Omsk.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Omsk
++TZID:/kde.org/Olson_20080523_1/Asia/Omsk
+ X-LIC-LOCATION:Asia/Omsk
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0600
+Index: libkcal/libical/zoneinfo/Asia/Baghdad.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Baghdad.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Baghdad.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,22 +2,8 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Baghdad
++TZID:/kde.org/Olson_20080523_1/Asia/Baghdad
+ X-LIC-LOCATION:Asia/Baghdad
+-BEGIN:DAYLIGHT
+-TZOFFSETFROM:+0300
+-TZOFFSETTO:+0400
+-TZNAME:ADT
+-DTSTART:19910401T030000
+-RRULE:FREQ=YEARLY
+-END:DAYLIGHT
+-BEGIN:STANDARD
+-TZOFFSETFROM:+0400
+-TZOFFSETTO:+0300
+-TZNAME:AST
+-DTSTART:19911001T040000
+-RRULE:FREQ=YEARLY
+-END:STANDARD
+ BEGIN:STANDARD
+ TZOFFSETFROM:+025740
+ TZOFFSETTO:+025736
+@@ -46,6 +32,23 @@
+ RDATE:19880327T010000
+ RDATE:19890326T010000
+ RDATE:19900325T010000
++RDATE:19910401T030000
++RDATE:19920401T030000
++RDATE:19930401T030000
++RDATE:19940401T030000
++RDATE:19950401T030000
++RDATE:19960401T030000
++RDATE:19970401T030000
++RDATE:19980401T030000
++RDATE:19990401T030000
++RDATE:20000401T030000
++RDATE:20010401T030000
++RDATE:20020401T030000
++RDATE:20030401T030000
++RDATE:20040401T030000
++RDATE:20050401T030000
++RDATE:20060401T030000
++RDATE:20070401T030000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0400
+@@ -61,6 +64,23 @@
+ RDATE:19880925T020000
+ RDATE:19890924T020000
+ RDATE:19900930T020000
++RDATE:19911001T040000
++RDATE:19921001T040000
++RDATE:19931001T040000
++RDATE:19941001T040000
++RDATE:19951001T040000
++RDATE:19961001T040000
++RDATE:19971001T040000
++RDATE:19981001T040000
++RDATE:19991001T040000
++RDATE:20001001T040000
++RDATE:20011001T040000
++RDATE:20021001T040000
++RDATE:20031001T040000
++RDATE:20041001T040000
++RDATE:20051001T040000
++RDATE:20061001T040000
++RDATE:20071001T040000
+ END:STANDARD
+ END:VTIMEZONE
+ END:VCALENDAR
+Index: libkcal/libical/zoneinfo/Asia/Taipei.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Taipei.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Taipei.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Taipei
++TZID:/kde.org/Olson_20080523_1/Asia/Taipei
+ X-LIC-LOCATION:Asia/Taipei
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0806
+Index: libkcal/libical/zoneinfo/Asia/Yekaterinburg.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Yekaterinburg.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Yekaterinburg.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Yekaterinburg
++TZID:/kde.org/Olson_20080523_1/Asia/Yekaterinburg
+ X-LIC-LOCATION:Asia/Yekaterinburg
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0500
+Index: libkcal/libical/zoneinfo/Asia/Jayapura.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Jayapura.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Jayapura.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Jayapura
++TZID:/kde.org/Olson_20080523_1/Asia/Jayapura
+ X-LIC-LOCATION:Asia/Jayapura
+ BEGIN:STANDARD
+ TZOFFSETFROM:+092248
+Index: libkcal/libical/zoneinfo/Asia/Baku.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Baku.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Baku.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Baku
++TZID:/kde.org/Olson_20080523_1/Asia/Baku
+ X-LIC-LOCATION:Asia/Baku
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0400
+Index: libkcal/libical/zoneinfo/Asia/Urumqi.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Urumqi.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Urumqi.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Urumqi
++TZID:/kde.org/Olson_20080523_1/Asia/Urumqi
+ X-LIC-LOCATION:Asia/Urumqi
+ BEGIN:STANDARD
+ TZOFFSETFROM:+055020
+Index: libkcal/libical/zoneinfo/Asia/Vientiane.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Vientiane.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Vientiane.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Vientiane
++TZID:/kde.org/Olson_20080523_1/Asia/Vientiane
+ X-LIC-LOCATION:Asia/Vientiane
+ BEGIN:STANDARD
+ TZOFFSETFROM:+065024
+Index: libkcal/libical/zoneinfo/Asia/Dubai.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Dubai.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Dubai.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Dubai
++TZID:/kde.org/Olson_20080523_1/Asia/Dubai
+ X-LIC-LOCATION:Asia/Dubai
+ BEGIN:STANDARD
+ TZOFFSETFROM:+034112
+Index: libkcal/libical/zoneinfo/Asia/Nicosia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Nicosia.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Nicosia.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Nicosia
++TZID:/kde.org/Olson_20080523_1/Asia/Nicosia
+ X-LIC-LOCATION:Asia/Nicosia
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0300
+Index: libkcal/libical/zoneinfo/Asia/Singapore.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Singapore.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Singapore.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Singapore
++TZID:/kde.org/Olson_20080523_1/Asia/Singapore
+ X-LIC-LOCATION:Asia/Singapore
+ BEGIN:STANDARD
+ TZOFFSETFROM:+065525
+Index: libkcal/libical/zoneinfo/Asia/Dushanbe.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Dushanbe.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Dushanbe.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Dushanbe
++TZID:/kde.org/Olson_20080523_1/Asia/Dushanbe
+ X-LIC-LOCATION:Asia/Dushanbe
+ BEGIN:STANDARD
+ TZOFFSETFROM:+043512
+Index: libkcal/libical/zoneinfo/Asia/Sakhalin.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Sakhalin.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Sakhalin.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Sakhalin
++TZID:/kde.org/Olson_20080523_1/Asia/Sakhalin
+ X-LIC-LOCATION:Asia/Sakhalin
+ BEGIN:STANDARD
+ TZOFFSETFROM:+1100
+Index: libkcal/libical/zoneinfo/Asia/Qyzylorda.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Qyzylorda.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Qyzylorda.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Qyzylorda
++TZID:/kde.org/Olson_20080523_1/Asia/Qyzylorda
+ X-LIC-LOCATION:Asia/Qyzylorda
+ BEGIN:STANDARD
+ TZOFFSETFROM:+042152
+Index: libkcal/libical/zoneinfo/Asia/Kabul.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Kabul.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Kabul.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Kabul
++TZID:/kde.org/Olson_20080523_1/Asia/Kabul
+ X-LIC-LOCATION:Asia/Kabul
+ BEGIN:STANDARD
+ TZOFFSETFROM:+043648
+Index: libkcal/libical/zoneinfo/Asia/Samarkand.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Samarkand.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Samarkand.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Samarkand
++TZID:/kde.org/Olson_20080523_1/Asia/Samarkand
+ X-LIC-LOCATION:Asia/Samarkand
+ BEGIN:STANDARD
+ TZOFFSETFROM:+042712
+Index: libkcal/libical/zoneinfo/Asia/Manila.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Manila.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Manila.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Manila
++TZID:/kde.org/Olson_20080523_1/Asia/Manila
+ X-LIC-LOCATION:Asia/Manila
+ BEGIN:STANDARD
+ TZOFFSETFROM:-1556
+Index: libkcal/libical/zoneinfo/Asia/Kuala_Lumpur.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Kuala_Lumpur.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Kuala_Lumpur.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Kuala_Lumpur
++TZID:/kde.org/Olson_20080523_1/Asia/Kuala_Lumpur
+ X-LIC-LOCATION:Asia/Kuala_Lumpur
+ BEGIN:STANDARD
+ TZOFFSETFROM:+064646
+Index: libkcal/libical/zoneinfo/Asia/Katmandu.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Katmandu.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Katmandu.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Katmandu
++TZID:/kde.org/Olson_20080523_1/Asia/Katmandu
+ X-LIC-LOCATION:Asia/Katmandu
+ BEGIN:STANDARD
+ TZOFFSETFROM:+054116
+Index: libkcal/libical/zoneinfo/Asia/Bahrain.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Bahrain.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Bahrain.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Bahrain
++TZID:/kde.org/Olson_20080523_1/Asia/Bahrain
+ X-LIC-LOCATION:Asia/Bahrain
+ BEGIN:STANDARD
+ TZOFFSETFROM:+032220
+Index: libkcal/libical/zoneinfo/Asia/Aden.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Aden.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Aden.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Aden
++TZID:/kde.org/Olson_20080523_1/Asia/Aden
+ X-LIC-LOCATION:Asia/Aden
+ BEGIN:STANDARD
+ TZOFFSETFROM:+030048
+Index: libkcal/libical/zoneinfo/Asia/Qatar.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Qatar.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Qatar.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Qatar
++TZID:/kde.org/Olson_20080523_1/Asia/Qatar
+ X-LIC-LOCATION:Asia/Qatar
+ BEGIN:STANDARD
+ TZOFFSETFROM:+032608
+Index: libkcal/libical/zoneinfo/Asia/Dhaka.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Dhaka.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Dhaka.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Dhaka
++TZID:/kde.org/Olson_20080523_1/Asia/Dhaka
+ X-LIC-LOCATION:Asia/Dhaka
+ BEGIN:STANDARD
+ TZOFFSETFROM:+060140
+Index: libkcal/libical/zoneinfo/Asia/Pyongyang.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Pyongyang.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Pyongyang.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Pyongyang
++TZID:/kde.org/Olson_20080523_1/Asia/Pyongyang
+ X-LIC-LOCATION:Asia/Pyongyang
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0823
+Index: libkcal/libical/zoneinfo/Asia/Aqtobe.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Aqtobe.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Aqtobe.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Aqtobe
++TZID:/kde.org/Olson_20080523_1/Asia/Aqtobe
+ X-LIC-LOCATION:Asia/Aqtobe
+ BEGIN:STANDARD
+ TZOFFSETFROM:+034840
+Index: libkcal/libical/zoneinfo/Asia/Aqtau.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Aqtau.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Aqtau.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Aqtau
++TZID:/kde.org/Olson_20080523_1/Asia/Aqtau
+ X-LIC-LOCATION:Asia/Aqtau
+ BEGIN:STANDARD
+ TZOFFSETFROM:+032104
+Index: libkcal/libical/zoneinfo/Asia/Chongqing.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Chongqing.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Chongqing.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Chongqing
++TZID:/kde.org/Olson_20080523_1/Asia/Chongqing
+ X-LIC-LOCATION:Asia/Chongqing
+ BEGIN:STANDARD
+ TZOFFSETFROM:+070620
+Index: libkcal/libical/zoneinfo/Asia/Anadyr.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Anadyr.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Anadyr.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Anadyr
++TZID:/kde.org/Olson_20080523_1/Asia/Anadyr
+ X-LIC-LOCATION:Asia/Anadyr
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1200
+Index: libkcal/libical/zoneinfo/Asia/Kashgar.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Kashgar.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Kashgar.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Kashgar
++TZID:/kde.org/Olson_20080523_1/Asia/Kashgar
+ X-LIC-LOCATION:Asia/Kashgar
+ BEGIN:STANDARD
+ TZOFFSETFROM:+050356
+Index: libkcal/libical/zoneinfo/Asia/Tashkent.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Tashkent.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Tashkent.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Tashkent
++TZID:/kde.org/Olson_20080523_1/Asia/Tashkent
+ X-LIC-LOCATION:Asia/Tashkent
+ BEGIN:STANDARD
+ TZOFFSETFROM:+043712
+Index: libkcal/libical/zoneinfo/Asia/Tehran.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Tehran.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Tehran.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Tehran
++TZID:/kde.org/Olson_20080523_1/Asia/Tehran
+ X-LIC-LOCATION:Asia/Tehran
+ BEGIN:STANDARD
+ TZOFFSETFROM:+032544
+Index: libkcal/libical/zoneinfo/Asia/Magadan.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Magadan.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Magadan.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Magadan
++TZID:/kde.org/Olson_20080523_1/Asia/Magadan
+ X-LIC-LOCATION:Asia/Magadan
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1100
+Index: libkcal/libical/zoneinfo/Asia/Colombo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Colombo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Colombo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Colombo
++TZID:/kde.org/Olson_20080523_1/Asia/Colombo
+ X-LIC-LOCATION:Asia/Colombo
+ BEGIN:STANDARD
+ TZOFFSETFROM:+051924
+Index: libkcal/libical/zoneinfo/Asia/Phnom_Penh.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Phnom_Penh.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Phnom_Penh.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Phnom_Penh
++TZID:/kde.org/Olson_20080523_1/Asia/Phnom_Penh
+ X-LIC-LOCATION:Asia/Phnom_Penh
+ BEGIN:STANDARD
+ TZOFFSETFROM:+065940
+Index: libkcal/libical/zoneinfo/Asia/Yakutsk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Yakutsk.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Yakutsk.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Yakutsk
++TZID:/kde.org/Olson_20080523_1/Asia/Yakutsk
+ X-LIC-LOCATION:Asia/Yakutsk
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0900
+Index: libkcal/libical/zoneinfo/Asia/Muscat.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Muscat.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Muscat.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Muscat
++TZID:/kde.org/Olson_20080523_1/Asia/Muscat
+ X-LIC-LOCATION:Asia/Muscat
+ BEGIN:STANDARD
+ TZOFFSETFROM:+035420
+Index: libkcal/libical/zoneinfo/Asia/Damascus.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Damascus.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Damascus.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,20 +2,20 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Damascus
++TZID:/kde.org/Olson_20080523_1/Asia/Damascus
+ X-LIC-LOCATION:Asia/Damascus
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+ TZOFFSETTO:+0300
+ TZNAME:EEST
+-DTSTART:20070330T000000
+-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR
++DTSTART:20080404T000000
++RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0300
+ TZOFFSETTO:+0200
+ TZNAME:EET
+-DTSTART:20071001T000000
++DTSTART:20081001T000000
+ RRULE:FREQ=YEARLY
+ END:STANDARD
+ BEGIN:STANDARD
+@@ -74,6 +74,7 @@
+ RDATE:20040401T000000
+ RDATE:20050401T000000
+ RDATE:20060401T000000
++RDATE:20070330T000000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:+0300
+@@ -124,6 +125,7 @@
+ RDATE:20041001T000000
+ RDATE:20051001T000000
+ RDATE:20060922T000000
++RDATE:20071102T000000
+ END:STANDARD
+ END:VTIMEZONE
+ END:VCALENDAR
+Index: libkcal/libical/zoneinfo/Asia/Hovd.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Hovd.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Hovd.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Hovd
++TZID:/kde.org/Olson_20080523_1/Asia/Hovd
+ X-LIC-LOCATION:Asia/Hovd
+ BEGIN:STANDARD
+ TZOFFSETFROM:+060636
+Index: libkcal/libical/zoneinfo/Asia/Ho_Chi_Minh.ics
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libkcal/libical/zoneinfo/Asia/Ho_Chi_Minh.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -0,0 +1,36 @@
++BEGIN:VCALENDAR
++PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
++VERSION:2.0
++BEGIN:VTIMEZONE
++TZID:/kde.org/Olson_20080523_1/Asia/Ho_Chi_Minh
++X-LIC-LOCATION:Asia/Ho_Chi_Minh
++BEGIN:STANDARD
++TZOFFSETFROM:+070640
++TZOFFSETTO:+070620
++TZNAME:SMT
++DTSTART:19060609T000000
++RDATE:19060609T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:+070620
++TZOFFSETTO:+0700
++TZNAME:ICT
++DTSTART:19110311T000100
++RDATE:19110311T000100
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:+0700
++TZOFFSETTO:+0800
++TZNAME:ICT
++DTSTART:19120501T000000
++RDATE:19120501T000000
++END:STANDARD
++BEGIN:STANDARD
++TZOFFSETFROM:+0800
++TZOFFSETTO:+0700
++TZNAME:ICT
++DTSTART:19310501T000000
++RDATE:19310501T000000
++END:STANDARD
++END:VTIMEZONE
++END:VCALENDAR
+Index: libkcal/libical/zoneinfo/Asia/Tokyo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Tokyo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Tokyo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Tokyo
++TZID:/kde.org/Olson_20080523_1/Asia/Tokyo
+ X-LIC-LOCATION:Asia/Tokyo
+ BEGIN:STANDARD
+ TZOFFSETFROM:+091859
+Index: libkcal/libical/zoneinfo/Asia/Vladivostok.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Vladivostok.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Vladivostok.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Vladivostok
++TZID:/kde.org/Olson_20080523_1/Asia/Vladivostok
+ X-LIC-LOCATION:Asia/Vladivostok
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1000
+Index: libkcal/libical/zoneinfo/Asia/Hong_Kong.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Hong_Kong.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Hong_Kong.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Hong_Kong
++TZID:/kde.org/Olson_20080523_1/Asia/Hong_Kong
+ X-LIC-LOCATION:Asia/Hong_Kong
+ BEGIN:STANDARD
+ TZOFFSETFROM:+073636
+Index: libkcal/libical/zoneinfo/Asia/Bangkok.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Bangkok.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Bangkok.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Bangkok
++TZID:/kde.org/Olson_20080523_1/Asia/Bangkok
+ X-LIC-LOCATION:Asia/Bangkok
+ BEGIN:STANDARD
+ TZOFFSETFROM:+064204
+Index: libkcal/libical/zoneinfo/Asia/Shanghai.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Shanghai.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Shanghai.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Shanghai
++TZID:/kde.org/Olson_20080523_1/Asia/Shanghai
+ X-LIC-LOCATION:Asia/Shanghai
+ BEGIN:STANDARD
+ TZOFFSETFROM:+080552
+Index: libkcal/libical/zoneinfo/Asia/Gaza.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Gaza.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Gaza.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Gaza
++TZID:/kde.org/Olson_20080523_1/Asia/Gaza
+ X-LIC-LOCATION:Asia/Gaza
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Asia/Brunei.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Brunei.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Brunei.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Brunei
++TZID:/kde.org/Olson_20080523_1/Asia/Brunei
+ X-LIC-LOCATION:Asia/Brunei
+ BEGIN:STANDARD
+ TZOFFSETFROM:+073940
+Index: libkcal/libical/zoneinfo/Asia/Macau.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Macau.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Macau.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Macau
++TZID:/kde.org/Olson_20080523_1/Asia/Macau
+ X-LIC-LOCATION:Asia/Macau
+ BEGIN:STANDARD
+ TZOFFSETFROM:+073420
+Index: libkcal/libical/zoneinfo/Asia/Jerusalem.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Jerusalem.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Jerusalem.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Jerusalem
++TZID:/kde.org/Olson_20080523_1/Asia/Jerusalem
+ X-LIC-LOCATION:Asia/Jerusalem
+ BEGIN:STANDARD
+ TZOFFSETFROM:+022056
+Index: libkcal/libical/zoneinfo/Asia/Almaty.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Almaty.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Almaty.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Almaty
++TZID:/kde.org/Olson_20080523_1/Asia/Almaty
+ X-LIC-LOCATION:Asia/Almaty
+ BEGIN:STANDARD
+ TZOFFSETFROM:+050748
+Index: libkcal/libical/zoneinfo/Asia/Kuching.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Kuching.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Kuching.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Kuching
++TZID:/kde.org/Olson_20080523_1/Asia/Kuching
+ X-LIC-LOCATION:Asia/Kuching
+ BEGIN:STANDARD
+ TZOFFSETFROM:+072120
+Index: libkcal/libical/zoneinfo/Asia/Amman.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Amman.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Amman.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Amman
++TZID:/kde.org/Olson_20080523_1/Asia/Amman
+ X-LIC-LOCATION:Asia/Amman
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Asia/Beirut.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Beirut.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Beirut.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Beirut
++TZID:/kde.org/Olson_20080523_1/Asia/Beirut
+ X-LIC-LOCATION:Asia/Beirut
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0200
+Index: libkcal/libical/zoneinfo/Asia/Irkutsk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Irkutsk.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Irkutsk.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Irkutsk
++TZID:/kde.org/Olson_20080523_1/Asia/Irkutsk
+ X-LIC-LOCATION:Asia/Irkutsk
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+0800
+Index: libkcal/libical/zoneinfo/Asia/Tbilisi.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Asia/Tbilisi.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Asia/Tbilisi.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Asia/Tbilisi
++TZID:/kde.org/Olson_20080523_1/Asia/Tbilisi
+ X-LIC-LOCATION:Asia/Tbilisi
+ BEGIN:STANDARD
+ TZOFFSETFROM:+025916
+Index: libkcal/libical/zoneinfo/Pacific/Palau.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Palau.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Palau.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Palau
++TZID:/kde.org/Olson_20080523_1/Pacific/Palau
+ X-LIC-LOCATION:Pacific/Palau
+ BEGIN:STANDARD
+ TZOFFSETFROM:+085756
+Index: libkcal/libical/zoneinfo/Pacific/Tongatapu.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Tongatapu.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Tongatapu.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Tongatapu
++TZID:/kde.org/Olson_20080523_1/Pacific/Tongatapu
+ X-LIC-LOCATION:Pacific/Tongatapu
+ BEGIN:STANDARD
+ TZOFFSETFROM:+121920
+Index: libkcal/libical/zoneinfo/Pacific/Fakaofo.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Fakaofo.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Fakaofo.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Fakaofo
++TZID:/kde.org/Olson_20080523_1/Pacific/Fakaofo
+ X-LIC-LOCATION:Pacific/Fakaofo
+ BEGIN:STANDARD
+ TZOFFSETFROM:-112456
+Index: libkcal/libical/zoneinfo/Pacific/Gambier.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Gambier.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Gambier.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Gambier
++TZID:/kde.org/Olson_20080523_1/Pacific/Gambier
+ X-LIC-LOCATION:Pacific/Gambier
+ BEGIN:STANDARD
+ TZOFFSETFROM:-085948
+Index: libkcal/libical/zoneinfo/Pacific/Norfolk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Norfolk.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Norfolk.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Norfolk
++TZID:/kde.org/Olson_20080523_1/Pacific/Norfolk
+ X-LIC-LOCATION:Pacific/Norfolk
+ BEGIN:STANDARD
+ TZOFFSETFROM:+111152
+Index: libkcal/libical/zoneinfo/Pacific/Apia.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Apia.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Apia.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Apia
++TZID:/kde.org/Olson_20080523_1/Pacific/Apia
+ X-LIC-LOCATION:Pacific/Apia
+ BEGIN:STANDARD
+ TZOFFSETFROM:+123304
+Index: libkcal/libical/zoneinfo/Pacific/Saipan.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Saipan.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Saipan.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Saipan
++TZID:/kde.org/Olson_20080523_1/Pacific/Saipan
+ X-LIC-LOCATION:Pacific/Saipan
+ BEGIN:STANDARD
+ TZOFFSETFROM:-1417
+Index: libkcal/libical/zoneinfo/Pacific/Tarawa.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Tarawa.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Tarawa.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Tarawa
++TZID:/kde.org/Olson_20080523_1/Pacific/Tarawa
+ X-LIC-LOCATION:Pacific/Tarawa
+ BEGIN:STANDARD
+ TZOFFSETFROM:+113204
+Index: libkcal/libical/zoneinfo/Pacific/Fiji.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Fiji.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Fiji.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Fiji
++TZID:/kde.org/Olson_20080523_1/Pacific/Fiji
+ X-LIC-LOCATION:Pacific/Fiji
+ BEGIN:STANDARD
+ TZOFFSETFROM:+115340
+Index: libkcal/libical/zoneinfo/Pacific/Funafuti.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Funafuti.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Funafuti.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Funafuti
++TZID:/kde.org/Olson_20080523_1/Pacific/Funafuti
+ X-LIC-LOCATION:Pacific/Funafuti
+ BEGIN:STANDARD
+ TZOFFSETFROM:+115652
+Index: libkcal/libical/zoneinfo/Pacific/Easter.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Easter.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Easter.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Easter
++TZID:/kde.org/Olson_20080523_1/Pacific/Easter
+ X-LIC-LOCATION:Pacific/Easter
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:-0600
+@@ -15,7 +15,7 @@
+ TZOFFSETFROM:-0500
+ TZOFFSETTO:-0600
+ TZNAME:EAST
+-DTSTART:20000311T220000
++DTSTART:20090314T220000
+ RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA
+ END:STANDARD
+ BEGIN:STANDARD
+@@ -140,6 +140,15 @@
+ RDATE:19970329T220000
+ RDATE:19980314T220000
+ RDATE:19990403T220000
++RDATE:20000311T220000
++RDATE:20010310T220000
++RDATE:20020309T220000
++RDATE:20030308T220000
++RDATE:20040313T220000
++RDATE:20050312T220000
++RDATE:20060311T220000
++RDATE:20070310T220000
++RDATE:20080329T220000
+ END:STANDARD
+ END:VTIMEZONE
+ END:VCALENDAR
+Index: libkcal/libical/zoneinfo/Pacific/Port_Moresby.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Port_Moresby.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Port_Moresby.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Port_Moresby
++TZID:/kde.org/Olson_20080523_1/Pacific/Port_Moresby
+ X-LIC-LOCATION:Pacific/Port_Moresby
+ BEGIN:STANDARD
+ TZOFFSETFROM:+094840
+Index: libkcal/libical/zoneinfo/Pacific/Kosrae.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Kosrae.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Kosrae.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Kosrae
++TZID:/kde.org/Olson_20080523_1/Pacific/Kosrae
+ X-LIC-LOCATION:Pacific/Kosrae
+ BEGIN:STANDARD
+ TZOFFSETFROM:+105156
+Index: libkcal/libical/zoneinfo/Pacific/Truk.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Truk.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Truk.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Truk
++TZID:/kde.org/Olson_20080523_1/Pacific/Truk
+ X-LIC-LOCATION:Pacific/Truk
+ BEGIN:STANDARD
+ TZOFFSETFROM:+100708
+Index: libkcal/libical/zoneinfo/Pacific/Wake.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Wake.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Wake.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Wake
++TZID:/kde.org/Olson_20080523_1/Pacific/Wake
+ X-LIC-LOCATION:Pacific/Wake
+ BEGIN:STANDARD
+ TZOFFSETFROM:+110628
+Index: libkcal/libical/zoneinfo/Pacific/Guam.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Guam.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Guam.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Guam
++TZID:/kde.org/Olson_20080523_1/Pacific/Guam
+ X-LIC-LOCATION:Pacific/Guam
+ BEGIN:STANDARD
+ TZOFFSETFROM:-1421
+Index: libkcal/libical/zoneinfo/Pacific/Pago_Pago.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Pago_Pago.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Pago_Pago.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Pago_Pago
++TZID:/kde.org/Olson_20080523_1/Pacific/Pago_Pago
+ X-LIC-LOCATION:Pacific/Pago_Pago
+ BEGIN:STANDARD
+ TZOFFSETFROM:+123712
+Index: libkcal/libical/zoneinfo/Pacific/Majuro.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Majuro.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Majuro.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Majuro
++TZID:/kde.org/Olson_20080523_1/Pacific/Majuro
+ X-LIC-LOCATION:Pacific/Majuro
+ BEGIN:STANDARD
+ TZOFFSETFROM:+112448
+Index: libkcal/libical/zoneinfo/Pacific/Galapagos.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Galapagos.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Galapagos.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Galapagos
++TZID:/kde.org/Olson_20080523_1/Pacific/Galapagos
+ X-LIC-LOCATION:Pacific/Galapagos
+ BEGIN:STANDARD
+ TZOFFSETFROM:-055824
+Index: libkcal/libical/zoneinfo/Pacific/Enderbury.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Enderbury.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Enderbury.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Enderbury
++TZID:/kde.org/Olson_20080523_1/Pacific/Enderbury
+ X-LIC-LOCATION:Pacific/Enderbury
+ BEGIN:STANDARD
+ TZOFFSETFROM:-112420
+Index: libkcal/libical/zoneinfo/Pacific/Johnston.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Johnston.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Johnston.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Johnston
++TZID:/kde.org/Olson_20080523_1/Pacific/Johnston
+ X-LIC-LOCATION:Pacific/Johnston
+ BEGIN:STANDARD
+ TZOFFSETFROM:-1000
+Index: libkcal/libical/zoneinfo/Pacific/Kwajalein.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Kwajalein.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Kwajalein.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Kwajalein
++TZID:/kde.org/Olson_20080523_1/Pacific/Kwajalein
+ X-LIC-LOCATION:Pacific/Kwajalein
+ BEGIN:STANDARD
+ TZOFFSETFROM:+110920
+Index: libkcal/libical/zoneinfo/Pacific/Chatham.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Chatham.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Chatham.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Chatham
++TZID:/kde.org/Olson_20080523_1/Pacific/Chatham
+ X-LIC-LOCATION:Pacific/Chatham
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1245
+Index: libkcal/libical/zoneinfo/Pacific/Honolulu.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Honolulu.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Honolulu.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Honolulu
++TZID:/kde.org/Olson_20080523_1/Pacific/Honolulu
+ X-LIC-LOCATION:Pacific/Honolulu
+ BEGIN:STANDARD
+ TZOFFSETFROM:-103126
+Index: libkcal/libical/zoneinfo/Pacific/Kiritimati.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Kiritimati.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Kiritimati.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Kiritimati
++TZID:/kde.org/Olson_20080523_1/Pacific/Kiritimati
+ X-LIC-LOCATION:Pacific/Kiritimati
+ BEGIN:STANDARD
+ TZOFFSETFROM:-102920
+Index: libkcal/libical/zoneinfo/Pacific/Pitcairn.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Pitcairn.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Pitcairn.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Pitcairn
++TZID:/kde.org/Olson_20080523_1/Pacific/Pitcairn
+ X-LIC-LOCATION:Pacific/Pitcairn
+ BEGIN:STANDARD
+ TZOFFSETFROM:-084020
+Index: libkcal/libical/zoneinfo/Pacific/Ponape.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Ponape.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Ponape.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Ponape
++TZID:/kde.org/Olson_20080523_1/Pacific/Ponape
+ X-LIC-LOCATION:Pacific/Ponape
+ BEGIN:STANDARD
+ TZOFFSETFROM:+103252
+Index: libkcal/libical/zoneinfo/Pacific/Auckland.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Auckland.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Auckland.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Auckland
++TZID:/kde.org/Olson_20080523_1/Pacific/Auckland
+ X-LIC-LOCATION:Pacific/Auckland
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1200
+Index: libkcal/libical/zoneinfo/Pacific/Tahiti.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Tahiti.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Tahiti.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Tahiti
++TZID:/kde.org/Olson_20080523_1/Pacific/Tahiti
+ X-LIC-LOCATION:Pacific/Tahiti
+ BEGIN:STANDARD
+ TZOFFSETFROM:-095816
+Index: libkcal/libical/zoneinfo/Pacific/Noumea.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Noumea.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Noumea.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Noumea
++TZID:/kde.org/Olson_20080523_1/Pacific/Noumea
+ X-LIC-LOCATION:Pacific/Noumea
+ BEGIN:STANDARD
+ TZOFFSETFROM:+110548
+Index: libkcal/libical/zoneinfo/Pacific/Efate.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Efate.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Efate.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Efate
++TZID:/kde.org/Olson_20080523_1/Pacific/Efate
+ X-LIC-LOCATION:Pacific/Efate
+ BEGIN:STANDARD
+ TZOFFSETFROM:+111316
+Index: libkcal/libical/zoneinfo/Pacific/Nauru.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Nauru.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Nauru.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Nauru
++TZID:/kde.org/Olson_20080523_1/Pacific/Nauru
+ X-LIC-LOCATION:Pacific/Nauru
+ BEGIN:STANDARD
+ TZOFFSETFROM:+110740
+Index: libkcal/libical/zoneinfo/Pacific/Midway.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Midway.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Midway.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Midway
++TZID:/kde.org/Olson_20080523_1/Pacific/Midway
+ X-LIC-LOCATION:Pacific/Midway
+ BEGIN:STANDARD
+ TZOFFSETFROM:-114928
+Index: libkcal/libical/zoneinfo/Pacific/Wallis.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Wallis.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Wallis.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Wallis
++TZID:/kde.org/Olson_20080523_1/Pacific/Wallis
+ X-LIC-LOCATION:Pacific/Wallis
+ BEGIN:STANDARD
+ TZOFFSETFROM:+121520
+Index: libkcal/libical/zoneinfo/Pacific/Rarotonga.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Rarotonga.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Rarotonga.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Rarotonga
++TZID:/kde.org/Olson_20080523_1/Pacific/Rarotonga
+ X-LIC-LOCATION:Pacific/Rarotonga
+ BEGIN:STANDARD
+ TZOFFSETFROM:-103904
+Index: libkcal/libical/zoneinfo/Pacific/Guadalcanal.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Guadalcanal.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Guadalcanal.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Guadalcanal
++TZID:/kde.org/Olson_20080523_1/Pacific/Guadalcanal
+ X-LIC-LOCATION:Pacific/Guadalcanal
+ BEGIN:STANDARD
+ TZOFFSETFROM:+103948
+Index: libkcal/libical/zoneinfo/Pacific/Niue.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Niue.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Niue.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Niue
++TZID:/kde.org/Olson_20080523_1/Pacific/Niue
+ X-LIC-LOCATION:Pacific/Niue
+ BEGIN:STANDARD
+ TZOFFSETFROM:-111940
+Index: libkcal/libical/zoneinfo/Pacific/Marquesas.ics
+===================================================================
+--- libkcal/libical/zoneinfo/Pacific/Marquesas.ics.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/libical/zoneinfo/Pacific/Marquesas.ics 2008-06-29 20:10:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ PRODID:-//KDE//NONSGML KCal Olson-VTIMEZONE Converter//EN
+ VERSION:2.0
+ BEGIN:VTIMEZONE
+-TZID:/kde.org/Olson_20071016_1/Pacific/Marquesas
++TZID:/kde.org/Olson_20080523_1/Pacific/Marquesas
+ X-LIC-LOCATION:Pacific/Marquesas
+ BEGIN:STANDARD
+ TZOFFSETFROM:-0918
+Index: libkcal/calendarlocal.cpp
+===================================================================
+--- libkcal/calendarlocal.cpp.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/calendarlocal.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -194,7 +194,7 @@
+ }
+
+ mTodoList.setAutoDelete( true );
+- mTodoList.clear();
++ mTodoList.clearAll();
+ mTodoList.setAutoDelete( false );
+ }
+
+@@ -542,7 +542,7 @@
+ }
+
+ mJournalList.setAutoDelete( true );
+- mJournalList.clear();
++ mJournalList.clearAll();
+ mJournalList.setAutoDelete( false );
+ }
+
+Index: libkcal/recurrence.cpp
+===================================================================
+--- libkcal/recurrence.cpp.orig 2007-05-14 09:54:50.000000000 +0200
++++ libkcal/recurrence.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -426,15 +426,15 @@
+ void Recurrence::unsetRecurs()
+ {
+ if ( mRecurReadOnly ) return;
+- mRRules.clear();
++ mRRules.clearAll();
+ updated();
+ }
+
+ void Recurrence::clear()
+ {
+ if ( mRecurReadOnly ) return;
+- mRRules.clear();
+- mExRules.clear();
++ mRRules.clearAll();
++ mExRules.clearAll();
+ mRDates.clear();
+ mRDateTimes.clear();
+ mExDates.clear();
+@@ -561,7 +561,7 @@
+ RecurrenceRule *Recurrence::setNewRecurrenceType( RecurrenceRule::PeriodType type, int freq )
+ {
+ if ( mRecurReadOnly || freq <= 0 ) return 0;
+- mRRules.clear();
++ mRRules.clearAll();
+ updated();
+ RecurrenceRule *rrule = defaultRRule( true );
+ if ( !rrule ) return 0;
+Index: libkcal/resourcelocaldir.h
+===================================================================
+--- libkcal/resourcelocaldir.h.orig 2005-09-10 10:24:36.000000000 +0200
++++ libkcal/resourcelocaldir.h 2008-06-29 20:10:37.000000000 +0200
+@@ -77,6 +77,7 @@
+ void reload( const QString & );
+
+ protected:
++ virtual bool doOpen();
+ virtual bool doLoad();
+ virtual bool doSave();
+ bool doSave( Incidence * );
+Index: libkcal/listbase.h
+===================================================================
+--- libkcal/listbase.h.orig 2005-10-10 17:02:27.000000000 +0200
++++ libkcal/listbase.h 2008-06-29 20:10:37.000000000 +0200
+@@ -77,6 +77,17 @@
+ }
+ }
+
++ void clearAll()
++ {
++ if ( mAutoDelete ) {
++ for ( QValueListIterator<T*> it = QValueList<T*>::begin();
++ it != QValueList<T*>::end(); ++it ) {
++ delete *it;
++ }
++ }
++ QValueList<T*>::clear();
++ }
++
+ private:
+ bool mAutoDelete;
+ };
+Index: libkcal/incidencebase.cpp
+===================================================================
+--- libkcal/incidencebase.cpp.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/incidencebase.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -59,10 +59,6 @@
+ mSyncStatus = i.mSyncStatus;
+ mComments = i.mComments;
+
+- // The copied object is a new one, so it isn't observed by the observer
+- // of the original object.
+- mObservers.clear();
+-
+ mAttendees.setAutoDelete( true );
+ }
+
+Index: libkcal/incidence.cpp
+===================================================================
+--- libkcal/incidence.cpp.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/incidence.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -123,7 +123,7 @@
+ mPriority = i.mPriority;
+ mLocation = i.mLocation;
+
+- mAlarms.clear();
++ mAlarms.clearAll();
+ Alarm::List::ConstIterator it;
+ for( it = i.mAlarms.begin(); it != i.mAlarms.end(); ++it ) {
+ Alarm *b = new Alarm( **it );
+@@ -131,7 +131,7 @@
+ mAlarms.append( b );
+ }
+
+- mAttachments.clear();
++ mAttachments.clearAll();
+ Attachment::List::ConstIterator it1;
+ for ( it1 = i.mAttachments.begin(); it1 != i.mAttachments.end(); ++it1 ) {
+ Attachment *a = new Attachment( **it1 );
+@@ -654,7 +654,7 @@
+
+ void Incidence::clearAttachments()
+ {
+- mAttachments.clear();
++ mAttachments.clearAll();
+ }
+
+ void Incidence::setResources(const QStringList &resources)
+@@ -796,7 +796,7 @@
+
+ void Incidence::clearAlarms()
+ {
+- mAlarms.clear();
++ mAlarms.clearAll();
+ updated();
+ }
+
+Index: libkcal/resourcecalendar.cpp
+===================================================================
+--- libkcal/resourcecalendar.cpp.orig 2008-02-13 10:39:51.000000000 +0100
++++ libkcal/resourcecalendar.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -109,8 +109,6 @@
+ return true;
+ }
+
+-
+-
+ bool ResourceCalendar::load()
+ {
+ kdDebug(5800) << "Loading resource " + resourceName() << endl;
+@@ -118,11 +116,13 @@
+ mReceivedLoadError = false;
+
+ bool success = true;
+- if ( !isOpen() ) success = open();
+- if ( success ) {
++ if ( !isOpen() )
++ success = open();
++ if ( success )
+ success = doLoad();
+- }
+- if ( !success && !mReceivedLoadError ) loadError();
++
++ if ( !success && !mReceivedLoadError )
++ loadError();
+
+ // If the resource is read-only, we need to set its incidences to read-only,
+ // too. This can't be done at a lower-level, since the read-only setting
+Index: kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop
+===================================================================
+--- kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -24,6 +24,7 @@
+ Comment[is]=Þessi rás skrifar upplýsingar um lófatölvuna þÃna og samstillinguna à skrá.
+ Comment[it]=Questo conduit scrive in un file informazioni sul tuo palmare.
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ã‚ãªãŸã®ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã®æƒ…å ±ã‚’æ›¸ã出ã—ã€ãƒ•ã‚¡ã‚¤ãƒ«ã«åŒæœŸã—ã¾ã™ã€‚
++Comment[ka]=ეს áƒáƒ ხი ინფáƒáƒ მáƒáƒªáƒ˜áƒáƒ¡ წერს თქვენი პáƒáƒ ტáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის შესáƒáƒ®áƒ”ბ დრáƒáƒ®áƒ“ენს მის სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒáƒ¡ ფáƒáƒ˜áƒšáƒ—áƒáƒœ.
+ Comment[kk]=Қалта құрылғыңыз туралы мәліметті файла жазу арнаÑÑ‹.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹ážŸážšážŸáŸážšâ€‹áž–áŸážáŸŒáž˜áž¶áž“​អំពី​ឧបករណáŸâ€‹áž™áž½ážšážŠáŸƒâ€‹ážšáž”ស់​អ្នក និង​ការ​ធ្វើ​សមកាលកម្ម ទៅ​ឯកសារ​មួយ ។
+ Comment[lt]=Šis kanalas įrašo informaciją apie delninuką ir sinchronizavimą į bylą.
+@@ -76,6 +77,7 @@
+ Name[is]=Kerfisupplýsingar
+ Name[it]=Informazioni di sistema
+ Name[ja]=ã‚·ã‚¹ãƒ†ãƒ æƒ…å ±
++Name[ka]=სისტემის ინფáƒáƒ მáƒáƒªáƒ˜áƒ
+ Name[kk]=Жүйелік мәлімет
+ Name[km]=áž–áŸážáŸŒáž˜áž¶áž“​អំពី​ប្រពáŸáž“្ធ
+ Name[lt]=Sistemos informacija
+@@ -101,7 +103,8 @@
+ Name[tg]=Иттилоот дар бораи ÑиÑтема
+ Name[tr]=Sistem Bilgisi
+ Name[uk]=СиÑтемна інформаціÑ
+-Name[uz]=Тизим ҳақида маълумот
++Name[uz]=Tizim haqida maʼlumot
++Name[uz at cyrillic]=Тизим ҳақида маълумот
+ Name[zh_CN]=系统信æ¯
+ Name[zh_TW]=系統資訊
+ Implemented=file
+Index: kpilot/conduits/notepadconduit/notepad-conduit.desktop
+===================================================================
+--- kpilot/conduits/notepadconduit/notepad-conduit.desktop.orig 2007-05-14 09:54:51.000000000 +0200
++++ kpilot/conduits/notepadconduit/notepad-conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -38,6 +38,7 @@
+ Comment[is]=Þessi rás afritar NotePad teikningar à staðbundna möppu.
+ Comment[it]=Questo conduit archivia i disegni NotePad in una cartella locale.
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ NotePad ã®çµµã‚’ãƒãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚©ãƒ«ãƒ€ã«ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã—ã¾ã™ã€‚
++Comment[ka]=ეს áƒáƒ ხი ლáƒáƒ™áƒáƒšáƒ£áƒ სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეში ინáƒáƒ®áƒáƒ•áƒ¡ NotePad-ის სáƒáƒ ეზერვრმáƒáƒœáƒáƒ®áƒáƒ–ებს
+ Comment[kk]=NotePad файлдарының Ñақтық көшірмелерін жергілікті қапшықта жаÑау арнаÑÑ‹.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž¢áž¶áž…​បម្រុង​ទុក​គំនូរ NotePad ទៅ​ážážâ€‹áž˜áž¼áž›ážŠáŸ’ឋាន ។
+ Comment[lt]=Šis kanalas padaro NotePad piešinių atsargines kopijas į vietinį aplanką.
+Index: kpilot/conduits/memofileconduit/memofile-conduit.desktop
+===================================================================
+--- kpilot/conduits/memofileconduit/memofile-conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/memofileconduit/memofile-conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,6 +23,7 @@
+ Name[is]=Minnismiðaskrá
+ Name[it]=File appunti
+ Name[ja]=メモファイル
++Name[ka]=ჩáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ
+ Name[kk]=Жазба файлы
+ Name[km]=ឯកសារ​អនុស្សរណៈ
+ Name[lt]=Memo byla
+@@ -65,6 +66,7 @@
+ Comment[is]=Þessi rás samstillir minnismiða lófatölvunnar þinnar við staðbundna möppu.
+ Comment[it]=Questo condotto sincronizza gli appunti del tuo palmare con una cartella locale.
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã®ãƒ¡ãƒ¢ã‚’ãƒãƒ¼ã‚«ãƒ«ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨åŒæœŸã•ã›ã¾ã™ã€‚
++Comment[ka]=ეს áƒáƒ ხი თქვენი პáƒáƒ ტáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის ლáƒáƒ™áƒáƒšáƒ£áƒ დირექტáƒáƒ იáƒáƒ¡áƒ—áƒáƒœ სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒáƒ¡ áƒáƒ®áƒ“ენს .
+ Comment[kk]=Қалта құрылғыдағы жазбаларды қапшықтағы файлымен қадамдаÑтыру арнаÑÑ‹.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž¢áž¶áž…​ឲ្យ​អនុស្សរណៈ​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒâ€‹ážšáž”ស់​អ្នក ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង​ážážâ€‹áž˜áž¼áž›ážŠáŸ’ឋាន ។​
+ Comment[lt]=Šis kanalas sinchronizuoja Jūsų užrašus su vietiniu aplanku.
+Index: kpilot/conduits/timeconduit/time_conduit.desktop
+===================================================================
+--- kpilot/conduits/timeconduit/time_conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/timeconduit/time_conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -24,6 +24,7 @@
+ Comment[is]=Þessi rás stillir klukku lófatölvunnar eftir klukku PC tölvunnar.
+ Comment[it]=Questo conduit imposta l'ora sul tuo palmare prendendola dall'orologio del PC
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã®æ™‚é–“ã‚’PCã®æ™‚計ã«åˆã‚ã›ã¾ã™ã€‚
++Comment[ka]=დრáƒáƒ˜áƒ¡ მითითებრკáƒáƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”რის სáƒáƒáƒ—ისთვის.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž€áŸ†ážŽážáŸ‹â€‹áž–áŸáž›ážœáŸáž›áž¶â€‹áž“ៅ​លើ​ឧបករណáŸâ€‹áž™áž½ážšážŠáŸƒâ€‹ážšáž”ស់​អ្នក ពី​នាឡិកា​កុំព្យូទáŸážšÂ ។
+ Comment[lt]=Å is kanalas nustato delninuko laikÄ… pagal PC laikÄ….
+ Comment[mk]=Овој канал го поÑтавува времето на рачниот уред Ñпоред времето на компјутерот.
+@@ -75,6 +76,7 @@
+ Name[is]=TÃma samstilling
+ Name[it]=Sincronizzazione temporale
+ Name[ja]=時間åŒæœŸ
++Name[ka]=დრáƒáƒ˜áƒ¡ სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ
+ Name[kk]=Уақытты қадамдаÑтыру
+ Name[km]=សមកាលកម្ម​ពáŸáž›ážœáŸáž›áž¶
+ Name[lt]=Laiko sinchronizavimas
+Index: kpilot/conduits/docconduit/kpalmdoc.desktop
+===================================================================
+--- kpilot/conduits/docconduit/kpalmdoc.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/docconduit/kpalmdoc.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -30,6 +30,7 @@
+ GenericName[is]=PalmDOC umbreytir
+ GenericName[it]=Convertitore PalmDOC
+ GenericName[ja]= PalmDOC コンãƒãƒ¼ã‚¿
++GenericName[ka]=კáƒáƒœáƒ•áƒ”რტáƒáƒ ი PalmDOC
+ GenericName[kk]=PalmDOC аударғышы
+ GenericName[km]=កម្មវិធី​បម្លែង PalmDOC
+ GenericName[lt]=PalmDOC konverteris
+Index: kpilot/conduits/docconduit/doc_conduit.desktop
+===================================================================
+--- kpilot/conduits/docconduit/doc_conduit.desktop.orig 2007-05-14 09:54:51.000000000 +0200
++++ kpilot/conduits/docconduit/doc_conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -21,6 +21,7 @@
+ Comment[is]=Bætir textaskrám, sem hægt er að lesa à DOC lesara, við lófatölvuna þÃna.
+ Comment[it]=Aggiunge file di testo al tuo Pilot, adatti per lettori DOC.
+ Comment[ja]=テã‚ストファイルを DOC リーダーã«é©ã—ãŸå½¢å¼ã§ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã«è¿½åŠ ã—ã¾ã™ã€‚
++Comment[ka]=უმáƒáƒ¢áƒ”ბს ტექსტურფáƒáƒ˜áƒšáƒ”ბს თქვენს პრáƒáƒ¢áƒáƒ¢áƒ˜áƒ£áƒš მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ¡, რáƒáƒ›áƒ”ლიც შესáƒáƒ¤áƒ”რისირDOC წáƒáƒ›áƒ™áƒ˜áƒ—ხáƒáƒ•áƒ”ბისთვის
+ Comment[kk]=DOC файлды оқи алатын қалта құрылғыға мәтінді көшіру.
+ Comment[km]=បន្ážáŸ‚ម​ឯកសារ​អážáŸ’ážáž”ទ​ទៅ​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒâ€‹ážšáž”ស់​អ្នក (សមស្រប​សម្រាប់​កម្មវិធី​អាន DOC) ។
+ Comment[lt]=Prideda teksto bylas prie Jūsų nešiojamos knygelės, tinka DOC skaityklėms.
+Index: kpilot/conduits/malconduit/mal_conduit.desktop
+===================================================================
+--- kpilot/conduits/malconduit/mal_conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/malconduit/mal_conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,6 +23,7 @@
+ Name[is]=MAL (AvantGo)-rás
+ Name[it]=Conduit MAL (AvantGo)
+ Name[ja]=MAL (AvantGo) コンジット
++Name[ka]=áƒáƒ ხი MAL (AvantGo)
+ Name[kk]=MAL (AvantGo) арнаÑÑ‹
+ Name[km]=បំពង់ MAL (AvantGo)
+ Name[lt]=MAL (AvantGo) kanalas
+@@ -68,6 +69,7 @@
+ Comment[is]=Samstillir AvantGo (eða venjulega innihald MAL þjóns) við lófatölvuna. Þetta gerir þér kleyft að skoða vefsÃður þegar þú ert ótengd(ur) vefnum, t.d. kvikmynda eða sjónvarpsdagskrá.
+ Comment[it]=Sincronizza AvantGo (o il contenuto di un generico server MAL) con il palmare. In questo modo potrai visualizzare le pagine web offline sul palmare come per esempio la programmazione di un cinema o una TV o qualsiasi altra pagina web.
+ Comment[ja]=AvantGo (ã¾ãŸã¯ä¸€èˆ¬ã« MAL サーãƒã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„) ã¨ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã‚’åŒæœŸã•ã›ã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã§æ˜ 画や TV 番組表ã€ãã®ä»–ã®ã‚¦ã‚§ãƒ–ページをオフラインã§é–²è¦§ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚
++Comment[ka]= AvantGo-ს სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ (ძირითáƒáƒ“áƒáƒ“ MAL სერვერების შემáƒáƒ“გენლáƒáƒ‘ით) პáƒáƒ ტáƒáƒ¢áƒ˜áƒ£áƒš მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ¡áƒ—áƒáƒœ. ეს ვებ-გვერდების áƒáƒ•áƒ¢áƒáƒœáƒáƒ›áƒ˜áƒ£áƒ რეჟიმში დáƒáƒ—ვáƒáƒšáƒ˜áƒ”რების სáƒáƒ¨áƒ£áƒáƒšáƒ”ბáƒáƒ¡ იძლევáƒ,მáƒáƒ’.: თქვენი კინრáƒáƒœ ტელე პრáƒáƒ’რáƒáƒ›áƒ, áƒáƒœ სხვრვებ-გვერდები.
+ Comment[kk]=AvantGo (немеÑе жалпы MAL Ñервердің мазмұнын) қалта құрылғымен қадамдаÑтыру арнаÑÑ‹. Бұл Ñол құрылғыда кино, ТВ кеÑтеңізді немеÑе баÑқа веб парақтарды желіге қоÑылмай көруге мүмкіндік береді.
+ Comment[km]=ធ្វើ​សមកាលកម្ម AvantGo (ជាទូទៅ​គឺ មាážáž·áž€áž¶â€‹ážšáž”ស់​ម៉ាស៊ីន​បម្រើ MAL) ទៅ​នឹង​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒÂ ។ វា​អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​មើល​ទំពáŸážšâ€‹áž”ណ្ដាញ (កាលវិភាគ​រោង​ភាពយន្ហឬ ទូរទស្សនáŸ...) នៅ​ក្រៅ​បណ្ដាញ នៅ​លើ​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒâ€‹ážšáž”ស់​អ្នក ។
+ Comment[lt]=Sinchronizuoti AvantGo (ar MAL serverio turinį apskritai) su nešiojamu įrenginiu. Tai leis jums peržiūrėti žiniatinklio puslapius nešiojamame įrenginyje, tokius kaip kino teatro ar TV programas, bei bet kokį kitą puslapį, neprisijungus prie Interneto.
+Index: kpilot/conduits/popmail/popmail-conduit.desktop
+===================================================================
+--- kpilot/conduits/popmail/popmail-conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/popmail/popmail-conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -22,6 +22,7 @@
+ Comment[is]=Sendu tölvupóst frá lófatölvunni þinni gegnum KMail.
+ Comment[it]=Invia la posta dal tuo palmare tramite KMail.
+ Comment[ja]=KMail 経由ã§ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã‹ã‚‰ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã™ã€‚
++Comment[ka]= ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ გáƒáƒ’ზáƒáƒ•áƒœáƒ პáƒáƒ ტáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘იდáƒáƒœ KMail-ის სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით.
+ Comment[kk]=Қалта құрылғының поштаÑын KMail арқылы жіберу.
+ Comment[km]=ផ្ញើ​សំបុážáŸ’រ​ទៅ​ឧបករណáŸâ€‹áž™áž½ážšážŠáŸƒâ€‹ážšáž”ស់​អ្នក​ážáž¶áž˜â€‹ážšáž™áŸˆ KMail ។
+ Comment[lt]=Siųsti paštą iš nešiojamo įrenginio per KMail.
+@@ -72,6 +73,7 @@
+ Name[is]=Póstur
+ Name[it]=Posta
+ Name[ja]=メール
++Name[ka]=ფáƒáƒ¡áƒ¢áƒ
+ Name[kk]=Пошта
+ Name[km]=សំបុážáŸ’ážš
+ Name[lt]=Paštas
+@@ -99,7 +101,8 @@
+ Name[th]=จดหมาย
+ Name[tr]=Posta
+ Name[uk]=Пошта
+-Name[uz]=Хат-хабар
++Name[uz]=Xat-xabar
++Name[uz at cyrillic]=Хат-хабар
+ Name[zh_CN]=邮件
+ Name[zh_TW]=郵件
+ Implemented=file
+Index: kpilot/conduits/knotes/knotes-conduit.desktop
+===================================================================
+--- kpilot/conduits/knotes/knotes-conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/knotes/knotes-conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -25,6 +25,7 @@
+ Comment[is]=Þessi rás samstillir lófatölvuna þÃna við KNotes.
+ Comment[it]=Questo condotto sincronizza l'applicazione Memo Pad con KNotes.
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ãƒ¡ãƒ¢å¸³ã‚¢ãƒ—リケーションを KNotes ã¨åŒæœŸã•ã›ã¾ã™ã€‚
++Comment[ka]=ეს áƒáƒ ხი áƒáƒ®áƒ“ენს Memo Pad პრáƒáƒ’რáƒáƒ›áƒ˜áƒ¡ სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒáƒ¡ KNotes-თáƒáƒœ.
+ Comment[kk]=Memo Pad қолданбаны KNotes жазбаларымен қадамдаÑтыру арнаÑÑ‹.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž¢áž¶áž…​ឲ្យ​កម្មវិធី Memo Pad ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង KNotes ។
+ Comment[lt]=Å is kanalas sinchronizuoja Memo Pad programÄ… su KNotes.
+@@ -68,6 +69,7 @@
+ Name[hu]=KNotes / memók
+ Name[is]=KNotes / minnisblöð
+ Name[it]=KNotes / Memo
++Name[ka]=KNotes / ჩáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ”ბი
+ Name[kk]=KNotes / Жазбалар
+ Name[km]=KNotes / អនុស្សរណៈ
+ Name[lt]=KNotes / Memo
+Index: kpilot/conduits/recordconduit/record-conduit.desktop
+===================================================================
+--- kpilot/conduits/recordconduit/record-conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/recordconduit/record-conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -61,6 +61,7 @@
+ Comment[is]=Þessi rás gerir ekki neitt.
+ Comment[it]=Questo conduit non fa nulla.
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯æœªçŸ¥ã§ã™ã€‚
++Comment[ka]=ეს áƒáƒ ხი áƒáƒ áƒáƒ¤áƒ”რს áƒáƒ áƒáƒ™áƒ”თებს.
+ Comment[kk]=Ештеңе Ñ–Ñтемейтін арна.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž˜áž·áž“​ធ្វើ​អ្វី​ទាំងអស់ ។
+ Comment[lt]=Å is kanalas nieko neatlieka.
+Index: kpilot/conduits/null/null-conduit.desktop
+===================================================================
+--- kpilot/conduits/null/null-conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/null/null-conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -33,6 +33,7 @@
+ Comment[is]=Þessi rás gerir ekki neitt.
+ Comment[it]=Questo conduit non fa nulla.
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯æœªçŸ¥ã§ã™ã€‚
++Comment[ka]=ეს áƒáƒ ხი áƒáƒ áƒáƒ¤áƒ”რს áƒáƒ áƒáƒ™áƒ”თებს.
+ Comment[kk]=Ештеңе Ñ–Ñтемейтін арна.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž˜áž·áž“​ធ្វើ​អ្វី​ទាំងអស់ ។
+ Comment[lt]=Å is kanalas nieko neatlieka.
+Index: kpilot/conduits/vcalconduit/todo-conduit.desktop
+===================================================================
+--- kpilot/conduits/vcalconduit/todo-conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/vcalconduit/todo-conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -25,6 +25,7 @@
+ Comment[is]=Þessi rás samstillir verkþáttalista lófatölvunnar þinnar og KOrganizer.
+ Comment[it]=Questo condotto sincronizza il tuo Pilot con la lista delle cose da fare di KOrganizer.
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã® To-Do 㨠KOrganizer ã‚’åŒæœŸã•ã›ã¾ã™ã€‚
++Comment[ka]=áƒáƒ›áƒáƒªáƒáƒœáƒáƒ—რსიების სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ KOrganizer-ისთვის.
+ Comment[kk]=Қалта құрылғыдағы жоÑпар тізімін KOrganizer-мен қадамдаÑтыру арнаÑÑ‹.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž’្វើ​សមកាលកម្ម​បញ្ជី​ការងារ​ážáŸ’រូវ​ធ្វើ​ពី​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒâ€‹ážšáž”ស់​អ្នកទៅ KOrganizer ។
+ Comment[lt]=Šis kanalas sinchronizuoja Jūsų darbų sąrašą iš delninuko su su KOrganizer sąrašu.
+@@ -76,6 +77,7 @@
+ Name[is]=Verkþáttalistar (KOrganizer)
+ Name[it]=Cose da fare (KOrganizer)
+ Name[ja]=To-Do (KOrganizer)
++Name[ka]=áƒáƒ›áƒáƒªáƒáƒœáƒ”ბი (KOrganizer)
+ Name[kk]=ЖоÑпарлар (KOrganizer)
+ Name[km]=ការងារ​ážáŸ’រូវ​ធ្វើ (KOrganizer)
+ Name[lt]=Darbai (KOrganizer)
+Index: kpilot/conduits/vcalconduit/vcal-conduit.desktop
+===================================================================
+--- kpilot/conduits/vcalconduit/vcal-conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/vcalconduit/vcal-conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -28,6 +28,7 @@
+ Name[is]=Dagbók (KOrganizer)
+ Name[it]=Calendario (KOrganizer)
+ Name[ja]=カレンダー (KOrganizer)
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი (KOrganizer)
+ Name[kk]=Күнтізбе (KOrganizer)
+ Name[km]=ប្រážáž·áž‘áž·áž“ (KOrganizer)
+ Name[lt]=Kalendorius (KOrganizer)
+@@ -76,6 +77,7 @@
+ Comment[is]=Þessi rás samstillir lófatölvuna þÃna við dagbók KOrganizer.
+ Comment[it]=Questo conduit sincronizza il tuo palmare con il calendario di KOrganizer.
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã‚’ KOrganizer ã®æ‰‹å¸³ã¨åŒæœŸã•ã›ã¾ã™ã€‚
++Comment[ka]=სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ KOrganizer-ისთვის.
+ Comment[kk]=Қалта құрылғыдағы күнтізбені KOrganizer-мен қадамдаÑтыру арнаÑÑ‹.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž’្វើ​សមកាលកម្ម​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒâ€‹ážšáž”ស់​អ្នក​ជាមួយ​នឹង​សៀវភៅ​កាលបរិច្ឆáŸáž‘ KOrganizer ។
+ Comment[lt]=Šis kanalas sinchronizuoja jūsų delninuką su KOrganizer datų knyga.
+Index: kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop
+===================================================================
+--- kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -25,6 +25,7 @@
+ Comment[is]=Þessi rás samstillir póstfangaskrár KDE og lófatölvunnar
+ Comment[it]=Questo condotto sincronizza il tuo palmare con la rubrica indirizzi di KDE
+ Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ã‚’KDEã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ã¨åŒæœŸã•ã›ã¾ã™ã€‚
++Comment[ka]=ეს áƒáƒ ხი KDE-ს წიგნáƒáƒ™áƒ˜áƒ¡ სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒáƒ¡ áƒáƒ®áƒ“ენს პáƒáƒ ტáƒáƒ¢áƒ˜áƒ£áƒš წიგნáƒáƒ™áƒ—áƒáƒœ.
+ Comment[kk]=Қалта құрылғыдағы адреÑтік кітапшамен KDE-нің адреÑтік кітапшаларды қадамдаÑтыру арнаÑÑ‹.
+ Comment[km]=បំពង់​នáŸáŸ‡â€‹áž¢áž¶áž…​ឲ្យ​សៀវភៅ​អាសយដ្ឋាន​របស់​ឧបករណáŸâ€‹áž™áž½ážšážŠáŸƒ ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង​សៀវភៅ​អាសយដ្ឋាន​របស់ KDE
+ Comment[lt]=Šis kanalas sinchronizuoja nešiojamą adresų knygelę su KDE adresų knygele.
+@@ -81,6 +82,7 @@
+ Name[is]=Póstfangaskrá
+ Name[it]=Rubrica degli indirizzi
+ Name[ja]=アドレス帳
++Name[ka]=წიგნáƒáƒ™áƒ˜
+ Name[kk]=ÐдреÑтік кітапшаÑÑ‹
+ Name[km]=សៀវភៅ​អាសយដ្ឋាន
+ Name[lt]=Adresų knygelė
+@@ -106,7 +108,8 @@
+ Name[tg]=Китоби адреÑÓ£
+ Name[tr]=Adresdefteri
+ Name[uk]=ÐдреÑна книга
+-Name[uz]=Манзиллар дафтари
++Name[uz]=Manzillar daftari
++Name[uz at cyrillic]=Манзиллар дафтари
+ Name[zh_CN]=地å€ç°¿
+ Name[zh_TW]=通訊錄
+ Implemented=file
+Index: kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc
+===================================================================
+--- kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc 2008-06-29 20:10:37.000000000 +0200
+@@ -1582,11 +1582,12 @@
+ {
+ backupAddrCategoryLabel = fAddressAppInfo->categoryName(backupAddr->category());
+ }
++ int category = palmAddr ? palmAddr->category() : 0;
+ tab->append(new ResolutionItem(
+ i18n("Category"),
+ tab->fExistItems,
+ !pcAddr.isEmpty() ?
+- KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo,palmAddr->category()) :
++ KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) :
+ QString::null,
+ palmAddrCategoryLabel,
+ backupAddrCategoryLabel));
+Index: kpilot/kpilot/kpilot_config.desktop
+===================================================================
+--- kpilot/kpilot/kpilot_config.desktop.orig 2008-02-13 10:39:51.000000000 +0100
++++ kpilot/kpilot/kpilot_config.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -37,6 +37,7 @@
+ Name[is]=KPilot stillingar
+ Name[it]=Configurazione KPilot
+ Name[ja]=KPilot ã®è¨å®š
++Name[ka]=KPilot კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Name[kk]=KPilot параметрлері
+ Name[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ KPilot
+ Name[lt]=Kpilot konfigūracija
+@@ -87,6 +88,7 @@
+ Comment[is]=Aðalstillingar KPilot
+ Comment[it]=Configurazione principale di KPilot
+ Comment[ja]=KPilot 主è¦è¨å®š
++Comment[ka]=KPilot ძირითáƒáƒ“ი კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KPilot негізгі параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​សំážáž¶áž“់ៗ​របស់ KPilot
+ Comment[lt]=KPilot bendrasis konfigūravimas
+@@ -133,6 +135,7 @@
+ Keywords[is]=kpilot,aðal
+ Keywords[it]=kpilot,principale
+ Keywords[ja]=kpilot,主è¦
++Keywords[ka]=kpilot,ძირითáƒáƒ“ი
+ Keywords[km]=kpilot,សំážáž¶áž“់
+ Keywords[lt]=kpilot,main,pagrindinis
+ Keywords[mk]=kpilot,main.кпилот,главно
+Index: kpilot/kpilot/kpilot.desktop
+===================================================================
+--- kpilot/kpilot/kpilot.desktop.orig 2007-10-08 11:50:51.000000000 +0200
++++ kpilot/kpilot/kpilot.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -43,6 +43,7 @@
+ GenericName[is]=PalmPilot tól
+ GenericName[it]=Strumento per PalmPilot
+ GenericName[ja]=PalmPilot ツール
++GenericName[ka]=Palm Pilot ხელსáƒáƒ¬áƒ§áƒ
+ GenericName[kk]=PalmPilot құрылғыÑÑ‹
+ GenericName[km]=ឧបករណ០PalmPilot
+ GenericName[lt]=PalmPilot įrankis
+Index: kpilot/kpilot/kpilotconduit.desktop
+===================================================================
+--- kpilot/kpilot/kpilotconduit.desktop.orig 2007-05-14 09:54:52.000000000 +0200
++++ kpilot/kpilot/kpilotconduit.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -29,6 +29,7 @@
+ Comment[is]=KPilot rásir
+ Comment[it]=Conduit KPilot
+ Comment[ja]=KPilot コンジット
++Comment[ka]=áƒáƒ ხი KPilot
+ Comment[kk]=KPilot арнаÑÑ‹
+ Comment[km]=បំពង់ KPilot
+ Comment[lt]=KPilot kanalas
+Index: kpilot/kpilot/kpilotdaemon.desktop
+===================================================================
+--- kpilot/kpilot/kpilotdaemon.desktop.orig 2007-10-08 11:50:51.000000000 +0200
++++ kpilot/kpilot/kpilotdaemon.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -16,6 +16,7 @@
+ Name[is]=KPilot þjónn
+ Name[it]=Demone KPilot
+ Name[ja]=KPilot デーモン
++Name[ka]=KPilot-ის დემáƒáƒœáƒ˜
+ Name[lt]=KPilot tarnyba
+ Name[lv]=KPilotDÄ“mons
+ Name[ms]=Daemon KPilot
+Index: kpilot/tests/mergecalendars.cc
+===================================================================
+--- kpilot/tests/mergecalendars.cc.orig 2007-05-14 09:54:52.000000000 +0200
++++ kpilot/tests/mergecalendars.cc 2008-06-29 20:10:37.000000000 +0200
+@@ -35,10 +35,13 @@
+ #include <libkcal/calendar.h>
+ #include <libkcal/calendarlocal.h>
+
++#include "options.h"
++
+ static const KCmdLineOptions options[] =
+ {
+ {"korgfile <path>","KOrganizer master file", 0},
+ {"newfile <path>","Calendar file to merge into korganizer", 0},
++ {"category <string>","Category to remove from 'korgfile' and to add to events in 'newfile' for synch purposes", 0},
+ {"verbose", "Verbose debugging", 0},
+ KCmdLineLastOption
+ };
+@@ -62,16 +65,21 @@
+
+ QString korgfile = args->getOption("korgfile");
+ QString newfile = args->getOption("newfile");
++ QString category = args->getOption("category");
+
+ if (korgfile.isEmpty())
+ {
+- kdError() << "! Must provide a korganizer file." << endl;
++ WARNINGKPILOT << "! Must provide a korganizer file." << endl;
+ }
+ if (newfile.isEmpty())
+ {
+- kdError() << "! Must provide a newfile file." << endl;
++ WARNINGKPILOT << "! Must provide a newfile file." << endl;
++ }
++ if (category.isEmpty())
++ {
++ WARNINGKPILOT << "! Must provide a category to use." << endl;
+ }
+- if (korgfile.isEmpty() || newfile.isEmpty())
++ if (korgfile.isEmpty() || newfile.isEmpty() || category.isEmpty())
+ {
+ return 1;
+ }
+@@ -79,37 +87,36 @@
+ QString korgsave = QString("%1.updated").arg(korgfile);
+ QString newfilesave = QString("%1.updated").arg(newfile);
+
+- kdDebug() << "Using korgfile: [" << korgfile
++ DEBUGKPILOT << "Using korgfile: [" << korgfile
+ << "]" << endl;
+- kdDebug() << "Using newfile: [" << newfile
++ DEBUGKPILOT << "Using newfile: [" << newfile
+ << "]" << endl;
+- kdDebug() << "Will save korgfile to: [" << korgsave
++ DEBUGKPILOT << "Will save korgfile to: [" << korgsave
+ << "]" << endl;
+- kdDebug() << "Will save newfile to: [" << newfilesave
++ DEBUGKPILOT << "Will save newfile to: [" << newfilesave
+ << "]" << endl << endl;
+
+ KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( QString::fromLatin1("UTC") );
+ KCal::CalendarLocal *calnew = new KCal::CalendarLocal( QString::fromLatin1("UTC") );
+ if (!calkorg || !calnew)
+ {
+- kdError() << "Unable to create base calendar objects." << endl;
++ WARNINGKPILOT << "Unable to create base calendar objects." << endl;
+ return 1;
+ }
+
+ if (!calkorg->load(korgfile) || !calnew->load(newfile))
+ {
+- kdError() << "Unable to load calendar files." << endl;
++ WARNINGKPILOT << "Unable to load calendar files." << endl;
+ return 1;
+ }
+
+ int numkorgstart = calkorg->incidences().count();
+ int numnewstart = calnew->incidences().count();
+
+- kdDebug() << " - Opened korganizer calendar with: ["
++ DEBUGKPILOT << " - Opened korganizer calendar with: ["
+ << numkorgstart << "] incidences." << endl;
+- kdDebug() << " - Opened newfile calendar with: ["
++ DEBUGKPILOT << " - Opened newfile calendar with: ["
+ << numnewstart << "] incidences." << endl;
+-
+
+ KCal::Event::List korgEvents;
+ KCal::Event::List::ConstIterator korgIt;
+@@ -121,7 +128,7 @@
+ newEvents = calnew->events();
+ newEvents.setAutoDelete(false);
+
+- kdDebug() << "Looking for previous pilot ids for exchange events..." << endl;
++ DEBUGKPILOT << "Looking for previous pilot ids for exchange events..." << endl;
+
+ // iterate through all events and try to find a korganizer event
+ // that matches up with this external event's UID
+@@ -132,7 +139,7 @@
+ ev = *newIt;
+ QString uid = ev->uid();
+ if (debug_level)
+- kdDebug() << " - Looking at event: ["
++ DEBUGKPILOT << " - Looking at event: ["
+ << ev->summary() << "], uid: ["
+ << uid << "]" << endl;
+
+@@ -142,7 +149,7 @@
+ unsigned long pilotId = evkorg->pilotId();
+
+ if (debug_level)
+- kdDebug() << "Found korg event for uid: ["
++ DEBUGKPILOT << "Found korg event for uid: ["
+ << uid << "], pilotId: ["
+ << pilotId << "]" << endl;
+
+@@ -153,15 +160,15 @@
+ }
+ }
+
+- kdDebug() << "Matched: [" << numkorgpilotids << "] events."<< endl;
++ DEBUGKPILOT << "Matched: [" << numkorgpilotids << "] events."<< endl;
+
+- kdDebug() << "Now searching for previous WorkXChange events in korganizer's calendar." << endl;
++ DEBUGKPILOT << "Now searching for previous events of category: [" << category << "] in korganizer's calendar." << endl;
+
+ // iterate through all events and try to find a korganizer event
+ // that matches up with this external event's UID
+ unsigned int numkorgremoved = 0;
+
+- QString categoryToken = QString("WorkXChange");
++ QString categoryToken = category;
+
+ // careful iterating and removing...
+ KCal::Event *next = 0;
+@@ -169,7 +176,7 @@
+ korgIt = korgEvents.begin();
+ for ( ev = *korgIt; ev != 0; ev = next )
+ {
+- if (++korgIt == korgEvents.end())
++ if (++korgIt == korgEvents.end())
+ {
+ next = 0;
+ }
+@@ -181,7 +188,7 @@
+ if (ev->categoriesStr().contains(categoryToken))
+ {
+ if (debug_level)
+- kdDebug() << " - Found matching event: ["
++ DEBUGKPILOT << " - Found matching event: ["
+ << ev->summary() << "], uid: ["
+ << ev->uid() << "]. Removing." << endl;
+
+@@ -192,27 +199,28 @@
+ }
+ }
+
+- kdDebug() << " - Found: [" << numkorgremoved
++ DEBUGKPILOT << " - Found: [" << numkorgremoved
+ << "] prior: [" << categoryToken
+ << "] category events." << endl;
+
+- kdDebug() << "Merging new events into korganizer calendar..."
++ DEBUGKPILOT << "Merging new events into korganizer calendar..."
+ << endl;
+
+ for (newIt = newEvents.begin(); newIt != newEvents.end(); ++newIt )
+ {
+ ev = *newIt;
++ ev->setCategories(category);
+ korgEvents.append(ev);
+ calkorg->addEvent(ev);
+ }
+
+- kdDebug() << "Ended up with: [" << korgEvents.count()
++ DEBUGKPILOT << "Ended up with: [" << korgEvents.count()
+ << "] events in korganizer calendar." << endl;
+
+- kdDebug() << "Saving updated korganizer file..." << endl;
++ DEBUGKPILOT << "Saving updated korganizer file..." << endl;
+ calkorg->save(korgsave);
+
+- kdDebug() << "Saving updated newfile file..." << endl;
++ DEBUGKPILOT << "Saving updated newfile file..." << endl;
+ calnew->save(newfilesave);
+
+ return 0;
+Index: kpilot/lib/options.h
+===================================================================
+--- kpilot/lib/options.h.orig 2008-02-13 10:39:52.000000000 +0100
++++ kpilot/lib/options.h 2008-06-29 20:10:37.000000000 +0200
+@@ -140,7 +140,7 @@
+ #define FUNCTIONSETUPL(a) const int fname = a; Q_UNUSED(fname);
+ #endif
+
+-#define KPILOT_VERSION "4.9.3-359 (palo alto)"
++#define KPILOT_VERSION "4.9.4-3510 (elsewhere)"
+
+
+ // Function to expand newlines in rich text to <br>\n
+Index: kpilot/lib/pilotLocalDatabase.cc
+===================================================================
+--- kpilot/lib/pilotLocalDatabase.cc.orig 2007-05-14 09:54:52.000000000 +0200
++++ kpilot/lib/pilotLocalDatabase.cc 2008-06-29 20:10:37.000000000 +0200
+@@ -746,7 +746,7 @@
+ return false;
+ }
+
+- const char * fileName = QFile::encodeName( path );
++ QCString fileName = QFile::encodeName( path );
+ f = pi_file_open( fileName );
+ if (!f)
+ {
+Index: knotes/local.desktop
+===================================================================
+--- knotes/local.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ knotes/local.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=Minnismiðar à staðbundinni skrá
+ Name[it]=Note in file locale
+ Name[ja]=ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ¡ãƒ¢
++Name[ka]=ჩáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ”ბი ლáƒáƒ™áƒáƒšáƒ£áƒ ფáƒáƒ˜áƒšáƒ¨áƒ˜
+ Name[kk]=Жергілікті файлдағы жазбалар
+ Name[km]=ចំណាំ​ក្នុង​ឯកសារ​មូលដ្ឋាន
+ Name[lt]=Užrašai vietinėje byloje
+Index: knotes/knotes_manager.desktop
+===================================================================
+--- knotes/knotes_manager.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ knotes/knotes_manager.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -28,6 +28,7 @@
+ Name[is]=Minnismiðar
+ Name[it]=Note
+ Name[ja]=メモ
++Name[ka]=ჩáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ”ბი
+ Name[kk]=Жазбалар
+ Name[km]=ចំណាំ
+ Name[lt]=Užrašai
+@@ -53,7 +54,8 @@
+ Name[th]=บันทึà¸à¸Šà¹ˆà¸§à¸¢à¸ˆà¸³
+ Name[tr]=Notlar
+ Name[uk]=Примітки
+-Name[uz]=Ðзма хотира
++Name[uz]=Yozma xotira
++Name[uz at cyrillic]=Ðзма хотира
+ Name[zh_CN]=便笺
+ Name[zh_TW]=備忘錄
+ Type=Service
+Index: knotes/knotes.desktop
+===================================================================
+--- knotes/knotes.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ knotes/knotes.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -33,6 +33,7 @@
+ GenericName[is]=Litlir gulir miðar
+ GenericName[it]=Note a comparsa
+ GenericName[ja]=ãƒãƒƒãƒ—アップメモ
++GenericName[ka]=მáƒáƒ¢áƒ˜áƒ•áƒ¢áƒ˜áƒ•áƒ” შენიშვნები
+ GenericName[kk]=Қалқымалы жазбалар
+ GenericName[km]=ចំណាំ​លáŸáž…ឡើង
+ GenericName[lt]=Pastabos lapeliuose
+Index: kontact/plugins/akregator/akregatorplugin.desktop
+===================================================================
+--- kontact/plugins/akregator/akregatorplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/akregator/akregatorplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -21,13 +21,18 @@
+ Comment[de]=News-Leser (Akregator-Modul)
+ Comment[el]=Συστατικό ανάγνωσης Ïοών (Î Ïόσθετο του Akregator)
+ Comment[et]=Uudistevoogude plugin (Akregator)
++Comment[fr]=Composant du lecteur de flux (Module pour Akregator)
+ Comment[it]=Componente lettore fonti (plugin Akregator)
+ Comment[ja]=フィードリーダーコンãƒãƒ¼ãƒãƒ³ãƒˆ (Akregator プラグイン)
++Comment[km]=មមាសភាគ​កម្មវិធី​អាន​មážáž·áž–áŸážáŸŒáž˜áž¶áž“ (កម្មវិធី​ជំនួយ Akregator​)
+ Comment[nds]=Stroomleser-Komponent (Akregator-Moduul)
+ Comment[nl]=Component om feeds te lezen (Akregator-plugin)
++Comment[pl]=Składnik do czytania kanałów RSS (wtyczka Akregator)
++Comment[ru]=ПроÑмотр лент новоÑтей (модуль Akregator)
+ Comment[sr]=Компонента читања довода (прикључак Akregator-а)
+ Comment[sr at Latn]=Komponenta Äitanja dovoda (prikljuÄak Akregator-a)
+ Comment[sv]=Komponent för läsning av kanaler (Akregator-insticksprogram)
++Comment[tr]=Kaynak Okuyucu BileÅŸeni (Akregator Eklentisi)
+ Comment[zh_CN]=æ–°é—»æºé˜…读器组件(Akregator æ’件)
+ Comment[zh_TW]=Feed 閱讀器組件（Akregator 外掛程å¼ï¼‰
+ Name=Feeds
+@@ -53,6 +58,7 @@
+ Name[is]=Fréttastraumar
+ Name[it]=Fonti
+ Name[ja]=フィード
++Name[ka]=კვებáƒ
+ Name[kk]=Ðқпарлар
+ Name[km]=មážáž·áž–áŸážáŸŒáž˜áž¶áž“
+ Name[lt]=Kanalai
+@@ -73,6 +79,7 @@
+ Name[ta]=உளà¯à®³à¯€à®Ÿà¯à®•à®³à¯
+ Name[tr]=Haberler
+ Name[uk]=Подачі
+-Name[uz]=Янгиликлар таÑмалари
++Name[uz]=Yangiliklar tasmalari
++Name[uz at cyrillic]=Янгиликлар таÑмалари
+ Name[zh_CN]=ç§å
+
+Index: kontact/plugins/akregator/akregatorplugin3.2.desktop
+===================================================================
+--- kontact/plugins/akregator/akregatorplugin3.2.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/akregator/akregatorplugin3.2.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -36,6 +36,7 @@
+ Comment[is]=Akregator Ãforrit
+ Comment[it]=Plugin aKregator
+ Comment[ja]=Akregator プラグイン
++Comment[ka]=Akregator-ის მáƒáƒ“ული
+ Comment[kk]=Akregator модулі
+ Comment[km]=កម្មវិធី​ជំនួយ Akregator
+ Comment[lt]=Akregator priedas
+@@ -58,7 +59,8 @@
+ Comment[ta]=Akregator சொரà¯à®•à¯à®ªà¯à®ªà¯Šà®°à¯à®³à¯
+ Comment[tr]=Akregator Eklentisi
+ Comment[uk]=Втулок Akregator
+-Comment[uz]=Akregator плагини
++Comment[uz]=Akregator plagini
++Comment[uz at cyrillic]=Akregator плагини
+ Comment[zh_CN]=Akregator æ’件
+ Comment[zh_TW]=Akregator 外掛程å¼
+ Name=Feeds
+@@ -84,6 +86,7 @@
+ Name[is]=Fréttastraumar
+ Name[it]=Fonti
+ Name[ja]=フィード
++Name[ka]=კვებáƒ
+ Name[kk]=Ðқпарлар
+ Name[km]=មážáž·áž–áŸážáŸŒáž˜áž¶áž“
+ Name[lt]=Kanalai
+@@ -104,6 +107,7 @@
+ Name[ta]=உளà¯à®³à¯€à®Ÿà¯à®•à®³à¯
+ Name[tr]=Haberler
+ Name[uk]=Подачі
+-Name[uz]=Янгиликлар таÑмалари
++Name[uz]=Yangiliklar tasmalari
++Name[uz at cyrillic]=Янгиликлар таÑмалари
+ Name[zh_CN]=ç§å
+
+Index: kontact/plugins/test/kptestplugin.desktop
+===================================================================
+--- kontact/plugins/test/kptestplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/test/kptestplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -36,6 +36,7 @@
+ Comment[is]=Kontact prufu Ãforrit
+ Comment[it]=Plugin test Kontact
+ Comment[ja]=Kontact テストプラグイン
++Comment[ka]=Kontact სáƒáƒ¢áƒ”სტრმáƒáƒ“ული
+ Comment[kk]=Сынақ модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ការ​សាកល្បង​ក្នុង Kontact
+ Comment[lt]=Kontact bandymo priedas
+@@ -60,7 +61,8 @@
+ Comment[tg]=Модули матнии Kontact
+ Comment[tr]=Kontact Test Eklentisi
+ Comment[uk]=ТеÑтовий втулок Kontact
+-Comment[uz]=Kontact учун Ñинаш плагини
++Comment[uz]=Kontact uchun sinash plagini
++Comment[uz at cyrillic]=Kontact учун Ñинаш плагини
+ Comment[zh_CN]=Kontact Test æ’件
+ Comment[zh_TW]=Kontact 測試外掛程å¼
+ Name=TestPlugin
+@@ -82,6 +84,7 @@
+ Name[is]=Prufu Ãforrit
+ Name[it]=Plugin Test
+ Name[ja]=テストプラグイン
++Name[ka]=სáƒáƒ¢áƒ”სტრმáƒáƒ“ული
+ Name[kk]=Сынақ модулі
+ Name[km]=កម្មវិធី​ជំនួយ​ការ​សាកល្បង
+ Name[mk]=Приклучок за теÑÑ‚
+Index: kontact/plugins/weather/weatherplugin.desktop
+===================================================================
+--- kontact/plugins/weather/weatherplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/weather/weatherplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,13 +23,17 @@
+ Comment[de]=Wetter-Komponente für Kontact
+ Comment[el]=Συστατικό καιÏÎ¿Ï Ï„Î¿Ï… Kontact
+ Comment[et]=Kontacti ilmaplugin
++Comment[fr]=Composant météo pour Kontact
+ Comment[it]=Componente meteorologico di Kontact
+ Comment[ja]=Kontact æ°—è±¡æƒ…å ±ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆ
+ Comment[nds]=Kontact-Wederkomponent
+ Comment[nl]=Kontact Weercomponent
++Comment[pl]=Składnik Kontaktu wiadomości o pogodzie
++Comment[ru]=Компонент информации о погоде Ð´Ð»Ñ Kontact
+ Comment[sr]=Компонента времена за Kontact
+ Comment[sr at Latn]=Komponenta vremena za Kontact
+ Comment[sv]=Kontacts väderkomponent
++Comment[tr]=Kontact Hava Durumu BileÅŸeni
+ Comment[zh_CN]=Kontact 天气æ’件
+ Comment[zh_TW]=Kontact 天氣組件
+ Name=Weather Service
+@@ -58,6 +62,7 @@
+ Name[is]=Veðurþjónusta
+ Name[it]=Servizio meteorologico
+ Name[ja]=気象サービス
++Name[ka]=áƒáƒ›áƒ˜áƒœáƒ“ის მáƒáƒ›áƒ¡áƒáƒ®áƒ£áƒ ებáƒ
+ Name[kk]=Ðуа райы қызметі
+ Name[km]=សáŸážœáž¶â€‹áž¢áž¶áž€áž¶ážŸáž’ាážáž»
+ Name[lt]=Orų tarnyba
+@@ -79,6 +84,7 @@
+ Name[th]=รายงานà¸à¸²à¸à¸²à¸¨
+ Name[tr]=Hava Durumu Servisi
+ Name[uk]=Служба погоди
+-Name[uz]=Об-ҳаво хизмати
++Name[uz]=Ob-havo xizmati
++Name[uz at cyrillic]=Об-ҳаво хизмати
+ Name[zh_CN]=天气æœåŠ¡
+ Name[zh_TW]=天氣æœå‹™
+Index: kontact/plugins/knode/knodeplugin.desktop
+===================================================================
+--- kontact/plugins/knode/knodeplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/knode/knodeplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -21,13 +21,17 @@
+ Comment[de]=News-Komponente (KNode-Modul)
+ Comment[el]=Συστατικό ανάγνωσης νÎων (Î Ïόσθετο του KNode)
+ Comment[et]=Uudistelugeja plugin (KNode)
++Comment[fr]=Composant de lecteur de nouvelles (Module pour KNode)
+ Comment[it]=Componente lettore di news (plugin KNode)
+ Comment[ja]=ニュースリーダーコンãƒãƒ¼ãƒãƒ³ãƒˆ (KNode プラグイン)
+ Comment[nds]=Narichtenkieker-Komponent (KNode-Moduul)
+ Comment[nl]=Nieuwscomponent (KNode-plugin)
++Comment[pl]=Składnik wiadomości (wtyczka KNode)
++Comment[ru]=ÐовоÑти (модуль KNode)
+ Comment[sr]=Компонента веÑти (прикључак KNode-а)
+ Comment[sr at Latn]=Komponenta vesti (prikljuÄak KNode-a)
+ Comment[sv]=Komponent för läsning av diskussionsgrupper (Knode-insticksprogram)
++Comment[tr]=Haber Okuyucu BileÅŸeni (KNode Eklentisi)
+ Comment[zh_CN]=新闻组阅读器组件(KNode æ’件)
+ Comment[zh_TW]=æ–°èžé–±è®€å™¨çµ„件（KNode 外掛程å¼ï¼‰
+ Name=News
+@@ -58,6 +62,7 @@
+ Name[hu]=HÃrek
+ Name[is]=Fréttir
+ Name[ja]=ニュース
++Name[ka]=სიáƒáƒ®áƒšáƒ”ები
+ Name[kk]=Жаңалықтар
+ Name[km]=áž–áŸážáŸŒáž˜áž¶áž“
+ Name[lt]=Naujienos
+@@ -85,6 +90,7 @@
+ Name[th]=ข่าว
+ Name[tr]=Haberler
+ Name[uk]=Ðовини
+-Name[uz]=Янгиликлар
++Name[uz]=Yangiliklar
++Name[uz at cyrillic]=Янгиликлар
+ Name[zh_CN]=æ–°é—»
+ Name[zh_TW]=æ–°èž
+Index: kontact/plugins/specialdates/kcmsdsummary.desktop
+===================================================================
+--- kontact/plugins/specialdates/kcmsdsummary.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/specialdates/kcmsdsummary.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -18,13 +18,17 @@
+ Name[de]=Übersicht über besondere Termine
+ Name[el]=Επισκόπηση σημαντικών ημεÏομηνιών
+ Name[et]=Tähtpäevade ülevaade
++Name[fr]=Aperçu des dates importantes
+ Name[it]=Panoramica delle date speciali
+ Name[ja]=特別ãªæ—¥ã®è¦ç´„
+ Name[nds]=Översicht besünner Daten
+ Name[nl]=Overzicht van speciale data
++Name[pl]=Daty specjalne
++Name[ru]=Сводка оÑобых дат
+ Name[sr]=Преглед поÑебних датума
+ Name[sr at Latn]=Pregled posebnih datuma
+ Name[sv]=Översikt av speciella datum
++Name[tr]=Özel Tarihlere Genel Bakış
+ Name[zh_CN]=特殊日期概览
+ Name[zh_TW]=特殊日期概觀
+ Comment=Special Dates Summary Setup
+@@ -48,6 +52,7 @@
+ Comment[is]=Yfirlitsuppsetning sérstakra daga
+ Comment[it]=Impostazioni per le date speciali
+ Comment[ja]=特別ãªæ—¥ã®è¦ç´„è¨å®š
++Comment[ka]=გáƒáƒœáƒ¡áƒáƒ™áƒ£áƒ—რებულ თáƒáƒ იღთრდáƒáƒ˜áƒ¯áƒ”სტის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=Ерекше күндер тұжырымының баптауы
+ Comment[km]=រៀបចំ​សáŸáž…ក្ដី​សង្ážáŸáž”​ážáŸ’ងៃ​ពិសáŸážŸ
+ Comment[lt]=Ypatingų datų santraukos sąranka
+@@ -94,6 +99,7 @@
+ Keywords[is]=afmæli, frÃdagar, stillingar, stilla
+ Keywords[it]=compleanno, anniversario, vacanze, configura, impostazioni
+ Keywords[ja]=誕生日,記念日,休日,è¨å®š,è¨å®š
++Keywords[ka]=დáƒáƒ‘áƒáƒ“ების დღე,სáƒáƒ®áƒ”ლáƒáƒ‘ის დღე,დáƒáƒ¡áƒ•áƒ”ნების დღე,კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ,პáƒáƒ áƒáƒ›áƒ”ტრები
+ Keywords[km]=ážáŸ’ងៃ​ážáž½áž”​កំណើáž,បុណ្យ​ážáž½áž”,វិស្សមកាល,កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ,ការ​កំណážáŸ‹
+ Keywords[lt]=birthday, anniversary, holiday, configure, settings, konfigūruoti, nustatymai, gimtadieniai, išeiginės,sukaktys
+ Keywords[mk]=birthday, anniversary, holiday, configure, settings, роденден, годишнина, конфигурирање, конфигурација, поÑтавувања
+Index: kontact/plugins/specialdates/specialdatesplugin.desktop
+===================================================================
+--- kontact/plugins/specialdates/specialdatesplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/specialdates/specialdatesplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -30,7 +30,7 @@
+ Name[eu]=Data bereziak
+ Name[fa]=تاریخهای ویژه
+ Name[fi]=Erikoispäivät
+-Name[fr]=Dates particulières
++Name[fr]=Dates importantes
+ Name[fy]=Spesjale datums
+ Name[ga]=Dátaà Speisialta
+ Name[gl]=Datas Especiais
+@@ -39,6 +39,7 @@
+ Name[is]=Sérstakir dagar
+ Name[it]=Date speciali
+ Name[ja]=特別ãªæ—¥
++Name[ka]=გáƒáƒœáƒ¡áƒáƒ™áƒ£áƒ¢áƒ ებული თáƒáƒ იღები
+ Name[kk]=Ерекше күндер
+ Name[km]=ážáŸ’ងៃ​ពិសáŸážŸ
+ Name[lt]=Ypatingos datos
+@@ -62,7 +63,8 @@
+ Name[th]=วันพิเศษ
+ Name[tr]=Özel Tarihler
+ Name[uk]=ОÑобливі дати
+-Name[uz]=МахÑÑƒÑ ÐºÑƒÐ½Ð»Ð°Ñ€
++Name[uz]=Maxsus kunlar
++Name[uz at cyrillic]=МахÑÑƒÑ ÐºÑƒÐ½Ð»Ð°Ñ€
+ Name[zh_CN]=特殊日期
+ Name[zh_TW]=特殊日期
+ Comment=Special Dates Component
+@@ -72,12 +74,16 @@
+ Comment[de]=Komponente für Übersicht über besondere Termine
+ Comment[el]=Συστατικό σημαντικών ημεÏομηνιών
+ Comment[et]=Tähtpäevade plugin
++Comment[fr]=Composant des dates importantes
+ Comment[it]=Componente per le date speciali
+ Comment[ja]=特別ãªæ—¥ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆ
+ Comment[nds]=Komponent för besünner Daten
+ Comment[nl]=Component voor overzicht van speciale data
++Comment[pl]=Składnik dat specjalnych
++Comment[ru]=ОÑобые даты
+ Comment[sr]=Компонента поÑебних датума
+ Comment[sr at Latn]=Komponenta posebnih datuma
+ Comment[sv]=Speciella datumkomponent
++Comment[tr]=Özel Tarihler Bileşeni
+ Comment[zh_CN]=特殊日期组件
+ Comment[zh_TW]=特殊日期組件
+Index: kontact/plugins/kitchensync/kitchensync.desktop
+===================================================================
+--- kontact/plugins/kitchensync/kitchensync.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/kitchensync/kitchensync.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -20,13 +20,18 @@
+ Comment[de]=Abgleich-Komponente (KitchenSync-Modul)
+ Comment[el]=Συστατικό συγχÏÎ¿Î½Î¹ÏƒÎ¼Î¿Ï (Î Ïόσθετο του Kitchensynk)
+ Comment[et]=Sünkroniseerimise plugin (KitchenSync)
++Comment[fr]=Composant de synchronisation (Module KitchenSync)
+ Comment[it]=Componente di sincronizzazione (plugin KitchenSync)
+ Comment[ja]=åŒæœŸã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆ (KitchenSync プラグイン)
++Comment[km]=ការ​ធ្វើ​សមកាលកម្ម​សមាសភាគ (កម្មវិធី​ជំនួយ Kitchensynk​)
+ Comment[nds]=Synkroniseer-Komponent (Kitchensynk-Moduul)
+ Comment[nl]=Synchronisatiecomponent (Kitchensynk-plugin)
++Comment[pl]=Składnik synchronizacji (wtyczka KitchenSync)
++Comment[ru]=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ (модуль KitchenSync)
+ Comment[sr]=Компонента Ñинхронизације (прикључак KitchenSync-а)
+ Comment[sr at Latn]=Komponenta sinhronizacije (prikljuÄak KitchenSync-a)
+ Comment[sv]=Synkroniseringskomponent (Kitchensynk-insticksprogram)
++Comment[tr]=EÅŸzamanlama Eklentisi (Kitchensynk Eklentisi)
+ Comment[zh_CN]=åŒæ¥ç»„件(KitchenSync æ’件)
+ Comment[zh_TW]=åŒæ¥çµ„件（KitchenSynk 外掛程å¼ï¼‰
+ Name=Sync
+@@ -34,7 +39,10 @@
+ Name[de]=Abgleich
+ Name[el]=ΣυγχÏονισμός
+ Name[et]=Sünkroniseerimine
++Name[fr]=Synchroniser
+ Name[ja]=åŒæœŸ
+ Name[nds]=Synkroniseren
++Name[pl]=Synchronizacja
++Name[ru]=СинхронизациÑ
+ Name[sv]=Synkronisering
+ Name[zh_TW]=åŒæ¥
+Index: kontact/plugins/kpilot/kpilotplugin.desktop
+===================================================================
+--- kontact/plugins/kpilot/kpilotplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/kpilot/kpilotplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,13 +23,17 @@
+ Comment[de]=Palm-Komponente (KPilot-Modul)
+ Comment[el]=Συστατικό εÏγαλείων Palm (Î Ïόσθετο του KPilot)
+ Comment[et]=Palmi tööriistade plugin (KPilot)
++Comment[fr]=Composant d'outils pour Palms (Module KPilot)
+ Comment[it]=Componente strumenti Palm (plugin KPilot)
+ Comment[ja]=Palm ツールコンãƒãƒ¼ãƒãƒ³ãƒˆ (KPilot プラグイン)
+ Comment[nds]=Palmreekner-Warktüüchkomponent (KPilot-Moduul)
+ Comment[nl]=Component met hulpmiddelen voor PalmOS(tm)-apparaten (KPilot-plugin)
++Comment[pl]=Składnik narzędzi Palma (wtyczka KPilot)
++Comment[ru]=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ Palm (модуль KPilot)
+ Comment[sr]=Компонента алата за Palm (прикључак KPilot-а)
+ Comment[sr at Latn]=Komponenta alata za Palm (prikljuÄak KPilot-a)
+ Comment[sv]=Palm Pilot-verktygskomponent (Kpilot-insticksprogram)
++Comment[tr]=Palm Araçları Bileşeni (KPilot Eklentisi)
+ Comment[zh_CN]=Palm 工具组件(KPilot æ’件)
+ Comment[zh_TW]=Palm 工具組件（KPilot 外掛程å¼ï¼‰
+ Name=Palm
+Index: kontact/plugins/knotes/knotesplugin.desktop
+===================================================================
+--- kontact/plugins/knotes/knotesplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/knotes/knotesplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -21,13 +21,17 @@
+ Comment[de]=Notizen-Komponente (KNotes-Modul)
+ Comment[el]=Συσταικό σημειώσεων (Î Ïόσθετο του KNotes)
+ Comment[et]=Märkmete plugin (KNotes)
++Comment[fr]=Composant de notes (Module KNotes)
+ Comment[it]=Componente note (plugin KNotes)
+ Comment[ja]=メモコンãƒãƒ¼ãƒãƒ³ãƒˆ (KNotes プラグイン)
+ Comment[nds]=Notizen-Komponent (KNotes-Moduul)
+ Comment[nl]=Notitiecomponent (KNotes-plugin)
++Comment[pl]=Składnik notatek (wtyczka KNotes)
++Comment[ru]=Заметки (модуль KNotes)
+ Comment[sr]=Компонента белешки (прикључак KNotes-а)
+ Comment[sr at Latn]=Komponenta beleÅ¡ki (prikljuÄak KNotes-a)
+ Comment[sv]=Anteckningskomponent (Knotes-insticksprogram)
++Comment[tr]=Notlar BileÅŸeni (KNotes Eklentisi)
+ Comment[zh_CN]=便笺组件(KNotes æ’件)
+ Comment[zh_TW]=便æ¢çµ„件（KNotes 外掛程å¼ï¼‰
+ Name=Notes
+@@ -57,6 +61,7 @@
+ Name[is]=Minnismiðar
+ Name[it]=Note
+ Name[ja]=メモ
++Name[ka]=ჩáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ”ბი
+ Name[kk]=Жазбалар
+ Name[km]=ចំណាំ
+ Name[lt]=Užrašai
+@@ -82,6 +87,7 @@
+ Name[th]=บันทึà¸à¸Šà¹ˆà¸§à¸¢à¸ˆà¸³
+ Name[tr]=Notlar
+ Name[uk]=Примітки
+-Name[uz]=Ðзма хотира
++Name[uz]=Yozma xotira
++Name[uz at cyrillic]=Ðзма хотира
+ Name[zh_CN]=便笺
+ Name[zh_TW]=備忘錄
+Index: kontact/plugins/karm/karmplugin.desktop
+===================================================================
+--- kontact/plugins/karm/karmplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/karm/karmplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -20,13 +20,18 @@
+ Comment[de]=Zeitplaner-Komponente (KArm-Modul)
+ Comment[el]=Συστατικό γÏαμμής χÏόνου (Î Ïόσθετο του KArm)
+ Comment[et]=Ajaarvestaja plugin (KArm)
++Comment[fr]=Composant de suivi temporel (Module pour KArm)
+ Comment[it]=Componente segna-tempo (plugin Karm)
+ Comment[ja]=タイムトラッカーコンãƒãƒ¼ãƒãƒ³ãƒˆ (KArm プラグイン)
++Comment[km]=សមាសភាគ​កម្មវិធី​ážáž¶áž˜ážŠáž¶áž“​ពáŸáž›ážœáŸáž›áž¶ (កម្មវិធី​ជំនួយ KArm​)
+ Comment[nds]=Tietlogbook-Komponent (KArm-Moduul)
+ Comment[nl]=Tijdsregistratiecomponent (KArm-plugin)
++Comment[pl]=Składnik śledzenia czasu (wtyczka KArm)
++Comment[ru]=ОтÑлеживание времени (модуль KArm)
+ Comment[sr]=Компонента праћења времена (прикључак KArm-а)
+ Comment[sr at Latn]=Komponenta praćenja vremena (prikljuÄak KArm-a)
+ Comment[sv]=Komponent för tidmätning (Karm-insticksprogram)
++Comment[tr]=Zaman Ä°zleyici BileÅŸeni (KArm Eklentisi)
+ Comment[zh_CN]=时间追踪组件(KArm æ’件)
+ Comment[zh_TW]=時間追蹤器組件（KArm 外掛程å¼ï¼‰
+
+@@ -36,9 +41,13 @@
+ Name[de]=Stoppuhr
+ Name[el]=ΧÏονόμετÏο
+ Name[et]=Ajaarvestaja
++Name[fr]=Minuteur
+ Name[ja]=タイマー
++Name[km]=កម្មវិធី​កំណážáŸ‹â€‹áž–áŸáž›ážœáŸáž›áž¶
+ Name[nds]=Tietgever
+ Name[nl]=Tijdklok
++Name[pl]=Stoper
++Name[ru]=Таймер
+ Name[sr]=Тајмер
+ Name[sr at Latn]=Tajmer
+ Name[sv]=Tidmätning
+Index: kontact/plugins/kaddressbook/kaddressbookplugin.desktop
+===================================================================
+--- kontact/plugins/kaddressbook/kaddressbookplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/kaddressbook/kaddressbookplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,13 +23,18 @@
+ Comment[de]=Kontakte-Komponente (Adressbuch-Modul)
+ Comment[el]=Συστατικό επαφών (Î Ïόσθετο του KAdressbook)
+ Comment[et]=Kontaktide plugin (KDE aadressiraamat)
++Comment[fr]=Composant des contacts (module externe KAdressBook)
+ Comment[it]=Componente contatti (plugin KAddressbook)
+ Comment[ja]=アドレス帳コンãƒãƒ¼ãƒãƒ³ãƒˆ (KAddressbook プラグイン)
++Comment[km]=សមាសភាគ​ទំនាក់ទំន​ង (កម្មវិធី​ជំនួយ KAdressbook​)
+ Comment[nds]=Kontakten-Komponent (KAddressbook-Moduul)
+ Comment[nl]=Adresboekcomponent (KAddressbook-plugin)
++Comment[pl]=Składnik wizytówek (wtyczka KAddressBook)
++Comment[ru]=Контакты (модуль KAddressBook)
+ Comment[sr]=Компонента контаката (прикључак KAddressBook-а)
+ Comment[sr at Latn]=Komponenta kontakata (prikljuÄak KAddressBook-a)
+ Comment[sv]=Kontaktkomponent (adressboksinsticksprogram)
++Comment[tr]=KiÅŸiler BileÅŸeni (KAdresDefteri Eklentisi)
+ Comment[zh_CN]=è”系人组件(KAddressbook æ’件)
+ Comment[zh_TW]=è¯çµ¡äººçµ„件（KAddressBook 外掛程å¼ï¼‰
+ Name=Contacts
+@@ -60,6 +65,7 @@
+ Name[is]=Tengiliðir
+ Name[it]=Contatti
+ Name[ja]=コンタクト
++Name[ka]=კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბი
+ Name[kk]=Контакттар
+ Name[km]=ទំនាក់ទំនង
+ Name[lt]=Kontaktai
+@@ -85,8 +91,9 @@
+ Name[ta]=தொடரà¯à®ªà¯à®•à®³à¯
+ Name[tg]=Ðлоқот
+ Name[th]=ที่à¸à¸¢à¸¹à¹ˆà¸•à¸´à¸”ต่à¸
+-Name[tr]=Bağlantılar
++Name[tr]=KiÅŸiler
+ Name[uk]=Контакти
+-Name[uz]=Ðлоқалар
++Name[uz]=Aloqalar
++Name[uz at cyrillic]=Ðлоқалар
+ Name[zh_CN]=è”系人
+ Name[zh_TW]=è¯çµ¡äºº
+Index: kontact/plugins/korganizer/kcmkorgsummary.desktop
+===================================================================
+--- kontact/plugins/korganizer/kcmkorgsummary.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/korganizer/kcmkorgsummary.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -18,13 +18,17 @@
+ Name[de]=Übersicht über Termine und Aufgaben
+ Name[el]=Επισκόπηση ÏÎ±Î½Ï„ÎµÎ²Î¿Ï ÎºÎ±Î¹ Ï€Ïος υλοποίηση εÏγασιών
+ Name[et]=Kohtumised ja ülesannete ülevaade
++Name[fr]=Apercu des rendez-vous et des tâches
+ Name[it]=Panoramica appuntamenti e cose da fare
+ Name[ja]=ç´„æŸã¨ To-Do ã®è¦ç´„
+ Name[nds]=Termin- un Opgaven-Översicht
+ Name[nl]=Overzicht van evenementen en taken
++Name[pl]=Spotkania i zadania
++Name[ru]=Сводка вÑтреч и задач
+ Name[sr]=Преглед ÑаÑтанака и обавеза
+ Name[sr at Latn]=Pregled sastanaka i obaveza
+ Name[sv]=Översikt av möten och uppgifter
++Name[tr]=Randevulara ve Yapılacaklara Genel Bakış
+ Name[zh_CN]=约会和待办概览
+ Name[zh_TW]=ç´„æœƒèˆ‡å¾…è¾¦äº‹é …æ¦‚è§€
+ Comment=Appointments and To-dos Summary Setup
+@@ -47,6 +51,7 @@
+ Comment[is]=Uppsetning á yfirliti yfir fundi og verkþætti
+ Comment[it]=Impostazioni sommario appuntamenti e cose da fare
+ Comment[ja]=ç´„æŸã¨ To-Do ã®è¦ç´„è¨å®š
++Comment[ka]=შეხვედრáƒáƒ—რდრგáƒáƒ¡áƒáƒ™áƒ”თებელთრრეზიუმეს დáƒáƒ§áƒ”ნებáƒ
+ Comment[kk]=КездеÑулер мен ЖоÑпарлар тұжырымының баптау
+ Comment[km]=រៀបចំ​សáŸáž…ក្ដី​សង្ážáŸáž”​ការ​ណាážáŸ‹ និង​ការងារ​ážáŸ’រូវ​ធ្វើ
+ Comment[lt]=Susitikimų ir užduoÄių santraukos nustatymai
+@@ -59,7 +64,7 @@
+ Comment[pl]=Ustawienia podsumowania spotkań i zadań
+ Comment[pt]=Configuração do Sumário de Compromissos e A-fazeres
+ Comment[pt_BR]=Configuração do Resumo de Compromissos e Tarefas
+-Comment[ru]=ÐаÑтройка показа вÑтреч и задач
++Comment[ru]=ÐаÑтройка Ñводки вÑтреч и задач
+ Comment[sk]=Nastavenie súhrnu pripomienok a úloh
+ Comment[sl]=Nastavitve povzetka sestankov in opravil
+ Comment[sr]=Подешавање Ñажетка ÑаÑтанака и обавеза
+@@ -93,6 +98,7 @@
+ Keywords[is]=dagatal, verkþættir, stillingar, stilla
+ Keywords[it]=calendario, cose da fare, configura, impostazioni
+ Keywords[ja]=カレンダー, To-Do, è¨å®š
++Keywords[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი,გáƒáƒ¡áƒáƒ™áƒ”თებლები,კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ,პáƒáƒ áƒáƒ›áƒ”ტრები
+ Keywords[km]=ប្រážáž·áž‘áž·áž“,ការងារ​ážáŸ’រូវ​ធ្វើ,កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ,ការ​កំណážáŸ‹
+ Keywords[lt]=calendar, todos, configure, settings, kalendorius, darbai, konfigūruoti, nustatymai
+ Keywords[ms]=kalendar, tugasan, konfigur, seting
+Index: kontact/plugins/korganizer/todoplugin.desktop
+===================================================================
+--- kontact/plugins/korganizer/todoplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/korganizer/todoplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,13 +23,17 @@
+ Comment[de]=Aufgabenlisten-Komponente (KOrganizer-Modul)
+ Comment[el]=Συστατικό λίστα Ï€Ïος υλοποίηση εÏγασιών (Î Ïόσθετο του KOrganizer)
+ Comment[et]=Ãœlesannete nimekirja plugin (KOrganizer)
++Comment[fr]=Composant de la liste des tâches (Module KOrganizer)
+ Comment[it]=Componente elenco delle cose da fare (plugin KOrganizer)
+ Comment[ja]=To-Do リストコンãƒãƒ¼ãƒãƒ³ãƒˆ (KOrganizer プラグイン)
+ Comment[nds]=Opgavenlist-Komponent (KOrganizer-Moduul)
+ Comment[nl]=Takenlijstcomponent (KOrganizer-plugin)
++Comment[pl]=Składnik zadań (wtyczka KOrganizer)
++Comment[ru]=Задачи (модуль KOrganizer)
+ Comment[sr]=Прикључак лиÑте обавеза (прикључак KOrganizer-а)
+ Comment[sr at Latn]=PrikljuÄak liste obaveza (prikljuÄak KOrganizer-a)
+ Comment[sv]=Uppgiftslistkomponent (Korganizer-insticksprogram)
++Comment[tr]=Yapılacak İşler Bileşeni (KOrganizer eklentisi)
+ Comment[zh_CN]=待办清å•ç»„件(KOrganizer æ’件)
+ Comment[zh_TW]=å¾…è¾¦äº‹é …æ¸…å–®çµ„ä»¶ï¼ˆKOrganizer 外掛程å¼ï¼‰
+ Name=To-do
+@@ -39,12 +43,16 @@
+ Name[de]=Aufgaben
+ Name[el]=Î Ïος υλοποίηση εÏγασίες
+ Name[et]=Ãœlesanded
++Name[fr]=Tâches
+ Name[it]=Cose da fare
+ Name[ja]=To-Do
+ Name[nds]=Opgaav
+ Name[nl]=Takenlijst
++Name[pl]=Lista zadań
++Name[ru]=Задачи
+ Name[sr]=Обавезе
+ Name[sr at Latn]=Obaveze
+ Name[sv]=Uppgift
++Name[tr]=Yapılacak Ögeleri
+ Name[zh_CN]=待办清å•
+ Name[zh_TW]=å¾…è¾¦äº‹é …
+Index: kontact/plugins/korganizer/journalplugin.desktop
+===================================================================
+--- kontact/plugins/korganizer/journalplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/korganizer/journalplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,13 +23,17 @@
+ Comment[de]=Journal-Komponente (KOrganizer-Modul)
+ Comment[el]=Συστατικό χÏονικών (Î Ïόσθετο του KOrganizer)
+ Comment[et]=Päevikuplugin (KOrganizer)
++Comment[fr]= Composant de journal (Module KOrganizer)
+ Comment[it]=Componente diario (plugin KOrganizer)
+ Comment[ja]=ジャーナルコンãƒãƒ¼ãƒãƒ³ãƒˆ (KOrganizer プラグイン)
+ Comment[nds]=Daagböker-Komponent (KOrganizer-Moduul)
+ Comment[nl]=Journaalcomponent (KOrganizer-plugin)
++Comment[pl]=Składnik dziennika (wtyczka Korganizer)
++Comment[ru]=Журнал (модуль KOrganizer)
+ Comment[sr]=Компонента дневника (прикључак KOrganizer-а)
+ Comment[sr at Latn]=Komponenta dnevnika (prikljuÄak KOrganizer-a)
+ Comment[sv]=Journalkomponent (Korganizer-insticksprogram)
++Comment[tr]=Günlük Bileşeni (KOrganizer Eklentisi)
+ Comment[zh_CN]=日记组件(KOrganizer æ’件)
+ Comment[zh_TW]=日誌組件（KOrganizer 外掛程å¼ï¼‰
+ Name=Journal
+@@ -55,6 +59,7 @@
+ Name[is]=Dagbók
+ Name[it]=Diario
+ Name[ja]=ジャーナル
++Name[ka]=ჟურნáƒáƒšáƒ˜
+ Name[kk]=Күнделік
+ Name[km]=ទិនានុប្បវážáŸ’ážáž·
+ Name[lt]=Dienynas
+@@ -76,6 +81,7 @@
+ Name[th]=วารสาร
+ Name[tr]=Günlük
+ Name[uk]=Журнал
+-Name[uz]=Кундалик
++Name[uz]=Kundalik
++Name[uz at cyrillic]=Кундалик
+ Name[zh_CN]=日记
+ Name[zh_TW]=日誌
+Index: kontact/plugins/korganizer/korganizerplugin.desktop
+===================================================================
+--- kontact/plugins/korganizer/korganizerplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/korganizer/korganizerplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,13 +23,17 @@
+ Comment[de]=Kalender-Komponente (KOrganizer-Modul)
+ Comment[el]=Συστατικό ημεÏολογίου (Î Ïόσθετο του KOrganizer)
+ Comment[et]=Kalendriplugin (KOrganizer)
++Comment[fr]= Composant de calendrier (Module KOrganizer)
+ Comment[it]=Componente calendario (plugin KOrganizer)
+ Comment[ja]=カレンダーコンãƒãƒ¼ãƒãƒ³ãƒˆ (KOrganizer プラグイン)
+ Comment[nds]=Kalenner-Komponent (KOrganizer-Moduul)
+ Comment[nl]=Agendacomponent (KOrganizer-plugin)
++Comment[pl]=Składnik kalendarza (wtyczka KOrganizer)
++Comment[ru]=Календарь (модуль KOrganizer)
+ Comment[sr]=Компонента календара (прикључак KOrganizer-а)
+ Comment[sr at Latn]=Komponenta kalendara (prikljuÄak KOrganizer-a)
+ Comment[sv]=Kalenderkomponent (Korganizer-insticksprogram)
++Comment[tr]=Takvim BileÅŸeni (KOrganizer Eklentisi)
+ Comment[zh_CN]=日历组件(KOrganizer æ’件)
+ Comment[zh_TW]=行事曆組件（KOrganizer 外掛程å¼ï¼‰
+ Name=Calendar
+@@ -61,6 +65,7 @@
+ Name[is]=Dagatal
+ Name[it]=Calendario
+ Name[ja]=カレンダー
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი
+ Name[kk]=Күнтізбе
+ Name[km]=ប្រážáž·áž‘áž·áž“
+ Name[lt]=Kalendorius
+@@ -87,6 +92,7 @@
+ Name[th]=บันทึà¸à¸›à¸£à¸°à¸ˆà¸³à¸§à¸±à¸™
+ Name[tr]=Takvim
+ Name[uk]=Календар
+-Name[uz]=Календар
++Name[uz]=Kalendar
++Name[uz at cyrillic]=Календар
+ Name[zh_CN]=日历
+ Name[zh_TW]=行事曆
+Index: kontact/plugins/kmail/kmailplugin.desktop
+===================================================================
+--- kontact/plugins/kmail/kmailplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/kmail/kmailplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -24,13 +24,17 @@
+ Comment[de]=E-Mail-Komponente (KMail-Modul)
+ Comment[el]=Συστατικό αλληλογÏαφίας (Î Ïόσθετο του KMail)
+ Comment[et]=E-posti plugin (KMail)
++Comment[fr]=Composant de courrier (Module pour KMail)
+ Comment[it]=Componente posta elettronica (plugin KMail)
+ Comment[ja]=メールコンãƒãƒ¼ãƒãƒ³ãƒˆ (KMail プラグイン)
+ Comment[nds]=Nettpost-Komponent (KMail-Moduul)
+ Comment[nl]=E-mailcomponent (KMail-plugin)
++Comment[pl]=Składnik poczty (wtyczka KMail)
++Comment[ru]=ÐÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð° (модуль KMail)
+ Comment[sr]=Компонента е-поште (прикључак KMail-а)
+ Comment[sr at Latn]=Komponenta e-poÅ¡te (prikljuÄak KMail-a)
+ Comment[sv]=E-postkomponent (Kmail-insticksprogram)
++Comment[tr]=E-Posta BileÅŸeni (KMail Eklentisi)
+ Comment[zh_CN]=邮件组件(KMail æ’件)
+ Comment[zh_TW]=é›»å郵件組件（KMail 外掛程å¼ï¼‰
+ Name=E-Mail
+@@ -39,12 +43,16 @@
+ Name[da]=E-mail
+ Name[el]=ΑλληλογÏαφία
+ Name[et]=E-post
++Name[fr]=Courrier
+ Name[it]=Posta elettronica
+ Name[ja]=メール
+ Name[nds]=Nettpost
+ Name[nl]=E-mail
++Name[pl]=E-mail
++Name[ru]=ÐÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð°
+ Name[sr]=Е-пошта
+ Name[sr at Latn]=E-pošta
+ Name[sv]=E-post
++Name[tr]=E-Posta
+ Name[zh_CN]=邮件
+ Name[zh_TW]=é›»å郵件
+Index: kontact/plugins/kmail/kcmkmailsummary.desktop
+===================================================================
+--- kontact/plugins/kmail/kcmkmailsummary.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/kmail/kcmkmailsummary.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -18,13 +18,18 @@
+ Name[de]=E-Mail-Ãœbersicht
+ Name[el]=Επισκόπηση αλληλογÏαφίας
+ Name[et]=E-posti ülevaade
++Name[fr]=Apercu du courrier
+ Name[it]=Panoramica posta elettronica
+ Name[ja]=メールã®è¦ç´„
++Name[km]=ទិដ្ឋភាព​ទូទៅ​របស់​អ៊ីមែល
+ Name[nds]=Nettpost-Översicht
+ Name[nl]=E-mailoverzicht
++Name[pl]=Poczta
++Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ почте
+ Name[sr]=Преглед е-поште
+ Name[sr at Latn]=Pregled e-pošte
+ Name[sv]=E-postöversikt
++Name[tr]=E-Postalara Genel Bakış
+ Name[zh_CN]=邮件概览
+ Name[zh_TW]=郵件概è¦
+ Comment=E-Mail Summary Setup
+@@ -34,13 +39,17 @@
+ Comment[de]=Einstellungen für E-Mail-Übersicht
+ Comment[el]=ΡÏθμιση σÏνοψης αλληλογÏαφίας
+ Comment[et]=E-posti kokkuvõtte seadistus
++Comment[fr]=Configuration du résumé des méls
+ Comment[it]=Impostazioni sommario posta elettronica
+ Comment[ja]=メールè¦ç´„ã®è¨å®š
+ Comment[nds]=Instellen för Nettpost-Översicht
+ Comment[nl]=Instellingen voor e-mailoverzicht
++Comment[pl]=Ustawienia podsumowania e-maili
++Comment[ru]=ÐаÑтройка Ñводки почты
+ Comment[sr]=Подешавање Ñажетка е-поште
+ Comment[sr at Latn]=Podešavanje sažetka e-pošte
+ Comment[sv]=Inställning av e-postöversikt
++Comment[tr]=E-Posta Özet Yapılandırması
+ Comment[zh_CN]=邮件摘è¦è®¾ç½®
+ Comment[zh_TW]=郵件摘è¦è¨å®š
+ Keywords=email, summary, configure, settings
+@@ -66,6 +75,7 @@
+ Keywords[is]=tölvupóstur, yfirlit, stillingar, stilla
+ Keywords[it]=posta elettronica, email, sommario, configura, impostazioni
+ Keywords[ja]=メール,è¦ç´„,è¨å®š,è¨å®š
++Keywords[ka]=ელფáƒáƒ¡áƒ¢áƒ,დáƒáƒ˜áƒ¯áƒ”სტი,კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ,პáƒáƒ áƒáƒ›áƒ”ტრები
+ Keywords[km]=អ៊ីមែល,សង្ážáŸáž”,កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ,ការ​កំណážáŸ‹
+ Keywords[lt]=email, summary, configure, settings, e. paštas, santrauka, konfigūruoti, nustatymai
+ Keywords[mk]=email, summary, configure, settings, е-пошта, преглед, конфигурација, поÑтавувања
+@@ -75,10 +85,10 @@
+ Keywords[ne]=इमेल, सारांश, कनà¥à¤«à¤¿à¤—र, सेटिङ
+ Keywords[nl]=email,e-mail,overzicht,samenvatting,instellingen,configuratie
+ Keywords[nn]=e-post,samandrag,oppsett,innstillingar
+-Keywords[pl]=email,list,podsumowanie,konfiguracja,ustawienia
++Keywords[pl]=e-mail,list,podsumowanie,konfiguracja,ustawienia
+ Keywords[pt]=e-mail, sumário, configurar, configuração
+ Keywords[pt_BR]=e-mail, resumo, configurar, configurações
+-Keywords[ru]=email,summary,configure,settings,наÑтройки,дайджеÑÑ‚,почта
++Keywords[ru]=email,summary,configure,settings,наÑтройки,Ñводка,почта
+ Keywords[sk]=email,súhrn,nastavenie
+ Keywords[sl]=e-pošta,pošta,povzetek,nastavi,nastavitve
+ Keywords[sr]=емаил, Ñажетак, подеÑи, поÑтавке
+Index: kontact/plugins/summary/kcmkontactsummary.desktop
+===================================================================
+--- kontact/plugins/summary/kcmkontactsummary.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/summary/kcmkontactsummary.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -14,6 +14,7 @@
+ Name=Summary View Items
+ Name[bg]=Обобщение
+ Name[ca]=Vista resum d'elements
++Name[da]=Elementer i opsummeringsvisning
+ Name[de]=Elemente der Zusammenfassungsansicht
+ Name[el]=Αντικείμενα Ï€Ïοβολής σÏνοψης
+ Name[et]=Kokkuvõttevaate elemendid
+@@ -24,7 +25,9 @@
+ Name[sr]=Ставке приказа Ñажетка
+ Name[sr at Latn]=Stavke prikaza sažetka
+ Name[sv]=Objekt i översiktsvy
++Name[tr]=Özet Görünüm Ögeleri
+ Name[zh_CN]=摘è¦è§†å›¾é¡¹ç›®
++Name[zh_TW]=摘è¦æª¢è¦–é …ç›®
+ Comment=General Configuration of Kontact's Summary View
+ Comment[af]=Algemene opstelling van Kontact se opsomming aansig
+ Comment[bg]=ÐаÑтройка на обобщението
+@@ -46,6 +49,7 @@
+ Comment[is]=Almennar stillingar fyrir Kontact yfirlitssýn
+ Comment[it]=Configurazione generale della vista sommario di Kontact
+ Comment[ja]=Kontact ã®è¦ç´„表示ã®ä¸€èˆ¬çš„ãªè¨å®š
++Comment[ka]=Kontact დáƒáƒ˜áƒ¯áƒ”სტის ხედის ზáƒáƒ’áƒáƒ“ი პáƒáƒ áƒáƒ›áƒ”ტრები
+ Comment[kk]=Тұжырымдаманың жалпы параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ទូទៅ​នៃ​ទិដ្ឋភាព​សង្ážáŸáž”​របស់ Kontact
+ Comment[lt]=Kontact Santraukos vaizdo bendrasis konfigūravimas
+@@ -59,7 +63,7 @@
+ Comment[pl]=Ogólna konfiguracja widoku podsumowania w Kontact
+ Comment[pt]=Configuração Geral da Vista Sumária do Kontact
+ Comment[pt_BR]=Configuração Geral da Visão de Resumo do Kontact
+-Comment[ru]=Общие наÑтройки дайджеÑта Kontact
++Comment[ru]=ÐаÑтройка Ñводок Kontact
+ Comment[sk]=Všeobecné nastavenie súhrnu Kontact
+ Comment[sl]=Splošne nastavitve za prikaz povzetka v Kontract
+ Comment[sr]=Опште подешавање Kontact-овог приказа Ñажетка
+Index: kontact/plugins/summary/summaryplugin.desktop
+===================================================================
+--- kontact/plugins/summary/summaryplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/summary/summaryplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -19,13 +19,17 @@
+ Comment[de]=Zusammenfassungsansicht-Komponente
+ Comment[el]=Συστατικό Ï€Ïοβολής σÏνοψης
+ Comment[et]=Kokkuvõttevaate plugin
++Comment[fr]=Composant de la vue résumée
+ Comment[it]=Componente vista sommario
+ Comment[ja]=è¦ç´„ビューコンãƒãƒ¼ãƒãƒ³ãƒˆ
+ Comment[nds]=Översicht-Komponent
+ Comment[nl]=Overzichtsweergaveitem
++Comment[pl]=Składnik widoku podsumowania
++Comment[ru]=ПроÑмотр Ñводок
+ Comment[sr]=Компонента приказа Ñажетка
+ Comment[sr at Latn]=Komponenta prikaza sažetka
+ Comment[sv]=Översiktsvykomponent
++Comment[tr]=Özet Görünüm Bileşeni
+ Comment[zh_CN]=摘è¦è§†å›¾ç»„件
+ Comment[zh_TW]=摘è¦æª¢è¦–組件
+ Name=Summary
+@@ -56,6 +60,7 @@
+ Name[is]=Yfirlit
+ Name[it]=Sommario
+ Name[ja]=è¦ç´„
++Name[ka]=დáƒáƒ˜áƒ¯áƒ”სტი
+ Name[kk]=Тұжырым
+ Name[km]=សង្ážáŸáž”
+ Name[lt]=Santrauka
+@@ -70,7 +75,7 @@
+ Name[pt]=Resumo
+ Name[pt_BR]=Resumo
+ Name[ro]=Sumar
+-Name[ru]=ДайджеÑÑ‚
++Name[ru]=Сводки
+ Name[se]=Čoahkkáigeassu
+ Name[sk]=Súhrn
+ Name[sl]=Povzetek
+@@ -82,7 +87,8 @@
+ Name[th]=หน้าสรุป
+ Name[tr]=Özet
+ Name[uk]=ЗведеннÑ
+-Name[uz]=ҲиÑобот
++Name[uz]=Hisobot
++Name[uz at cyrillic]=ҲиÑобот
+ Name[zh_CN]=概览
+ Name[zh_TW]=摘è¦
+ #Always last
+Index: kontact/plugins/newsticker/kcmkontactknt.desktop
+===================================================================
+--- kontact/plugins/newsticker/kcmkontactknt.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/newsticker/kcmkontactknt.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -37,6 +37,7 @@
+ Name[is]=Fréttastrimill
+ Name[it]=Ticker notizie
+ Name[ja]=ニュースティッカー
++Name[ka]=სიáƒáƒ®áƒšáƒ”თრტიკერი
+ Name[kk]=Жаңалық таÑпаÑÑ‹
+ Name[km]=កម្មវិធី​ទទួល​ពáŸážáŸŒáž˜áž¶áž“
+ Name[lt]=News pranešėjas
+@@ -88,6 +89,7 @@
+ Comment[is]=Uppsetning á yfirliti yfir fréttastrimla
+ Comment[it]=Impostazioni sommario ticker notizie
+ Comment[ja]=ニュースティッカーã®è¨å®š
++Comment[ka]=სიáƒáƒ®áƒšáƒ”თრტიკერის დáƒáƒ˜áƒ¯áƒ”სტის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=Жаңалық таÑпаÑының тұжырымынын баптау
+ Comment[km]=រៀបចំ​សáŸáž…ក្ដី​សង្ážáŸáž”​កម្មវិធី​ទទួល​ពáŸážáŸŒáž˜áž¶áž“
+ Comment[lt]=News Ticker santraukos nustatymai
+@@ -99,7 +101,7 @@
+ Comment[pl]=Ustawienia podsumowania wiadomości
+ Comment[pt]=Configuração do Sumário do Extractor de NotÃcias
+ Comment[pt_BR]=Configuração de Resumo de NotÃcias
+-Comment[ru]=ÐаÑтройка дайджеÑта новоÑтей
++Comment[ru]=ÐаÑтройка Ñводки новоÑтей
+ Comment[sk]=Nastavenie súhrnu správ
+ Comment[sl]=Nastavitve povzetka novic
+ Comment[sr]=Подешавање Ñажетка приказивања веÑти
+@@ -130,6 +132,7 @@
+ Keywords[is]=fréttastrimill, stillingar, stilla
+ Keywords[it]=ticker notizie, configura, impostazioni
+ Keywords[ja]=ニュースティッカー,è¨å®š,è¨å®š
++Keywords[ka]=სიáƒáƒ®áƒšáƒ”თრტიკერი, კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ, პáƒáƒ áƒáƒ›áƒ”ტრები
+ Keywords[km]=កម្មវិធី​ទទួល​ពáŸážáŸŒáž˜áž¶áž“,កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ,ការ​កំណážáŸ‹
+ Keywords[lt]=news ticker, configure, settings, konfigūravimas, nustatymai, naujienų pranešėjas
+ Keywords[ms]=Pengetik berita, konfigur, seting
+Index: kontact/plugins/newsticker/newstickerplugin.desktop
+===================================================================
+--- kontact/plugins/newsticker/newstickerplugin.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/plugins/newsticker/newstickerplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -22,13 +22,17 @@
+ Comment[de]=Newsticker-Komponente
+ Comment[el]=Συστατικό Ï€ÏοβολÎα ειδήσεων
+ Comment[et]=Uudistejälgija plugin
++Comment[fr]=Composant Newsticker
+ Comment[it]=Componente ticker notizie
+ Comment[ja]=ニュースティッカーコンãƒãƒ¼ãƒãƒ³ãƒˆ
+ Comment[nds]=Narichtentelegraaf-Komponent
+ Comment[nl]=Nieuwstickercomponent
++Comment[pl]=Składnik paska wiadomości
++Comment[ru]=Компонент новоÑтей
+ Comment[sr]=Компонента откуцавача веÑти
+ Comment[sr at Latn]=Komponenta otkucavaÄa vesti
+ Comment[sv]=Nyhetsövervakningskomponent
++Comment[tr]=Haber Ä°zleyici BileÅŸeni
+ Comment[zh_CN]=新闻点点通组件
+ Comment[zh_TW]=æ–°èžé¡¯ç¤ºçµ„件
+ Name=News
+@@ -59,6 +63,7 @@
+ Name[hu]=HÃrek
+ Name[is]=Fréttir
+ Name[ja]=ニュース
++Name[ka]=სიáƒáƒ®áƒšáƒ”ები
+ Name[kk]=Жаңалықтар
+ Name[km]=áž–áŸážáŸŒáž˜áž¶áž“
+ Name[lt]=Naujienos
+@@ -86,6 +91,7 @@
+ Name[th]=ข่าว
+ Name[tr]=Haberler
+ Name[uk]=Ðовини
+-Name[uz]=Янгиликлар
++Name[uz]=Yangiliklar
++Name[uz at cyrillic]=Янгиликлар
+ Name[zh_CN]=æ–°é—»
+ Name[zh_TW]=æ–°èž
+Index: kontact/interfaces/kontactplugin.desktop
+===================================================================
+--- kontact/interfaces/kontactplugin.desktop.orig 2007-05-14 09:54:53.000000000 +0200
++++ kontact/interfaces/kontactplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -28,6 +28,7 @@
+ Name[is]=Kontact Ãforrit
+ Name[it]=Plugin Kontact
+ Name[ja]=Kontact プラグイン
++Name[ka]=Kontact მáƒáƒ“ული
+ Name[kk]=Kontact модулі
+ Name[km]=កម្មវិធី​ជំនួយ Kontact
+ Name[lt]=Kontact priedas
+@@ -37,7 +38,7 @@
+ Name[nds]=Kontact-Moduul
+ Name[ne]=समà¥à¤ªà¤°à¥à¤• पà¥à¤²à¤—इन
+ Name[nn]=Kontact-programtillegg
+-Name[pl]=Wtyczka Kontact
++Name[pl]=Wtyczka Kontakt
+ Name[pt]='Plugin' do Kontact
+ Name[pt_BR]=Plug-in do Kontact
+ Name[ro]=Modul Kontact
+@@ -51,7 +52,8 @@
+ Name[tg]=Модули Kontact
+ Name[tr]=Kontact Eklentisi
+ Name[uk]=Втулок Kontact
+-Name[uz]=Kontact учун плагин
++Name[uz]=Kontact uchun plagin
++Name[uz at cyrillic]=Kontact учун плагин
+ Name[zh_CN]=Kontact æ’件
+ Name[zh_TW]=Kontack 外掛程å¼
+
+Index: kontact/src/kontact.setdlg
+===================================================================
+--- kontact/src/kontact.setdlg.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/src/kontact.setdlg 2008-06-29 20:10:37.000000000 +0200
+@@ -6,13 +6,17 @@
+ Name[de]=Ãœbersicht
+ Name[el]=Î Ïοβολή σÏνοψης
+ Name[et]=Kokkuvõttevaade
++Name[fr]=Vue résumée
+ Name[it]=Vista sommario
+ Name[ja]=è¦ç´„ビュー
+ Name[nds]=Översicht
+ Name[nl]=Overzichtsweergave
++Name[pl]=Podsumowanie
++Name[ru]=ПроÑмотр Ñводок
+ Name[sr]=Приказ Ñажетка
+ Name[sr at Latn]=Prikaz sažetka
+ Name[sv]=Översiktsvy
++Name[tr]=Özet Görünümü
+ Name[zh_CN]=摘è¦è§†å›¾
+ Name[zh_TW]=摘è¦æª¢è¦–
+ Comment=Configuration of Kontact's <b>Summary View</b>. Some plugins provide <i>Summary View</i> items, choose the ones you would like to list.
+@@ -22,10 +26,13 @@
+ Comment[de]=Einrichtung der <b>Zusammenfassungsansicht</b> von Kontact. Einige Kontact-Module stellen Elemente für die <i>Zusammenfassungsansicht</i> zur Verfügung. Wählen Sie hier, welche Elemente angezeigt werden sollen.
+ Comment[el]=ΡÏθμιση της <b>Î Ïοβολής σÏνοψης</b> του Kontact. Κάποια Ï€Ïόσθετα παÏÎχουν αντικείμενα <i>Î Ïοβολή σÏνοψης</i>· επιλÎξτε αυτά που θÎλετε να εμφανίζονται.
+ Comment[et]=Kontacti <b>kokkuvõttevaate</b> seadistamine. Mõned pluginad pakuvad <i>kokkuvõttevaate</i> elemente. Vali nimekirjas need, mida soovid näha.
++Comment[fr]=Configuration de Kontact <b> Vue résumée</b>. Certains modules fournissent des éléments de <i>Vue Résumée</i>, choisissez ceux que vous voulez voir listés.
+ Comment[it]=Configurazione della <b>vista sommario</b> di Kontact. Alcuni plugin forniscono elementi di <i>vista sommario</i>, scegli quelli che desideri vedere nell'elenco.
+ Comment[ja]=Kontact ã®è¦ç´„ビューã®è¨å®šã€‚è¦ç´„ビューã®é …目をæä¾›ã™ã‚‹ãƒ—ラグインãŒã„ãã¤ã‹ã‚ã‚Šã¾ã™ã€‚è¦ç´„ビューã«è¡¨ç¤ºã•ã›ã‚‹é …目をé¸æŠžã—ã¦ãã ã•ã„。
+ Comment[nds]=Kontact sien <b>Översicht</b> instellen. En Reeg Modulen stellt Indrääg för de <i>Översicht</i> praat. Hier kannst Du de utsöken, de Du hebben wullt.
+ Comment[nl]=Configuratie van Kontacts <b>Overzichtsweergave</b>. Sommige plugins bieden ook items aan voor de <i>Overzichtweergave</i>, kies welke u wilt zien.
++Comment[pl]=Konfiguracja <b>Podsumowania</b> Kontaktu. Niektóre wtyczki zapewniają elementy <i>Widok podsumowania</i>, wybierz te które chcesz zobaczyć.
++Comment[ru]=ÐаÑтройка показа Ñводок различных компонентов.
+ Comment[sr]=Подешавање Kontact-овог <b>приказа Ñажетка</b>. Ðеки прикључци дају Ñтавке <i>приказа Ñажетка</i>, изаберите оне које желите.
+ Comment[sr at Latn]=PodeÅ¡avanje Kontact-ovog <b>prikaza sažetka</b>. Neki prikljuÄci daju stavke <i>prikaza sažetka</i>, izaberite one koje želite.
+ Comment[sv]=Inställning av Kontacts <b>översiktsvy</b>. Vissa insticksprogram tillhandahåller objekt för <i>översiktsvyn</i>. Välj de du skulle vilja visa.
+@@ -41,13 +48,17 @@
+ Name[da]=E-mail
+ Name[el]=ΑλληλογÏαφία
+ Name[et]=E-post
++Name[fr]=Courrier
+ Name[it]=Posta elettronica
+ Name[ja]=メール
+ Name[nds]=Nettpost
+ Name[nl]=E-mail
++Name[pl]=E-mail
++Name[ru]=ÐÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð°
+ Name[sr]=Е-пошта
+ Name[sr at Latn]=E-pošta
+ Name[sv]=E-post
++Name[tr]=E-Posta
+ Name[zh_CN]=邮件
+ Name[zh_TW]=é›»å郵件
+ Comment=Configuration of Kontact's E-Mail Plugin <b>KMail</b>, includes a <i>Summary View Item</i> and represents a <i>Kontact Component</i>.
+@@ -57,9 +68,12 @@
+ Comment[de]=Einrichtung des E-Mail-Moduls <b>KMail</b> für Kontact. Die E-Mail-Komponente kann als <i>Kontact-Komponente<i> in die <i>Zusammenfassungsansicht</i> integriert werden.
+ Comment[el]=Η ÏÏθμιση του Ï€ÏοσθÎτου αλληλογÏαφίας <b>KMail</b> του Kontact, πεÏιÎχει Îνα <i>Αντικείμενο Ï€Ïοβολής σÏνοψης</i> και αντιπÏοσωπεÏει Îνα <i>Συστατικό του Kontact</i>.
+ Comment[et]=Kontacti e-posti plugina <b>KMaili</b> seadistamine, mis sisaldab <i>kokkuvõttevaate elementi</i>.
++Comment[fr]=Configuration du Module de Courrier de Kontact <b>KMail</b>, inclut un <i>Élément de Vue Résumée</i> et correspond à un <i>Composant de Kontact</i>.
+ Comment[it]=Configurazione del plugin di posta elettronica <b>KMail</b> di Kontact, include una <i>vista sommario</i> e rappresenta un <i>componente Kontact</i>.
+ Comment[nds]=Kontact sien Nettpost-Moduul <b>KMail</b> instellen. Stellt en <i>Översicht-Indrag</i> praat un is en <i>Kontact-Komponent</i>.
+ Comment[nl]=Instellingen voor Kontacts e-mailplugin <b>KMail</b>. Bevat een <i>Overzichtsweergaveplugin</i> en een <i>Kontact-component</i>.
++Comment[pl]=Konfiguracja wtyczki poczty Kontaktu <b>KMail</b>, zawiera <i>element Podsumowanie</i> i jest <i>Składnikiem Kontaktu</i>.
++Comment[ru]=ÐаÑтройка Ð¼Ð¾Ð´ÑƒÐ»Ñ Ñлектронной почты <b>KMail</b> Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° в виде Ñводки.
+ Comment[sr]=Подешавање Kontact-овог прикључка за е-пошту преко <b>KMail-</b>, укључујући <i>приказ Ñажетка</i>, и дат као <i>компонента Kontact-а</i>.
+ Comment[sr at Latn]=PodeÅ¡avanje Kontact-ovog prikljuÄka za e-poÅ¡tu preko <b>KMail-</b>, ukljuÄujući <i>prikaz sažetka</i>, i dat kao <i>komponenta Kontact-a</i>.
+ Comment[sv]=Inställning av Kontacts e-postinsticksprogram <b>Kmail</b>, omfattar ett objekt för <i>översiktsvyn</i> och representerar en <i>Kontactkomponent</i>.
+@@ -97,6 +111,7 @@
+ Name[is]=Tengiliðir
+ Name[it]=Contatti
+ Name[ja]=コンタクト
++Name[ka]=კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბი
+ Name[kk]=Контакттар
+ Name[km]=ទំនាក់ទំនង
+ Name[lt]=Kontaktai
+@@ -122,9 +137,10 @@
+ Name[ta]=தொடரà¯à®ªà¯à®•à®³à¯
+ Name[tg]=Ðлоқот
+ Name[th]=ที่à¸à¸¢à¸¹à¹ˆà¸•à¸´à¸”ต่à¸
+-Name[tr]=Bağlantılar
++Name[tr]=KiÅŸiler
+ Name[uk]=Контакти
+-Name[uz]=Ðлоқалар
++Name[uz]=Aloqalar
++Name[uz at cyrillic]=Ðлоқалар
+ Name[zh_CN]=è”系人
+ Name[zh_TW]=è¯çµ¡äºº
+ Comment=Configuration of Kontact's Adress Book Plugin <b>KAdressbook</b> which represents a <i>Kontact Component</i>.
+@@ -134,9 +150,12 @@
+ Comment[de]=Einrichtung des Adressbuch-Moduls für Kontact, welches eine <i>Kontact-Komponente</i> repräsentiert.
+ Comment[el]=ΡÏθμιση του Ï€Ïόσθετου βιβλίου διευθÏνσεων <b>KAdressbook</b> του Kontact που αντιπÏοσωπεÏει Îνα <i>Συστατικό του Kontact</i>.
+ Comment[et]=Kontacti aadressiraamatu plugina <b>KAdressbook</b> seaditamine.
++Comment[fr]=Configuration du Module de Carnet d'Adresses de Kontact <b> KAdressbook</b> qui correspond à un <i>Composant de Kontact</i>.
+ Comment[it]=Configurazione del plugin rubrica di <b>KAddressbook</b> che rappresenta un <i>componente Kontact</i>.
+ Comment[nds]=Kontact sien Adressbook-Moduul <b>KAddressbook</b> instellende, dat en <i>Kontact-Komponent</i> is.
+ Comment[nl]=Instellingen voor Kontacts adresboekplugin <b>KMail</b>. Bevat een <i>Kontact-component</i>.
++Comment[pl]=Konfiguracja wtyczki książki adresowej Kontaktu <b>KAddressBook</b>, która jest <i>Składnikiem Kontaktu</i>.
++Comment[ru]=ÐаÑтройка Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð°Ð´Ñ€ÐµÑной книги <b>KAdressbook</b> Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° в виде Ñводки.
+ Comment[sr]=Подешавање Kontact-овог прикључка за адреÑар преко <b>KAdressbook</b> у облику <i>компоненте Kontact-а</i>.
+ Comment[sr at Latn]=PodeÅ¡avanje Kontact-ovog prikljuÄka za adresar preko <b>KAdressbook</b> u obliku <i>komponente Kontact-a</i>.
+ Comment[sv]=Inställning av Kontacts adressboksinsticksprogram <b>Kaddressbook</b>, som representerar en <i>Kontactkomponent</i>.
+@@ -169,6 +188,7 @@
+ Name[is]=Yfirlit sérstakra daga
+ Name[it]=Sommario date speciali
+ Name[ja]=特別ãªæ—¥ã®è¦ç´„
++Name[ka]=გáƒáƒœáƒ¡áƒáƒ™áƒ£áƒ—რებულ თáƒáƒ იღთრდáƒáƒ˜áƒ¯áƒ”სტი
+ Name[kk]=Ерекше күндер тұжырымы
+ Name[km]=សង្ážáŸáž”​ážáŸ’ងៃ​ពិសáŸážŸ
+ Name[lt]=Ypatingų dienų santrauka
+@@ -182,7 +202,7 @@
+ Name[pl]=Podsumowanie dat specjalnych
+ Name[pt]=Sumário de Datas Especiais
+ Name[pt_BR]=Resumo de Datas Especiais
+-Name[ru]=ДайджеÑÑ‚ оÑобых дат
++Name[ru]=Сводка оÑобых дат
+ Name[sk]=Súhrn špeciálnych dátumov
+ Name[sl]=Povzetek posebnih datumov
+ Name[sr]=Сажетак поÑебних датума
+@@ -216,6 +236,7 @@
+ Comment[is]=Yfirlitshluti sérstakra daga
+ Comment[it]=Componente sommario per le date speciali
+ Comment[ja]=特別ãªæ—¥ã®è¦ç´„コンãƒãƒ¼ãƒãƒ³ãƒˆ
++Comment[ka]=გáƒáƒœáƒáƒ™áƒ£áƒ—რებულ თáƒáƒ იღთრდáƒáƒ˜áƒ¯áƒ”სტის კáƒáƒ›áƒžáƒáƒœáƒ”ნტი
+ Comment[kk]=Ерекше күндер тұжырымының компоненті
+ Comment[km]=សមាសភាគ​សង្ážáŸáž”​នៃ​ážáŸ’ងៃ​ពិសáŸážŸ
+ Comment[lt]=Ypatingų dienų santraukos komponentas
+@@ -229,7 +250,7 @@
+ Comment[pl]=Składnik podsumowania dat specjalnych
+ Comment[pt]=Componente de Sumário de Datas Especiais
+ Comment[pt_BR]=Componente de Datas Especiais
+-Comment[ru]=Компонент дайджеÑта оÑобых дат
++Comment[ru]=Компонент Ñводки оÑобых дат
+ Comment[sk]=Komponent súhrnu špeciálnych dátumov
+ Comment[sl]=Komponenta za povzetke posebnih datumov
+ Comment[sr]=Компонента Ñажетка поÑебних датума
+@@ -273,6 +294,7 @@
+ Name[is]=Dagatal
+ Name[it]=Calendario
+ Name[ja]=カレンダー
++Name[ka]=კáƒáƒšáƒ”ნდáƒáƒ ი
+ Name[kk]=Күнтізбе
+ Name[km]=ប្រážáž·áž‘áž·áž“
+ Name[lt]=Kalendorius
+@@ -299,7 +321,8 @@
+ Name[th]=บันทึà¸à¸›à¸£à¸°à¸ˆà¸³à¸§à¸±à¸™
+ Name[tr]=Takvim
+ Name[uk]=Календар
+-Name[uz]=Календар
++Name[uz]=Kalendar
++Name[uz at cyrillic]=Календар
+ Name[zh_CN]=日历
+ Name[zh_TW]=行事曆
+ Comment=Configuration of Kontact's Calendar Plugin <b>KOrganizer</b>, includes a <i>Summary View Item</i> and represents a <i>Kontact Component</i>.
+@@ -309,9 +332,12 @@
+ Comment[de]=Einrichtung des Kalender-Moduls <b>KOrganizer</b> für Kontact, einschließlich der <i>Zusammenfassungsansicht</i>; repräsentiert eine <i>Kontact-Komponente</i>
+ Comment[el]=Η ÏÏθμιση του Ï€ÏοσθÎτου ημεÏολογίου του <b>KOrganizer</b> του Kontact, πεÏιÎχει Îνα <i>Αντικείμενο Ï€Ïοβολής σÏνοψης</i> και αντιπÏοσωπεÏει Îνα <i>Συστατικό του Kontact</i>.
+ Comment[et]=Kontacti kalendriplugina <b>KOrganizeri</b> seadistamine, mis sisaldab <i>kokkuvõttevaate elementi</i>.
++Comment[fr]=Configuration du Module de Calendrier de Kontact <b>KOrganizer</b>, inclut un <i>Élément de Vue Résumée</i> et correspond à un <i>Composant de Kontact</i>.
+ Comment[it]=Configurazione del plugin calendario <b>KOrganizer</b> di Kontact, include una <i>vista sommario</i> e rappresenta un <i>componente Kontact</i>.
+ Comment[nds]=Kontact sien Kalenner-Moduul <b>KOrganizer</b> instellen. Stellt en <i>Översicht-Indrag</i> praat un is en <i>Kontact-Komponent</i>.
+ Comment[nl]=Instellingen voor Kontacts agendaplugin <b>KOrganizer</b>. Bevat een <i>Overzichtsweergaveplugin</i> en een <i>Kontact-component</i>.
++Comment[pl]=Konfiguracja wtyczki kalendarza Kontaktu <b>KOrganizer</b>, zawiera <i>element Podsumowanie</i> i jest <i>Składnikiem Kontaktu</i>.
++Comment[ru]=ÐаÑтройка Ð¼Ð¾Ð´ÑƒÐ»Ñ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ñ <b>KOrganizer</b> Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° в виде Ñводки.
+ Comment[sr]=Подешавање Kontact-овог прикључка за календар преко <b>KOrganizer-а</b>, укључујући <i>приказ Ñажетка</i>, и дат као <i>компонента Kontact-а</i>.
+ Comment[sr at Latn]=PodeÅ¡avanje Kontact-ovog prikljuÄka za kalendar preko <b>KOrganizer-a</b>, ukljuÄujući <i>prikaz sažetka</i>, i dat kao <i>komponenta Kontact-a</i>.
+ Comment[sv]=Inställning av Kontacts kalenderinsticksprogram <b>Korganizer</b>, omfattar ett objekt för <i>översiktsvyn</i> och representerar en <i>Kontactkomponent</i>.
+@@ -349,6 +375,7 @@
+ Name[hu]=HÃrek
+ Name[is]=Fréttir
+ Name[ja]=ニュース
++Name[ka]=სიáƒáƒ®áƒšáƒ”ები
+ Name[kk]=Жаңалықтар
+ Name[km]=áž–áŸážáŸŒáž˜áž¶áž“
+ Name[lt]=Naujienos
+@@ -376,7 +403,8 @@
+ Name[th]=ข่าว
+ Name[tr]=Haberler
+ Name[uk]=Ðовини
+-Name[uz]=Янгиликлар
++Name[uz]=Yangiliklar
++Name[uz at cyrillic]=Янгиликлар
+ Name[zh_CN]=æ–°é—»
+ Name[zh_TW]=æ–°èž
+ Comment=Configuration of Kontact's News Plugin <b>KNode</b> which represents a <i>Kontact Component</i>.
+@@ -386,9 +414,12 @@
+ Comment[de]=Einrichtung des News-Moduls <b>KNode</b> für Kontact; repräsentiert eine <i>Kontact-Komponente</i>
+ Comment[el]=ΡÏθμιση του Ï€Ïόσθετου νÎων <b>KNode</b> του Kontact που αντιπÏοσωπεÏει Îνα <i>Συστατικό του Kontact</i>.
+ Comment[et]=Kontacti uudisteplugina <b>KNode</b> seadistamine.
++Comment[fr]=Configuration du Module de Nouvelles de Kontact <b>KNode</b> qui correspond à un <i>Composant de Kontact</i>.
+ Comment[it]=Configurazione del plugin notizie <b>KNode</b> di Kontact, che rappresenta un <i>componente Kontact</i>.
+ Comment[nds]=Kontact sien Narichten-Moduul <b>KNode</b> instellen, dat en <i>Kontact-Komponent</i> is.
+ Comment[nl]=Instellingen voor Kontacts nieuwsplugin <b>KNode</b>. Bevat een <i>Kontact-component</i>.
++Comment[pl]=Konfiguracja wtyczki wiadomości Kontaktu <b>KNode</b>, która jest <i>składnikiem Kontaktu</i>.
++Comment[ru]=ÐаÑтройка Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð½Ð¾Ð²Ð¾Ñтей <b>KNode</b> Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° в виде Ñводки.
+ Comment[sr]=Подешавање Kontact-овог прикључка за веÑти преко <b>KNode-а</b> у облику <i>компненте Kontact-а</i>.
+ Comment[sr at Latn]=PodeÅ¡avanje Kontact-ovog prikljuÄka za vesti preko <b>KNode-a</b> u obliku <i>kompnente Kontact-a</i>.
+ Comment[sv]=Inställning av Kontacts nyhetsinsticksprogram <b>Knode</b>, som representerar en <i>Kontactkomponent</i>.
+@@ -427,6 +458,7 @@
+ Name[is]=Veður
+ Name[it]=Tempo meteorologico
+ Name[ja]=æ°—è±¡æƒ…å ±
++Name[ka]=áƒáƒ›áƒ˜áƒœáƒ“ი
+ Name[kk]=Ðуа райы
+ Name[km]=អាកាសធាážáž»
+ Name[lt]=Orų pranešėjas
+@@ -453,7 +485,8 @@
+ Name[th]=รายงานà¸à¸²à¸à¸²à¸¨
+ Name[tr]=Hava Durumu
+ Name[uk]=Погода
+-Name[uz]=Об-ҳаво
++Name[uz]=Ob-havo
++Name[uz at cyrillic]=Об-ҳаво
+ Name[zh_CN]=天气
+ Name[zh_TW]=天氣
+ Comment=Weather Information Component
+@@ -463,13 +496,17 @@
+ Comment[de]=Komponente für Wetterinformationen
+ Comment[el]=Συστατικό πληÏοφοÏιών καιÏοÏ
+ Comment[et]=Ilmateate komponent
++Comment[fr]=Composant d'Informations météorologiques
+ Comment[it]=Informazioni meteorologiche
+ Comment[ja]=æ°—è±¡æƒ…å ±ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆ
+ Comment[nds]=Wederinformatschonen-Komponent
+ Comment[nl]=Weerinformatiecomponent
++Comment[pl]=Składnik informacji o pogodzie
++Comment[ru]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ погоде
+ Comment[sr]=Компонента информација о времену
+ Comment[sr at Latn]=Komponenta informacija o vremenu
+ Comment[sv]=Komponent med väderrapport
++Comment[tr]=Hava Durumu Bilgisi BileÅŸeni
+ Comment[zh_CN]=天气信æ¯ç»„件
+ Comment[zh_TW]=天氣資訊組件
+ Weight=1000
+@@ -502,6 +539,7 @@
+ Name[is]=Fréttastrimill
+ Name[it]=Ticker notizie
+ Name[ja]=ニュースティッカー
++Name[ka]=სიáƒáƒ®áƒšáƒ”თრტიკერი
+ Name[kk]=Жаңалық таÑпаÑÑ‹
+ Name[km]=កម្មវិធី​ទទួល​ពáŸážáŸŒáž˜áž¶áž“
+ Name[lt]=News pranešėjas
+@@ -553,6 +591,7 @@
+ Comment[is]=Fréttastrimilshluti
+ Comment[it]=Ticker notizie
+ Comment[ja]=ニュースティッカーコンãƒãƒ¼ãƒãƒ³ãƒˆ
++Comment[ka]=სიáƒáƒ®áƒšáƒ”თრტიკერის კáƒáƒ›áƒžáƒáƒœáƒ”ნტი
+ Comment[kk]=Жаңалық таÑпаÑының компоненті
+ Comment[km]=សមាសភាគ​កម្មវិធី​ទទួល​ពáŸážáŸŒáž˜áž¶áž“
+ Comment[lt]=Naujienų pranešėjo komponentas
+Index: kontact/src/Kontact.desktop
+===================================================================
+--- kontact/src/Kontact.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kontact/src/Kontact.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -37,6 +37,7 @@
+ GenericName[is]=Persónulegur upplýsingastjórnandi
+ GenericName[it]=Gestione informazioni personali
+ GenericName[ja]=å€‹äººæƒ…å ±ãƒžãƒãƒ¼ã‚¸ãƒ£
++GenericName[ka]=პირáƒáƒ“ი ინფáƒáƒ მáƒáƒªáƒ˜áƒ˜áƒ¡ მმáƒáƒ თველი
+ GenericName[kk]=Ð”ÐµÑ€Ð±ÐµÑ Ðқпарат Менеджері
+ GenericName[km]=កម្មវិធី​គ្រប់គ្រង​ពáŸážáŸŒáž˜áž¶áž“​ផ្ទាល់​ážáŸ’លួន
+ GenericName[lt]=AsmeninÄ—s informacijos tvarkyklÄ—
+@@ -61,7 +62,8 @@
+ GenericName[tg]=Мудири маълумоти шахÑÓ£
+ GenericName[tr]=Kişisel Bilgi Yöneticisi
+ GenericName[uk]=Менеджер оÑобиÑтої інформації
+-GenericName[uz]=ШахÑий маълумот бошқарувчиÑи
++GenericName[uz]=Shaxsiy maʼlumot boshqaruvchisi
++GenericName[uz at cyrillic]=ШахÑий маълумот бошқарувчиÑи
+ GenericName[zh_CN]=个人信æ¯ç®¡ç†å™¨
+ GenericName[zh_TW]=個人資訊管ç†è€…
+ Terminal=false
+Index: kandy/src/kandy.desktop
+===================================================================
+--- kandy/src/kandy.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kandy/src/kandy.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -25,6 +25,7 @@
+ Comment[is]=Tól sem samstillir vistfangagögn við farsÃma
+ Comment[it]=Strumento per sincronizzare i dati della rubrica indirizzi con i telefoni cellulari
+ Comment[ja]=アドレス帳ã®ãƒ‡ãƒ¼ã‚¿ã‚’æºå¸¯é›»è©±ã¨åŒæœŸã™ã‚‹ãŸã‚ã®ãƒ„ール
++Comment[ka]=მáƒáƒ‘ილურტელეფáƒáƒœáƒ—áƒáƒœ წიგნáƒáƒ™áƒ˜áƒ¡ მáƒáƒœáƒáƒªáƒ”მების სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡ ხელსáƒáƒ¬áƒ§áƒ
+ Comment[kk]=ÐдреÑтік кітапшаны қалта телефонмен қадамдаÑтыру құралы
+ Comment[km]=ឧបករណáŸâ€‹ážŸáž˜áŸ’រាប់​ធ្វើ​សមកាលកម្ម​ទិន្ននáŸáž™â€‹ážŸáŸ€ážœáž—ៅ​អាសយដ្ឋាន​ជាមួយ​នឹង​ទូរសáŸáž–្ទ​ចលáŸáž
+ Comment[lt]=Įrankis adresų knygelės sinchronizavimui su mobiliaisiais telefonais
+@@ -79,6 +80,7 @@
+ GenericName[is]=FarsÃmatól
+ GenericName[it]=Strumento per i telefoni cellulari
+ GenericName[ja]=æºå¸¯é›»è©±ãƒ„ール
++GenericName[ka]=მáƒáƒ‘ილურტელეფáƒáƒœáƒ—áƒáƒœ სáƒáƒ›áƒ£áƒ¨áƒáƒ ხელსáƒáƒ¬áƒ§áƒ
+ GenericName[kk]=Қалта телефон құралы
+ GenericName[km]=ឧបករណáŸâ€‹áž‘ូរសáŸáž–្ទ​ចលáŸáž
+ GenericName[lt]=Mobilaus telefono įrankis
+@@ -107,7 +109,8 @@
+ GenericName[th]=เครื่à¸à¸‡à¸¡à¸·à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¹‚ทรศัพท์เคลื่à¸à¸™à¸—ี่
+ GenericName[tr]=Cep Telefonu Aracı
+ GenericName[uk]=ЗаÑіб Ð´Ð»Ñ Ð¼Ð¾Ð±Ñ–Ð»ÑŒÐ½Ð¸Ñ… телефонів
+-GenericName[uz]=УÑли телефон учун воÑита
++GenericName[uz]=Uyali telefon uchun vosita
++GenericName[uz at cyrillic]=УÑли телефон учун воÑита
+ GenericName[ven]=Tshishumiswa tsha lutingo thendeleki
+ GenericName[vi]=Công cụ điện thoại di động
+ GenericName[xh]=Isixhobo Semfono-mfono Ekuhanjwa nayo
+Index: ktnef/gui/ktnef.desktop
+===================================================================
+--- ktnef/gui/ktnef.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ ktnef/gui/ktnef.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -26,6 +26,7 @@
+ GenericName[is]=TNEF skráarskoðari
+ GenericName[it]=Visualizzatore file TNEF
+ GenericName[ja]=TNEF ファイルビュー
++GenericName[ka]=TNEF ფáƒáƒ˜áƒšáƒ”ბის დáƒáƒ›áƒ—ვáƒáƒšáƒ˜áƒ”რებელი
+ GenericName[kk]=TNEF файлды қарау құралы
+ GenericName[km]=កម្មវិធី​មើល​ឯកសារ TNEF
+ GenericName[lt]=TNEF bylų žiūryklė
+@@ -78,6 +79,7 @@
+ Comment[is]=Sýnir/lesari fyrir TNEF skrár
+ Comment[it]=Un visualizzatore/estrattore di file TNEF
+ Comment[ja]=TNEF ファイルã®ãŸã‚ã®ãƒ“ューア/展開ツール
++Comment[ka]= TNEF ფáƒáƒ˜áƒšáƒ”ბის ექსტრáƒáƒ¥áƒ¢áƒáƒ ი/დáƒáƒ›áƒ—ვáƒáƒšáƒ˜áƒ”რებელი
+ Comment[kk]=TNEF файдарды қарау/тарқату
+ Comment[km]=កម្មវិធី​មើល និង​ស្រង់​ឯកសារ TNEF
+ Comment[lt]=TNEF bylų žiūryklė - išpakuotojas
+Index: ktnef/gui/ms-tnef.desktop
+===================================================================
+--- ktnef/gui/ms-tnef.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ ktnef/gui/ms-tnef.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -31,6 +31,7 @@
+ Comment[is]=TNEF skrá
+ Comment[it]=File TNEF
+ Comment[ja]=TNEF ファイル
++Comment[ka]=TNEF ფáƒáƒ˜áƒšáƒ˜
+ Comment[kk]=TNEF файлы
+ Comment[km]=ឯកសារ TNEF
+ Comment[lt]=TNEF byla
+@@ -55,6 +56,7 @@
+ Comment[tg]=Файли TNEF
+ Comment[tr]=TNEF Dosyası
+ Comment[uk]=Файл TNEF
+-Comment[uz]=TNEF-файли
++Comment[uz]=TNEF-fayli
++Comment[uz at cyrillic]=TNEF-файли
+ Comment[zh_CN]=TNEF 文件
+ Comment[zh_TW]=TNEF 檔案
+Index: kfile-plugins/rfc822/kfile_rfc822.desktop
+===================================================================
+--- kfile-plugins/rfc822/kfile_rfc822.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kfile-plugins/rfc822/kfile_rfc822.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -28,6 +28,7 @@
+ Name[is]=Tölvupóst upplýsingar
+ Name[it]=Informazioni di posta elettronica
+ Name[ja]=Eメール æƒ…å ±
++Name[ka]=ელფáƒáƒ¡áƒ¢áƒ˜áƒ¡ ინფáƒáƒ მáƒáƒªáƒ˜áƒ
+ Name[kk]=Ðл.пошта мәліметі
+ Name[km]=áž–áŸážáŸŒáž˜áž¶áž“​អ៊ីមែល
+ Name[lt]=E. pašto info
+Index: kfile-plugins/ics/kfile_ics.desktop
+===================================================================
+--- kfile-plugins/ics/kfile_ics.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kfile-plugins/ics/kfile_ics.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[is]=ICS upplýsingar
+ Name[it]=Informazioni ICS
+ Name[ja]=ICS æƒ…å ±
++Name[ka]=ICS ინფáƒáƒ მáƒáƒªáƒ˜áƒ
+ Name[kk]=ICS ақпараты
+ Name[km]=áž–áŸážáŸŒáž˜áž¶áž“ ICS
+ Name[lt]=ICS informacija
+Index: kfile-plugins/palm-databases/kfile_palm.desktop
+===================================================================
+--- kfile-plugins/palm-databases/kfile_palm.desktop.orig 2008-02-13 10:39:52.000000000 +0100
++++ kfile-plugins/palm-databases/kfile_palm.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=PalmOS gagnagrunnsupplýsingar
+ Name[it]=Informazioni database PalmOs
+ Name[ja]=PalmOS データベース æƒ…å ±
++Name[ka]=PalmOS-ს მáƒáƒœáƒáƒªáƒ”მთრბáƒáƒ–ის ინფáƒáƒ მáƒáƒªáƒ˜áƒ
+ Name[kk]=PalmOS деректер қорының мәліметі
+ Name[km]=áž–áŸážáŸŒáž˜áž¶áž“​មូលដ្ឋាន​ទិន្ននáŸáž™ PalmOS
+ Name[lt]=PalmOS duomenų bazės info
+Index: kfile-plugins/vcf/kfile_vcf.desktop
+===================================================================
+--- kfile-plugins/vcf/kfile_vcf.desktop.orig 2007-05-14 09:54:53.000000000 +0200
++++ kfile-plugins/vcf/kfile_vcf.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -27,6 +27,7 @@
+ Name[is]=vCard upplýsingar
+ Name[it]=Informazioni vCard
+ Name[ja]=vCard æƒ…å ±
++Name[ka]=vCard ინფáƒáƒ მáƒáƒªáƒ˜áƒ
+ Name[kk]=vCard мәліметі
+ Name[km]=áž–áŸážáŸŒáž˜áž¶áž“ vCard
+ Name[lt]=vCard informacija
+Index: korganizer/korganizer_configfonts.desktop
+===================================================================
+--- korganizer/korganizer_configfonts.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configfonts.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -43,6 +43,7 @@
+ Name[is]=Letur
+ Name[it]=Tipi di carattere
+ Name[ja]=フォント
++Name[ka]=შრიფტები
+ Name[kk]=Қаріптері
+ Name[km]=ពុម្ពអក្សរ
+ Name[lt]=Å riftai
+@@ -71,7 +72,8 @@
+ Name[th]=รูปà¹à¸šà¸šà¸•à¸±à¸§à¸à¸±à¸à¸©à¸£
+ Name[tr]=Yazı tipleri
+ Name[uk]=Шрифти
+-Name[uz]=Шрифтлар
++Name[uz]=Shriftlar
++Name[uz at cyrillic]=Шрифтлар
+ Name[ven]=Fontu
+ Name[vi]=Phông
+ Name[xh]=Ubungakanani bamagama
+@@ -104,6 +106,7 @@
+ Comment[is]=KOrganizer leturstillingar
+ Comment[it]=Configurazione font di KOrganizer
+ Comment[ja]=KOrganizer フォントè¨å®š
++Comment[ka]=KOrganizer შრიფტთრკáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer-дің қаріптер параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ពុម្ពអក្សរ KOrganizer
+ Comment[lt]=KOrganizer šriftų konfigūravimas
+@@ -159,6 +162,7 @@
+ Keywords[is]=korganizer,letur
+ Keywords[it]=korganizer,font
+ Keywords[ja]=korganizer,フォント
++Keywords[ka]=korganizer,შრიფტები
+ Keywords[km]=korganizer,ពុម្ពអក្សរ
+ Keywords[lt]=korganizer,fonts, Å¡riftai
+ Keywords[mk]=korganizer,fonts,корганизатор,фонтови
+@@ -182,5 +186,6 @@
+ Keywords[tg]=korganizer,fonts,органайзер,ҳуруфҳо
+ Keywords[tr]=korganizer,yazıtipleri
+ Keywords[uk]=korganizer,шрифти
+-Keywords[uz]=korganizer,органайзер,шрифтлар
++Keywords[uz]=korganizer,organayzer,shriftlar
++Keywords[uz at cyrillic]=korganizer,органайзер,шрифтлар
+ Keywords[zh_CN]=korganizer,fonts,å—体
+Index: korganizer/koeditorgeneralevent.h
+===================================================================
+--- korganizer/koeditorgeneralevent.h.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koeditorgeneralevent.h 2008-06-29 20:10:37.000000000 +0200
+@@ -67,6 +67,8 @@
+
+ void updateRecurrenceSummary( const QString &summary );
+
++ QFrame* invitationBar() const { return mInvitationBar; }
++
+ public slots:
+ void setDateTimes( const QDateTime &start, const QDateTime &end );
+ void setDuration();
+Index: korganizer/korganizer_configplugins.desktop
+===================================================================
+--- korganizer/korganizer_configplugins.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configplugins.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -38,6 +38,7 @@
+ Name[is]=Ãforrit
+ Name[it]=Plugin
+ Name[ja]=プラグイン
++Name[ka]=მáƒáƒ“ულები
+ Name[kk]=Плагин модульдері
+ Name[km]=កម្មវិធី​ជំនួយ
+ Name[lt]=Priedai
+@@ -59,7 +60,8 @@
+ Name[ta]=சொரà¯à®•à¯à®ªà¯à®ªà¯Šà®°à¯à®³à¯à®•à®³à¯
+ Name[tr]=Eklentiler
+ Name[uk]=Втулки
+-Name[uz]=Плагинлар
++Name[uz]=Plaginlar
++Name[uz at cyrillic]=Плагинлар
+ Name[zh_CN]=æ’件
+ Name[zh_TW]=外掛程å¼
+ Comment=KOrganizer Plugin Configuration
+@@ -86,6 +88,7 @@
+ Comment[is]=Stillingar KOrganizer Ãforrita
+ Comment[it]=Configurazione plugin KOrganizer
+ Comment[ja]=KOrganizer プラグインè¨å®š
++Comment[ka]=KOrganizer მáƒáƒ“ულების კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer-дің плагин модульдерінің параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​កម្មវិធី​ជំនួយ KOrganizer
+ Comment[lt]=KOrganizer priedų konfigūravimas
+@@ -131,6 +134,7 @@
+ Keywords[is]=korganizer,Ãforrit,eining
+ Keywords[it]=korganizer,plugin,modulo
+ Keywords[ja]=korganizer,プラグイン,モジュール
++Keywords[ka]=korganizer,მáƒáƒ“ული
+ Keywords[km]=korganizer,កម្មវិធី​ជំនួយ,ម៉ូឌុល
+ Keywords[lt]=korganizer,plugin,module,modulis,priedas
+ Keywords[mk]=korganizer,plugin,module,корганизатор,приклучок,приклучоци,модул.модули
+Index: korganizer/koeventview.cpp
+===================================================================
+--- korganizer/koeventview.cpp.orig 2005-09-10 10:24:47.000000000 +0200
++++ korganizer/koeventview.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -71,6 +71,8 @@
+ SIGNAL(cutIncidenceSignal(Incidence *)));
+ connect(eventPopup,SIGNAL(copyIncidenceSignal(Incidence *)),
+ SIGNAL(copyIncidenceSignal(Incidence *)));
++ connect(eventPopup,SIGNAL(pasteIncidenceSignal()),
++ SIGNAL(pasteIncidenceSignal()));
+ connect(eventPopup,SIGNAL(toggleAlarmSignal(Incidence *)),
+ SIGNAL(toggleAlarmSignal(Incidence*)));
+ connect(eventPopup,SIGNAL(dissociateOccurrenceSignal( Incidence *, const QDate & )),
+Index: korganizer/korganizer_configtime.desktop
+===================================================================
+--- korganizer/korganizer_configtime.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configtime.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -41,6 +41,7 @@
+ Name[is]=TÃmi og dagsetning
+ Name[it]=Data e ora
+ Name[ja]=日付ã¨æ™‚é–“
++Name[ka]=დრრდრთáƒáƒ იღი
+ Name[kk]=Уақыт пен Күн
+ Name[km]=កាលបរិច្ឆáŸáž‘ & áž–áŸáž›ážœáŸáž›áž¶
+ Name[lt]=Laikas ir data
+@@ -66,7 +67,8 @@
+ Name[tg]=Сана ва вақт
+ Name[tr]=Saat & Tarih
+ Name[uk]=Ð§Ð°Ñ Ñ‚Ð° дата
+-Name[uz]=Сана ва вақт
++Name[uz]=Sana va vaqt
++Name[uz at cyrillic]=Сана ва вақт
+ Name[zh_CN]=时间和日期
+ Name[zh_TW]=時間與日期
+ Comment=KOrganizer Time Configuration
+@@ -96,6 +98,7 @@
+ Comment[is]=KOrganizer tÃmastillingar
+ Comment[it]=Configurazione data di KOrganizer
+ Comment[ja]=KOrganizer 時間è¨å®š
++Comment[ka]=KOrganizer დრáƒáƒ˜áƒ¡ კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer-дің уақыт параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ពáŸáž›ážœáŸáž›áž¶â€‹ážšáž”ស់ KOrganizer
+ Comment[lt]=KOrganizer laiko konfigūravimas
+@@ -149,6 +152,7 @@
+ Keywords[is]=korganizer,tÃmi
+ Keywords[it]=korganizer,data,ora
+ Keywords[ja]=korganizer,時間
++Keywords[ka]=korganizer,დრáƒ
+ Keywords[km]=korganizer,áž–áŸáž›ážœáŸáž›áž¶
+ Keywords[lt]=korganizer,time,laikas
+ Keywords[mk]=korganizer,time,корганизатор,датум,време
+@@ -172,5 +176,6 @@
+ Keywords[tg]=korganizer,time,органайзер,вақт
+ Keywords[tr]=korganizer,zaman
+ Keywords[uk]=korganizer,чаÑ,дата
+-Keywords[uz]=korganizer,органайзер,Ñана,вақт
++Keywords[uz]=korganizer,organayzer,sana,vaqt
++Keywords[uz at cyrillic]=korganizer,органайзер,Ñана,вақт
+ Keywords[zh_CN]=korganizer,time,时间
+Index: korganizer/koeditorgeneral.cpp
+===================================================================
+--- korganizer/koeditorgeneral.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koeditorgeneral.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -304,6 +304,12 @@
+ mAlarmEditButton->setEnabled( enable );
+ }
+
++
++void KOEditorGeneral::toggleAlarm( bool on )
++{
++ mAlarmButton->setChecked( on );
++}
++
+ void KOEditorGeneral::setCategories( const QStringList &categories )
+ {
+ mCategoriesLabel->setText( categories.join(",") );
+Index: korganizer/koeventeditor.cpp
+===================================================================
+--- korganizer/koeventeditor.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koeventeditor.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -59,7 +59,8 @@
+
+ KOEventEditor::~KOEventEditor()
+ {
+- emit dialogClose( mEvent );
++ if ( !mIsCounter )
++ emit dialogClose( mEvent );
+ }
+
+ void KOEventEditor::init()
+@@ -284,7 +285,14 @@
+ kdDebug(5850) << "Event changed\n";
+ //IncidenceChanger::assignIncidence( mEvent, event );
+ writeEvent( mEvent );
+- mChanger->changeIncidence( oldEvent, mEvent, -1, mIsCounter );
++ if ( mIsCounter ) {
++ Event *event = mEvent->clone();
++ event->clearAttendees();
++ event->setSummary( i18n("My counter proposal for: %1").arg( mEvent->summary() ) );
++ mChanger->changeIncidence( oldEvent, event, -1, mIsCounter );
++ } else {
++ mChanger->changeIncidence( oldEvent, mEvent, -1, mIsCounter );
++ }
+ }
+ delete event;
+ delete oldEvent;
+@@ -312,7 +320,6 @@
+ kdDebug(5850) << "KOEventEditor::processCancel()" << endl;
+
+ if ( mFreeBusy ) mFreeBusy->cancelReload();
+- if ( mIsCounter ) deleteEvent();
+ }
+
+ void KOEventEditor::deleteEvent()
+@@ -337,6 +344,9 @@
+
+ createEmbeddedURLPages( event );
+ readDesignerFields( event );
++
++ if ( mIsCounter )
++ mGeneral->invitationBar()->hide();
+ }
+
+ void KOEventEditor::writeEvent( Event *event )
+@@ -406,4 +416,11 @@
+ delete ev;
+ }
+
++void KOEventEditor::selectInvitationCounterProposal(bool enable)
++{
++ KOIncidenceEditor::selectInvitationCounterProposal( enable );
++ if ( enable )
++ mGeneral->invitationBar()->hide();
++}
++
+ #include "koeventeditor.moc"
+Index: korganizer/koeditorfreebusy.cpp
+===================================================================
+--- korganizer/koeditorfreebusy.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koeditorfreebusy.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -254,13 +254,6 @@
+ connect( button, SIGNAL( clicked() ), SLOT( slotCenterOnStart() ) );
+ controlLayout->addWidget( button );
+
+- button = new QPushButton( i18n( "Zoom to Fit" ), this );
+- QWhatsThis::add( button,
+- i18n("Zooms the Gantt chart so that you can see the "
+- "entire duration of the event on it.") );
+- connect( button, SIGNAL( clicked() ), SLOT( slotZoomToTime() ) );
+- controlLayout->addWidget( button );
+-
+ controlLayout->addStretch( 1 );
+
+ button = new QPushButton( i18n( "Pick Date" ), this );
+@@ -294,7 +287,7 @@
+ }
+ mGanttView->setHeaderVisible( true );
+ mGanttView->setScale( KDGanttView::Hour );
+- mGanttView->setShowHeaderPopupMenu( true, true, true, false, false, true );
++ mGanttView->setShowHeaderPopupMenu( false, false, false, false, false, false );
+ // Initially, show 15 days back and forth
+ // set start to even hours, i.e. to 12:AM 0 Min 0 Sec
+ QDateTime horizonStart = QDateTime( QDateTime::currentDateTime()
+Index: korganizer/korganizer_configgroupscheduling.desktop
+===================================================================
+--- korganizer/korganizer_configgroupscheduling.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configgroupscheduling.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -36,6 +36,7 @@
+ Name[is]=Hópáætlun
+ Name[it]=Programmazione gruppi
+ Name[ja]=グループスケジューリング
++Name[ka]=ჯგუფის დáƒáƒ’ეგმვáƒ
+ Name[kk]=Топтың жұмыÑын жоÑпарлау
+ Name[km]=រៀបចំ​កាលវិភាគ​ក្រុម
+ Name[lt]=Grupių tvarkaraÅ¡Äių tvarkymas
+@@ -87,6 +88,7 @@
+ Comment[is]=Stillingar fyrir KOrganizer hópáætlun
+ Comment[it]=Configurazione del programmatore gruppi di KOrganizer
+ Comment[ja]=KOrganizer グループスケジューリングè¨å®š
++Comment[ka]=KOrganizer გჯუფის დáƒáƒ’ეგმვის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer топтық жұмыÑÑ‚Ñ‹ жоÑпрлаудың параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ការ​រៀបចំ​កាលវិភាគ​ក្រុម​របស់ KOrganizer
+ Comment[lt]=KOrganizer grupių tvarkaraÅ¡Äių tvarkymo konfigÅ«ravimas
+@@ -134,6 +136,7 @@
+ Keywords[is]=korganizer,hóp,áætlun
+ Keywords[it]=korganizer,gruppo,programmazione
+ Keywords[ja]=korganizer,グループ,スケジューリング
++Keywords[ka]=korganizer,გჯუფი,დáƒáƒ’ეგმვáƒ
+ Keywords[km]=korganizer,ក្រុម,កាលវិភាគ
+ Keywords[lt]=korganizer,group,scheduling,tvarkaraštis, grupė
+ Keywords[mk]=korganizer,group,scheduling,корганизатор,група,групи,закажување
+Index: korganizer/koeditorgeneral.h
+===================================================================
+--- korganizer/koeditorgeneral.h.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koeditorgeneral.h 2008-06-29 20:10:37.000000000 +0200
+@@ -86,6 +86,7 @@
+ bool validateInput() { return true; }
+
+ void enableAlarm( bool enable );
++ void toggleAlarm( bool on );
+
+ void setSummary( const QString & );
+ void setDescription( const QString & );
+Index: korganizer/timelineitem.cpp
+===================================================================
+--- korganizer/timelineitem.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/timelineitem.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -119,13 +119,13 @@
+ y = coordY;
+ else
+ y = getCoordY();
+- int startX = myGanttView->myTimeHeader->getCoordX(myStartTime);
+- int endX = myGanttView->myTimeHeader->getCoordX(myEndTime);
++ int startX = myGanttView->timeHeaderWidget()->getCoordX(myStartTime);
++ int endX = myGanttView->timeHeaderWidget()->getCoordX(myEndTime);
+
+ const int mw = QMAX( 1, QMIN( 4, endX - startX ) );
+ if ( !mLeft || mw != mMarkerWidth ) {
+ if ( !mLeft ) {
+- mLeft = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
++ mLeft = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
+ mLeft->setBrush( Qt::black );
+ }
+ QPointArray a = QPointArray( 4 );
+@@ -137,7 +137,7 @@
+ }
+ if ( !mRight || mw != mMarkerWidth ) {
+ if ( !mRight ) {
+- mRight = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
++ mRight = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
+ mRight->setBrush( Qt::black );
+ }
+ QPointArray a = QPointArray( 4 );
+Index: korganizer/koeventeditor.h
+===================================================================
+--- korganizer/koeventeditor.h.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koeventeditor.h 2008-06-29 20:10:37.000000000 +0200
+@@ -93,6 +93,8 @@
+
+ QObject *typeAheadReceiver() const;
+
++ void selectInvitationCounterProposal( bool enable );
++
+ signals:
+ void focusReceivedSignal();
+
+Index: korganizer/calendarview.h
+===================================================================
+--- korganizer/calendarview.h.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/calendarview.h 2008-06-29 20:10:37.000000000 +0200
+@@ -302,6 +302,11 @@
+ Copies the selected incidence using the edit_copy() method
+ */
+ void copyIncidence( Incidence *);
++ /**
++ Pastes the curren incidence using the edit_paste() method
++ */
++ void pasteIncidence();
++
+ /** Delete the supplied todo and all sub-todos */
+ void deleteSubTodosIncidence ( Todo *todo );
+ /**
+Index: korganizer/korgac/korgac.desktop
+===================================================================
+--- korganizer/korgac/korgac.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/korgac/korgac.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -23,6 +23,7 @@
+ Name[is]=Ãminningarforrit fyrir KOrganizer
+ Name[it]=Client degli avvisi di KOrganizer
+ Name[ja]=KOrganizer リマインダクライアント
++Name[ka]=KOrganizer შემხსენებელის კლიენტი
+ Name[kk]=KOrganizer-дің еÑке Ñалу клиенті
+ Name[km]=កម្មវិធី​រំលឹក​របស់ KOrganizer
+ Name[lt]=KOrganizer priminimų klientas
+@@ -69,6 +70,7 @@
+ GenericName[is]=Ãminningarpúki fyrir KOrganizer
+ GenericName[it]=Client del demone degli avvisi di KOrganizer
+ GenericName[ja]=KOrganizer リマインダデーモンクライアント
++GenericName[ka]=KOrganizer შემხსენებელის დემáƒáƒœáƒ˜áƒ¡ კლიენტი
+ GenericName[kk]=Organizer-дің еÑке Ñалу қызметінің клиенті
+ GenericName[km]=កម្មវិធី​ដáŸáž˜áž·áž“​អ្នក​រំលឹក​របស់ KOrganizer
+ GenericName[lt]=KOrganizer priminimų tarnybos klientas
+Index: korganizer/multiagendaview.cpp
+===================================================================
+--- korganizer/multiagendaview.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/multiagendaview.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -112,6 +112,8 @@
+ SIGNAL(cutIncidenceSignal(Incidence*)) );
+ connect( agenda, SIGNAL(copyIncidenceSignal(Incidence*)),
+ SIGNAL(copyIncidenceSignal(Incidence*)) );
++ connect( agenda, SIGNAL(pasteIncidenceSignal()),
++ SIGNAL(pasteIncidenceSignal()) );
+ connect( agenda, SIGNAL(toggleAlarmSignal(Incidence*)),
+ SIGNAL(toggleAlarmSignal(Incidence*)) );
+ connect( agenda, SIGNAL(dissociateOccurrenceSignal(Incidence*, const QDate&)),
+Index: korganizer/koeventpopupmenu.h
+===================================================================
+--- korganizer/koeventpopupmenu.h.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koeventpopupmenu.h 2008-06-29 20:10:37.000000000 +0200
+@@ -51,6 +51,7 @@
+ protected slots:
+ void popupShow();
+ void popupEdit();
++ void popupPaste();
+ void print();
+ void popupDelete();
+ void popupCut();
+@@ -66,6 +67,7 @@
+ void deleteIncidenceSignal(Incidence *);
+ void cutIncidenceSignal(Incidence *);
+ void copyIncidenceSignal(Incidence *);
++ void pasteIncidenceSignal();
+ void toggleAlarmSignal(Incidence *);
+ void dissociateOccurrenceSignal( Incidence *, const QDate & );
+ void dissociateFutureOccurrenceSignal( Incidence *, const QDate & );
+Index: korganizer/interfaces/calendar/calendarplugin.desktop
+===================================================================
+--- korganizer/interfaces/calendar/calendarplugin.desktop.orig 2007-10-08 11:50:53.000000000 +0200
++++ korganizer/interfaces/calendar/calendarplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -31,6 +31,7 @@
+ Comment[is]=Dagatals Ãforrit
+ Comment[it]=Plugin calendario
+ Comment[ja]=カレンダープラグイン
++Comment[ka]=კáƒáƒšáƒ”ნდრის მáƒáƒ“ული
+ Comment[kk]=Күнтізбе модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​ប្រážáž·áž‘áž·áž“
+ Comment[ko]=ë‹¬ë ¥ 플러그ì¸
+@@ -61,7 +62,8 @@
+ Comment[th]=โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡à¸šà¸±à¸™à¸—ึà¸à¸›à¸£à¸°à¸ˆà¸³à¸§à¸±à¸™
+ Comment[tr]=Takvim Eklentisi
+ Comment[uk]=Втулок календарÑ
+-Comment[uz]=Календар плагини
++Comment[uz]=Kalendar plagini
++Comment[uz at cyrillic]=Календар плагини
+ Comment[ven]=U pulaga ha khalenda
+ Comment[vi]=Plugin lịch
+ Comment[xh]=Ikhalenda ye Plugin
+Index: korganizer/interfaces/calendar/calendardecoration.desktop
+===================================================================
+--- korganizer/interfaces/calendar/calendardecoration.desktop.orig 2007-10-08 11:50:53.000000000 +0200
++++ korganizer/interfaces/calendar/calendardecoration.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -29,6 +29,7 @@
+ Comment[is]=Ãforrit til að skreyta texta dagatals
+ Comment[it]=Plugin di decorazione del calendario
+ Comment[ja]=カレンダー装飾プラグイン
++Comment[ka]=კáƒáƒšáƒ”ნდრის გáƒáƒ¤áƒáƒ მების მáƒáƒ“ული
+ Comment[kk]=Күнтізбені безендіру модулі
+ Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់​ážáž»áž”ážáŸ‚ង​ប្រážáž·áž‘áž·áž“
+ Comment[lt]=vCalendar dekoracijų priedas
+Index: korganizer/interfaces/korganizer/korgprintplugin.desktop
+===================================================================
+--- korganizer/interfaces/korganizer/korgprintplugin.desktop.orig 2007-05-14 09:54:30.000000000 +0200
++++ korganizer/interfaces/korganizer/korgprintplugin.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -26,6 +26,7 @@
+ Comment[is]=KOrganizer hluti
+ Comment[it]=Parte di KOrganizer
+ Comment[ja]=KOrganizer パート
++Comment[ka]=KOrganizer კáƒáƒ›áƒžáƒáƒœáƒ”ნტი
+ Comment[kk]=KOrganizer бөлшегі
+ Comment[km]=ផ្នែក​របស់ KOrganizer
+ Comment[lt]=KOrganizer dalis
+Index: korganizer/interfaces/korganizer/korganizerpart.desktop
+===================================================================
+--- korganizer/interfaces/korganizer/korganizerpart.desktop.orig 2007-05-14 09:54:30.000000000 +0200
++++ korganizer/interfaces/korganizer/korganizerpart.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -26,6 +26,7 @@
+ Comment[is]=KOrganizer hluti
+ Comment[it]=Parte di KOrganizer
+ Comment[ja]=KOrganizer パート
++Comment[ka]=KOrganizer კáƒáƒ›áƒžáƒáƒœáƒ”ნტი
+ Comment[kk]=KOrganizer бөлшегі
+ Comment[km]=ផ្នែក​របស់ KOrganizer
+ Comment[lt]=KOrganizer dalis
+Index: korganizer/kotodoeditor.cpp
+===================================================================
+--- korganizer/kotodoeditor.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/kotodoeditor.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -47,7 +47,6 @@
+ #include "koeditorgeneraltodo.h"
+ #include "koeditordetails.h"
+ #include "koeditorrecurrence.h"
+-#include "koeditoralarms.h"
+
+ #include "kotodoeditor.h"
+ #include "kocore.h"
+@@ -117,8 +116,7 @@
+ mGeneral->initCompletion(topFrame2,completionLayout);
+
+ mGeneral->initAlarm(topFrame,topLayout);
+- mGeneral->enableAlarm( false );
+-
++
+ mGeneral->initSecrecy( topFrame2, topLayout2 );
+ mGeneral->initDescription(topFrame2,topLayout2);
+ } else {
+@@ -132,7 +130,6 @@
+ mGeneral->initStatus(topFrame,topLayout);
+ QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
+ mGeneral->initAlarm(topFrame,alarmLineLayout);
+- mGeneral->enableAlarm( false );
+ alarmLineLayout->addStretch( 1 );
+ mGeneral->initDescription(topFrame,topLayout);
+ mGeneral->initAttachments(topFrame,topLayout);
+@@ -141,9 +138,7 @@
+ connect( this, SIGNAL( signalAddAttachments( const QStringList&, const QStringList&, bool ) ),
+ mGeneral, SLOT( addAttachments( const QStringList&, const QStringList&, bool ) ) );
+ }
+- // By default, the To-do has no time associated and
+- // neither a start nor end time.
+- mGeneral->setDefaults( QDateTime(), false );
++ mGeneral->enableAlarm( true );
+
+ mGeneral->finishSetup();
+ }
+@@ -185,6 +180,7 @@
+ mTodo = 0;
+ mCalendar = 0;
+ setCaption( i18n("New To-do") );
++ loadDefaults();
+ }
+
+ void KOTodoEditor::setTexts( const QString &summary, const QString &description )
+@@ -205,6 +201,7 @@
+ {
+ kdDebug(5850) << k_funcinfo << endl;
+ setDates( QDateTime::currentDateTime().addDays(7), true, 0 );
++ mGeneral->toggleAlarm( true );
+ }
+
+ bool KOTodoEditor::processInput()
+@@ -287,7 +284,6 @@
+ kdDebug(5850)<<"read todo"<<endl;
+ mGeneral->readTodo( todo, calendar );
+ mDetails->readEvent( todo );
+-// mAlarms->readIncidence( todo );
+ mRecurrence->readIncidence( todo );
+
+ createEmbeddedURLPages( todo );
+Index: korganizer/kodaymatrix.cpp
+===================================================================
+--- korganizer/kodaymatrix.cpp.orig 2006-07-22 10:14:27.000000000 +0200
++++ korganizer/kodaymatrix.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -54,6 +54,7 @@
+ #include <qcursor.h>
+ #include <kpopupmenu.h>
+ #include <X11/Xlib.h>
++#undef FocusIn
+ #undef KeyPress
+ #undef None
+ #undef Status
+Index: korganizer/plugins/datenums/datenums.desktop
+===================================================================
+--- korganizer/plugins/datenums/datenums.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/plugins/datenums/datenums.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[is]=Ãforrit fyrir númer dags á dagatali
+ Name[it]=Plugin delle date per i calendari
+ Name[ja]=日数表示カレンダープラグイン
++Name[ka]=თáƒáƒ იღის რიცხვების მáƒáƒ“ული კáƒáƒšáƒ”ნდრებისáƒáƒ—ვის
+ Name[kk]=Күнтізбедегі күн нөмірінің модулі
+ Name[km]=កម្មវិធី​ជំនួយ​លáŸážâ€‹áž€áž¶áž›áž”រិច្ឆáŸáž‘​សម្រាប់​ប្រážáž·áž‘áž·áž“
+ Name[lt]=Datų numerių priedas kalendoriams
+@@ -69,6 +70,7 @@
+ Comment[is]=Þetta Ãforrit sýnir efst à fundarskránni númer hvers dags à árinu. T.d. er 1. febrúar 32. dagurinn à árinu.
+ Comment[it]=Per ciascun giorno, questo plugin mostra la data giuliana (numero progressivo a partire dal primo gennaio dell'anno corrente). Per esempio al primo di febbraio corrisponde il numero 32.
+ Comment[ja]=ã“ã®ãƒ—ラグインã¯äºˆå®šè¡¨ãƒ“ューã®ä¸Šã«ã€ãã‚Œãžã‚Œã®æ—¥ãŒãã®å¹´ã®ä½•æ—¥ç›®ã§ã‚ã‚‹ã‹ã‚’表示ã—ã¾ã™ã€‚例ãˆã°ã€2 月 1 æ—¥ã¯ãã®å¹´ã® 32 日目ã§ã™ã€‚
++Comment[ka]= გეგმის ზედრხედში ეს მáƒáƒ“ული თვითეული დღისáƒáƒ—ვის áƒáƒ©áƒ•áƒ”ნებს მის დღის ნáƒáƒ›áƒ”რს áƒáƒ› წლისáƒáƒ—ვის . მáƒáƒ’áƒáƒšáƒ˜áƒ—áƒáƒ“,1 თებერვáƒáƒšáƒ˜ წლის 32-ე დღეáƒ.
+ Comment[kk]=Бұл модуль күн тәртібі бетінің жоғарында жыл баÑынан өткен күндер Ñанын көрÑетеді. МыÑалы, 1-ақпан жылдың 32-күні.
+ Comment[km]=សម្រាប់​ážáŸ’ងៃ​នីមួយៗ កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž“ឹង​បង្ហាញ​លáŸážâ€‹ážáŸ’ងៃ​នៃ​ឆ្នាំ នៅ​ផ្នែក​ážáž¶áž„​លើ​នៃ​ទិដ្ឋភាព​របៀបវារៈ ។ ឧទាហរណ០ážáŸ’ងៃ​ទី ១ ážáŸ‚ កុម្ភៈ នឹង​ážáŸ’រូវ​ជា​ážáŸ’ងៃ​ទី ៣២ នៃ​ឆ្នាំ ។
+ Comment[lt]=Kiekvienai dienai šis priedas rodo metų dienos numerį tvarkyklės viršuje. Pvz., Vasario 1 yra32 metų diena.
+Index: korganizer/plugins/projectview/projectview.desktop
+===================================================================
+--- korganizer/plugins/projectview/projectview.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/plugins/projectview/projectview.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -29,6 +29,7 @@
+ Name[is]=Verkefnasýnar Ãforrit fyrir KOrganizer
+ Name[it]=Plugin di vista dei progetti per KOrganizer
+ Name[ja]=KOrganizer プãƒã‚¸ã‚§ã‚¯ãƒˆãƒ“ュー プラグイン
++Name[ka]= KOrganizer-ის პრáƒáƒ”ქტის ხედის მáƒáƒ“ული
+ Name[kk]=KOrganizer-дің жоба көрініÑінің модулі
+ Name[km]=កម្មវិធី​ជំនួយ​ទិដ្ឋភាព​គម្រោង​សម្រាប់ KOrganizer
+ Name[lt]=Projekto peržiūros priedas, skirtas KOrganizer
+@@ -80,6 +81,7 @@
+ Comment[is]=Þetta Ãforrit veitir verkskipulagssýn fyrir KOrganizer (svipað og verkþátta eða mánaðarsýn). Ef þú virkjar þetta Ãforrit, getur þú á einfaldan hátt skipt yfir à verkefnasýn og skoðað verkþáttalistann þinn à skipuleggjara.
+ Comment[it]=Questo plugin fornisce una vista di pianificazione progetto per KOrganizer (come la vista delle cose da fare o quella mensile). Se abiliti questo plugin, puoi passare dalla vista progetto alla vista delle cose da fare come in un pianificatore di progetti.
+ Comment[ja]=ã“ã®ãƒ—ラグイン㯠KOrganizer ã«ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆè¨ˆç”»ãƒ“ューをæä¾›ã—ã¾ã™ (To-Do ビューや月ビューãªã©)。ã“ã®ãƒ—ラグインを有効ã«ã™ã‚‹ã¨ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆãƒ“ューã«åˆ‡ã‚Šæ›¿ãˆã¦ã€ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ç®¡ç†ã‚½ãƒ•ãƒˆã®ã‚ˆã†ã« To-Do リストを見るã“ã¨ãŒã§ãã¾ã™ã€‚
++Comment[ka]=ეს მáƒáƒ“ული უზრუნველყáƒáƒ¤áƒ¡ პრáƒáƒ”ქტის დáƒáƒ’ეგმáƒáƒ ების ხედს KOrganizer-სთვის(მáƒáƒ’.: დáƒáƒ•áƒáƒšáƒ”ბები áƒáƒœ თვიური მიმáƒáƒ®áƒ˜áƒšáƒ•áƒ). თუ áƒáƒ› მáƒáƒ“ულს გáƒáƒáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ ებთ,შეგიძლიáƒáƒ— გáƒáƒ“áƒáƒ თáƒáƒ— პრáƒáƒ”ქტის ხედზე დრიხილáƒáƒ— თქვენი დáƒáƒ•áƒáƒšáƒ”ბáƒáƒ—რსირპრáƒáƒ”ქტის მგეგმáƒáƒ•áƒ˜áƒ¡ სáƒáƒ®áƒ˜áƒ—.
+ Comment[kk]=Бұл KOrganizer-нің жобаны жоÑпарлау көрініÑінің модулі. Модулін орнатÑаңыз, оÑÑ‹ көрініÑке ауыÑып жоÑпар тізімініңізді жоба жоÑпарлағышындағы түріне келтіре алаÑыз.
+ Comment[km]=កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž•áŸ’ដល់​នូវ​ទិដ្ឋភាព​រៀបចំ​គម្រោង​សម្រាប់ korganizer (ដូចជា ទិដ្ឋភាព​ការងារ​ážáŸ’រូវ​ធ្វើ ឬ ទិដ្ឋភាព​ážáŸ‚​ជាដើម) ។ បើ​អ្នក​ធ្វើ​ឲ្យ​កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž”្រើ​បាន អ្នក​នឹង​អាច​ប្ដូរ​ទិដ្ឋភាព​គម្រោង ហើយ​មើល​ព្រឹážáŸ’ážáž·áž€áž¶ážšážŽáŸâ€‹ážšáž”ស់​អ្នក​ដូចជា​នៅ​ក្នុងកម្មវិធី​រៀបចំ​គម្រោង​អញ្ចឹង​ដែរ ។
+ Comment[lt]=Šis priedas pateikia KOrganizaer projekto planavimo vaizdą (panašiai kaip darbų ar mėnesio vaizdai). Jei įjungsite šį įskiepį, galėsite peršokti į projekto vaizdą ir peržiūrėti savo darbų sąrašą kaip projektą.
+Index: korganizer/plugins/exchange/exchange.desktop
+===================================================================
+--- korganizer/plugins/exchange/exchange.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/plugins/exchange/exchange.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -25,6 +25,7 @@
+ Name[is]=Microsoft Exchange 2000 Ãforrit fyrir KOrganizer
+ Name[it]=Plugin Microsoft Exchange 2000 per KOrganizer
+ Name[ja]=KOrganizer 㮠Microsoft Exchange 2000 プラグイン
++Name[ka]=Microsoft Exchange 2000-ის მáƒáƒ“ული KOrganizer-სთვის
+ Name[kk]=KOrganizer-дің Microsoft Exchange 2000 модулі
+ Name[km]=កម្មវិធី​ជំនួយ​ម៉ៃក្រូសូហ្វ Exchange ២០០០សម្រាប់ KOrganizer
+ Name[lt]=Microsoft Exchange 2000 priedas, skirtas KOrganizer
+@@ -70,6 +71,7 @@
+ Comment[is]=Þetta Ãforrit gerir KOrganizer kleyft að vinna með Microsoft Exchange 2000 hópvinnuþjónum.
+ Comment[it]=Questo plugin permette agli utenti di korganizer di lavorare con i server groupware Microsoft Exchange 2000.
+ Comment[ja]=ã“ã®ãƒ—ラグインã«ã‚ˆã‚Šã€korganizer ã®ãƒ¦ãƒ¼ã‚¶ãŒ Microsoft Exchange 2000 グループウェアサーãƒã¨åŒæœŸã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚
++Comment[ka]=ეს მáƒáƒ“ული korganizer-ის მáƒáƒ›áƒ®áƒ›áƒáƒ ებლებს სáƒáƒ¨áƒ£áƒáƒšáƒ”ბáƒáƒ¡ áƒáƒ«áƒšáƒ”ვს იმუშáƒáƒáƒœ Microsoft Exchange 2000 ჯგუფურსერვერებთáƒáƒœ.
+ Comment[kk]=Бұл модуль korganizer-мен MS Exchange 2000 біріккен Ð¶Ò±Ð¼Ñ‹Ñ Ñервермен Ñ–Ñтеуге мүмкіндік береді.
+ Comment[km]=កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž¢áž“ុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​របស់ korganizer ធ្វើការ​ជាមួយ​ម៉ាស៊ីន​បម្រើ​កម្មវិធី​ពហុ​អ្នកប្រើ​របស់​ម៉ៃក្រូសូហ្វ Exchange ២០០០ ។
+ Comment[lt]=Šis priedas leidžia korganizer dirbti su Microsoft Exchange 2000 groupware serveriais.
+Index: korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
+===================================================================
+--- korganizer/plugins/printing/whatsnext/whatsnextprint.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/plugins/printing/whatsnext/whatsnextprint.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=Hvað er næst prentstÃll
+ Name[it]=Stile di stampa "cosa viene dopo"
+ Name[ja]=次ã¯ä½•ï¼Ÿ å°åˆ·ã‚¹ã‚¿ã‚¤ãƒ«
++Name[ka]=ბეáƒáƒ“ვის სტილი "შემდეგი რრáƒáƒ ის?"
+ Name[kk]="Ðе Ñ–Ñтеу?" бетін баÑу Ñтилі
+ Name[km]=រចនាបáŸáž‘្ម​បោះពុម្ព​ការងារ​បន្ážáž”ន្ទាប់
+ Name[lt]=AteinanÄių įvykių spausdinimo stilius
+@@ -34,7 +35,7 @@
+ Name[pl]=Styl drukowania "Do dalej"
+ Name[pt]=Estilo de Impressão "O Que Se Segue"
+ Name[pt_BR]=Estilo de impressão "A Seguir"
+-Name[ru]=ДаджеÑÑ‚
++Name[ru]=ПредÑтоÑщие задачи
+ Name[sk]=Å týl tlaÄe ÄŒo nasleduje
+ Name[sl]=Slog tiskanja v obliki »Kaj je naslednje«
+ Name[sr]=Стил штампе „Шта је Ñледеће“
+@@ -65,6 +66,7 @@
+ Comment[is]=Þetta Ãforrit gerir þér kleyft að prenta út lista yfir alla væntanlega atburði og verkþætti.
+ Comment[it]=Questo plugin vi permette di stampare una lista dei prossimi eventi e cose da fare.
+ Comment[ja]=ã“ã®ãƒ—ラグインã«ã‚ˆã‚Šã€å°†æ¥ã®ã™ã¹ã¦ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚„ To-Do ã®ãƒªã‚¹ãƒˆã‚’å°åˆ·ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚
++Comment[ka]=ეს მáƒáƒ“ული სáƒáƒ¨áƒ£áƒáƒšáƒ”ბáƒáƒ¡ გáƒáƒ«áƒšáƒ”ვთ áƒáƒ›áƒáƒ‘ეáƒáƒ“áƒáƒ— მáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ მáƒáƒ•áƒšáƒ”ნები დრდáƒáƒ•áƒáƒšáƒ”ბები.
+ Comment[kk]=Бұл келер оқиғалар мен жоÑпарлар тізімін баÑып шығаратын модулі.
+ Comment[km]=កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž¢áž“ុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​បោះពុម្ព​បញ្ជី​នៃ​ព្រឹážáŸ’ážáž·áž€áž¶ážšážŽáŸ និង​ការងារ​ážáŸ’រូវ​ធ្វើ​បន្ážáž”ន្ទាប់
+ Comment[lt]=Å is priedas leidžia spausdinti sÄ…raÅ¡Ä… visų artÄ—janÄių įvykių ir darbų.
+Index: korganizer/plugins/printing/journal/journalprint.desktop
+===================================================================
+--- korganizer/plugins/printing/journal/journalprint.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/plugins/printing/journal/journalprint.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=DagbókarprentstÃll
+ Name[it]=Stile di stampa a diario
+ Name[ja]=ジャーナルå°åˆ·ã‚¹ã‚¿ã‚¤ãƒ«
++Name[ka]=ჟურნáƒáƒšáƒ˜áƒ¡ ბეáƒáƒ“ვის სტილი
+ Name[kk]=Күнделікті баÑу Ñтилі
+ Name[km]=រចនាបáŸáž‘្ម​បោះពុម្ព​ទិនានុប្បវážáŸ’ážáž·
+ Name[lt]=Dienyno spausdinimo stilius
+@@ -65,6 +66,7 @@
+ Comment[is]=Þetta Ãforrit gerir þér kleyft að prenta út dagbókarfærslur.
+ Comment[it]=Questo plugin ti permette di stampare le registrazioni del diario.
+ Comment[ja]=ã“ã®ãƒ—ラグインã«ã‚ˆã‚Šã€ã‚¸ãƒ£ãƒ¼ãƒŠãƒ« (日誌) ã®ã‚¨ãƒ³ãƒˆãƒªã‚’å°åˆ·ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚
++Comment[ka]=ეს მáƒáƒ“ული სáƒáƒ¨áƒ£áƒáƒšáƒ”ბáƒáƒ¡ გáƒáƒ«áƒšáƒ”ვთ áƒáƒ›áƒáƒ‘ეáƒáƒ“áƒáƒ— ჟურნáƒáƒšáƒ˜áƒ¡ შემáƒáƒ“გენლáƒáƒ‘რ(დღიურის ელემენტები)
+ Comment[kk]=Бұл күнделіктің жазуларын баÑып шығаратын модулі.
+ Comment[km]=កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž¢áž“ុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​បោះពុម្ព​ធាážáž»â€‹áž‘ិនានុប្បវážáŸ’ážáž· (ធាážáž»â€‹áž€áŸ†ážŽážáŸ‹áž áŸážáž»â€‹áž”្រចាំ​ážáŸ’ងៃ) ។
+ Comment[lt]=Šis priedas leidžia spausdinti dienyno įrašus.
+Index: korganizer/plugins/printing/list/listprint.desktop
+===================================================================
+--- korganizer/plugins/printing/list/listprint.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/plugins/printing/list/listprint.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=ListaprentstÃll
+ Name[it]=Stile di stampa ad elenco
+ Name[ja]=リストå°åˆ·ã‚¹ã‚¿ã‚¤ãƒ«
++Name[ka]=ბეáƒáƒ“ვის სტილის სიáƒ
+ Name[kk]=Тізімді баÑу Ñтилі
+ Name[km]=រចនាបáŸáž‘្ម​បោះពុម្ព​បញ្ជី
+ Name[lt]=Sąrašo spausdinimo stilius
+@@ -65,6 +66,7 @@
+ Comment[is]=Þetta Ãforrit gerir þér kleyft að prenta út lista með atburðum og verkþáttum.
+ Comment[it]=Questo plugin ti permette di stampare eventi e cose da fare in modalità elenco.
+ Comment[ja]=ã“ã®ãƒ—ラグインã«ã‚ˆã‚Šã€ãƒªã‚¹ãƒˆãƒ•ã‚©ãƒ¼ãƒ 内ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚„ To-Do ã‚’å°åˆ·ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚
++Comment[ka]=ეს მáƒáƒ“ული სáƒáƒ¨áƒ£áƒáƒšáƒ”ბáƒáƒ¡ გáƒáƒ«áƒšáƒ”ვთ სიის ფáƒáƒ მით áƒáƒ›áƒáƒ‘ეáƒáƒ“áƒáƒ— მáƒáƒ•áƒšáƒ”ნები დრდáƒáƒ•áƒáƒšáƒ”ბები.
+ Comment[kk]=Бұл оқиғалар мен жоÑпарларды тізім түрінде баÑатын модулі.
+ Comment[km]=កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž¢áž“ុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​បោះពុម្ព​ព្រឹážáŸ’ážáž·áž€áž¶ážšážŽáŸ និង​ការងារ​ážáŸ’រូវ​ធ្វើក្នុង​ទម្រង់​ជា​បញ្ជី ។
+ Comment[lt]=Šis priedas leidžia spausdinti įvykius ir darbus sąrašo forma.
+Index: korganizer/plugins/timespanview/timespanview.desktop
+===================================================================
+--- korganizer/plugins/timespanview/timespanview.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/plugins/timespanview/timespanview.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -22,6 +22,7 @@
+ Name[is]=TÃmabilsskoðunar Ãforrit fyrir KOrganizer
+ Name[it]=Plugin vista intervalli temporali per KOrganizer
+ Name[ja]=KOrganizer タイムスパンビュー プラグイン
++Name[ka]=დრáƒáƒ˜áƒ¡ დიáƒáƒ’რáƒáƒ›áƒ˜áƒáƒœáƒ˜ ხედის მáƒáƒ“ული KOrganizer-სთვის
+ Name[kk]=KOrganizer-дің уақыт аралығы ÐºÓ©Ñ€Ñ–Ð½Ñ–Ñ Ð¼Ð¾Ð´ÑƒÐ»Ñ–
+ Name[km]=កម្មវិធី​ជំនួយ​ទិដ្ឋភាព​រយៈពáŸáž›â€‹ážŸáž˜áŸ’រាប់ KOrganizer
+ Name[lt]=Laiko tarpsnio vaizdo KOrganizer priedas
+@@ -65,6 +66,7 @@
+ Comment[is]=Þetta Ãforrit veitir tÃmabilssýn fyrir KOrganizer (svipað og verkþátta eða mánaðarsýn). Ef þú virkjar þetta Ãforrit getur þú skipt yfir à tÃmabilssýn og skoðað atburðina þÃna eins og á Gantt skýringarmynd.
+ Comment[it]=Questo plugin fornisce una vista a intervalli temporali. Se abiliti questo plugin, potrai passare alla vista a intervalli temporali e vedere i tuoi eventi come in un diagramma di Gantt.
+ Comment[ja]=ã“ã®ãƒ—ラグイン㯠KOrganizer ã«ã‚¿ã‚¤ãƒ スパンビューをæä¾›ã—ã¾ã™ (To-Do ビューや月ビューãªã©)。ã“ã®ãƒ—ラグインを有効ã«ã™ã‚‹ã¨ã€ã‚¿ã‚¤ãƒ スパンビューã«åˆ‡ã‚Šæ›¿ãˆã¦ã€ã‚¬ãƒ³ãƒˆãƒãƒ£ãƒ¼ãƒˆã®ã‚ˆã†ã«ã‚¤ãƒ™ãƒ³ãƒˆã‚’見るã“ã¨ãŒã§ãã¾ã™ã€‚
++Comment[ka]=ეს მáƒáƒ“ული უზრუნველჰყáƒáƒ¤áƒ¡ korganizer-ს დრáƒáƒ˜áƒ¡ დიáƒáƒ’რáƒáƒ›áƒ˜áƒáƒœáƒ˜ ხედით (მáƒáƒ’.:დáƒáƒ•áƒáƒšáƒ”ბები áƒáƒœ თვიური მიმáƒáƒ®áƒ˜áƒšáƒ•áƒ). თუ áƒáƒ› მáƒáƒ“ულს გáƒáƒáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ ებთ,თქვენ შეგიძლიáƒáƒ— გáƒáƒ“áƒáƒ თáƒáƒ— დრáƒáƒ˜áƒ¡ დიáƒáƒ’რáƒáƒ›áƒ˜áƒáƒœ ხედზე დრიხილáƒáƒ— მáƒáƒ•áƒšáƒ”ნები გáƒáƒœáƒ¢áƒ˜áƒ¡ დიáƒáƒ’რáƒáƒ›áƒ˜áƒ¡ სáƒáƒ®áƒ˜áƒ—.
+ Comment[kk]=Бұл KOrganizer-нің уақыт аралығы көрініÑінің модулі. Модулін орнатÑаңыз, оÑÑ‹ көрініÑке ауыÑып оқиғаларыңызды Гант диаграмма түріне келтре алаÑыз.
+ Comment[km]=កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž•áŸ’ដល់​នូវ​ទិដ្ឋភាព​រយៈពáŸáž›â€‹ážŸáž˜áŸ’រាប់ korganizer (ដូចជា ទិដ្ឋភាព​ការងារ​ážáŸ’រូវ​ធ្វើ ឬ ទិដ្ឋភាព​ážáŸ‚​ជាដើម) ។ បើ​អ្នក​ធ្វើ​ឲ្យ​កម្មវិធី​ជំនួយ​នáŸáŸ‡â€‹áž”្រើ​បាន អ្នក​នឹង​អាច​ប្ដូរ​ទិដ្ឋភាព​រយៈពáŸáž› ហើយ​មើល​ព្រឹážáŸ’ážáž·áž€áž¶ážšážŽáŸâ€‹ážšáž”ស់​អ្នក​ដូចជា​នៅ​ក្នុងដ្យាក្រាម Gantt អញ្ចឹង​ដែរ ។
+ Comment[lt]=Šis priedas korganizer programoje sudaro galimybę apžvelgti laiko tarpą (pvz., darbų arba mėnesio peržiūra). Įgalinus šį priedą galėsite persijungti į laiko tarpo peržiūrą ir žiūrėti įvykius tarsi Gantt diagramoje.
+Index: korganizer/plugins/hebrew/hebrew.desktop
+===================================================================
+--- korganizer/plugins/hebrew/hebrew.desktop.orig 2008-02-13 10:39:53.000000000 +0100
++++ korganizer/plugins/hebrew/hebrew.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -24,6 +24,7 @@
+ Name[is]=Gyðinga dagatalsÃforrit
+ Name[it]=Plugin calendario ebraico
+ Name[ja]=ユダヤæ´ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼ãƒ—ラグイン
++Name[ka]=ებრáƒáƒ£áƒšáƒ˜ კáƒáƒšáƒ”ნდრის მáƒáƒ“ული
+ Name[kk]=Яһуди күнтізбеÑінің модулі
+ Name[km]=កម្មវិធី​ជំនួយ​ប្រážáž·áž‘áž·áž“ Jewish
+ Name[lt]=Žydų kalendoriaus priedas
+@@ -70,6 +71,7 @@
+ Comment[is]=Sýna alla dagsetningar à KOrganizer sem eru einnig à dagatali gyðinga.
+ Comment[it]=Mostra tutte le date in korganizer secondo il calendario ebraico.
+ Comment[ja]=korganizer ã®ã™ã¹ã¦ã®æ—¥ä»˜ã‚’ユダヤ暦ã§ã‚‚表示ã—ã¾ã™ã€‚
++Comment[ka]=ყველრთáƒáƒ იღს ებრáƒáƒ£áƒšáƒ˜ კáƒáƒšáƒ”ნდრის მიხედვითáƒáƒª áƒáƒ©áƒ•áƒ”ნებს
+ Comment[kk]=Яһуди күнтізбе күндерін korganizer-де көрÑететін модулі.
+ Comment[km]=បង្ហាញ​កាលបរិច្ឆáŸáž‘​ទាំងអស់​ក្នុង korganizer នៅ​ក្នុង​ប្រពáŸáž“្ធ​ប្រážáž·áž‘áž·áž“ Jewish ។
+ Comment[lt]=Rodo visas dienas kalendoriuje taip pat ir žydų kalendoriaus sistema.
+Index: korganizer/korganizer.kcfg
+===================================================================
+--- korganizer/korganizer.kcfg.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer.kcfg 2008-06-29 20:10:37.000000000 +0200
+@@ -222,7 +222,7 @@
+ <label>Only calendar</label>
+ </choice>
+ </choices>
+- <default>ResourceInsideCategoryOutside</default>
++ <default>CategoryInsideResourceOutside</default>
+ </entry>
+
+ <entry type="Enum" name="Agenda View Calendar Display">
+Index: korganizer/korganizer_configfreebusy.desktop
+===================================================================
+--- korganizer/korganizer_configfreebusy.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configfreebusy.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -36,6 +36,7 @@
+ Name[is]=TÃmaráðstöfun
+ Name[it]=Libero/Occupato
+ Name[ja]=å‹•é™æƒ…å ±
++Name[ka]=თáƒáƒ•áƒ˜áƒ¡áƒ£áƒ¤áƒáƒšáƒ˜/დáƒáƒ™áƒáƒ•áƒ”ბული
+ Name[kk]=БоÑ/ІÑте
+ Name[km]=ទំនáŸážš/រវល់
+ Name[lt]=Užimtumas
+@@ -59,7 +60,8 @@
+ Name[tg]=Озод/машғул аÑÑ‚
+ Name[tr]=BoÅŸ/MeÅŸgul
+ Name[uk]=Вільний/зайнÑтий чаÑ
+-Name[uz]=Бўш/Банд
++Name[uz]=Boʻsh/Band
++Name[uz at cyrillic]=Бўш/Банд
+ Name[zh_CN]=å¿™/é—²
+ Name[zh_TW]=行程資訊
+ Comment=KOrganizer Free/Busy Configuration
+@@ -86,6 +88,7 @@
+ Comment[is]=KOrganizer stillingar fyrir tÃmaráðstöfun
+ Comment[it]=Configurazione Libero/Occupato di KOrganizer
+ Comment[ja]=KOrganizer å‹•é™æƒ…å ±ã®è¨å®š
++Comment[ka]=KOrganizer-ის თáƒáƒ•áƒ˜áƒ¡áƒ£áƒ¤áƒáƒšáƒ˜/დáƒáƒ™áƒáƒ•áƒ”ბულáƒáƒ‘ის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer--дің БоÑ/ІÑте мәлімет параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ទំនáŸážš/រវល់ របស់ KOrganizer
+ Comment[lt]=KOrganizer užimtumo konfigūravimas
+@@ -134,6 +137,7 @@
+ Keywords[is]=korganizer,tÃmaráðstöfun,áætlun
+ Keywords[it]=korganizer,libero/occupato,pianificazione
+ Keywords[ja]=korganizer,å‹•é™,スケジューラ
++Keywords[ka]=korganizer,თáƒáƒ•áƒ˜áƒ¡áƒ£áƒ¤áƒáƒšáƒ˜áƒ“áƒáƒ™áƒáƒ•áƒ”ბული,დáƒáƒ’ეგმვáƒ
+ Keywords[km]=korganizer,ទំនáŸážš,រវល់,កាលវិភាគ
+ Keywords[mk]=korganizer,freebusy,scheduling,корганизатор,Ñлободно,зафатено,закажување
+ Keywords[ms]=korganizer,lapang sibuk,penjadualan
+Index: korganizer/korganizer.desktop
+===================================================================
+--- korganizer/korganizer.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -28,6 +28,7 @@
+ Comment[is]=Dagbók og skipulag
+ Comment[it]=Programma di calendario e di agenda
+ Comment[ja]=カレンダーã¨ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ç®¡ç†ãƒ—ãƒã‚°ãƒ©ãƒ
++Comment[ka]=კáƒáƒšáƒ”ნდრის დრმგეგმáƒáƒ•áƒ˜áƒ¡ პრáƒáƒ’რáƒáƒ›áƒ
+ Comment[kk]=Күнтізбе және ЖоÑпарлау бағдарламаÑÑ‹
+ Comment[km]=កម្មវិធី​ប្រážáž·áž‘áž·áž“ និង​កាលវិភាគ
+ Comment[lt]=Kalendoriaus ir planavimo programa
+@@ -57,7 +58,8 @@
+ Comment[th]=โปรà¹à¸à¸£à¸¡à¸ˆà¸±à¸”à¸à¸²à¸£à¸šà¸±à¸™à¸—ึà¸à¸›à¸£à¸°à¸ˆà¸³à¸§à¸±à¸™à¹à¸¥à¸°à¸•à¸²à¸£à¸²à¸‡à¸à¸²à¸£à¸™à¸±à¸”หมาย
+ Comment[tr]=Takvim ve Zamanlama Programı
+ Comment[uk]=Програма ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ñ Ñ‚Ð° розкладу
+-Comment[uz]=Календар ва режалаштириш даÑтури
++Comment[uz]=Kalendar va rejalashtirish dasturi
++Comment[uz at cyrillic]=Календар ва режалаштириш даÑтури
+ Comment[ven]=Khalenda na mbekanyamushumo ya u shedula
+ Comment[vi]=Chương trình lịch và kế hoạch
+ Comment[xh]=Ikhalenda no Dweliso lwenkqubo Yokucwangcisa
+@@ -112,6 +114,7 @@
+ GenericName[is]=Persónuleg skipulagsbók
+ GenericName[it]=Organizzatore personale
+ GenericName[ja]=個人å‘ã‘スケジュール管ç†
++GenericName[ka]=პირáƒáƒ“ი áƒáƒ გáƒáƒœáƒ˜áƒ–áƒáƒ¢áƒáƒ ი
+ GenericName[kk]=Ð”ÐµÑ€Ð±ÐµÑ Ò±Ð¹Ñ‹Ð¼Ð´Ð°Ñтырғышы
+ GenericName[km]=កម្មវិធី​រៀបចំ​ផ្ទាល់​ážáŸ’លួន
+ GenericName[lt]=AsmeninÄ—s informacijos tvarkyklÄ—
+@@ -136,7 +139,8 @@
+ GenericName[tg]=Органайзери инфиродӣ
+ GenericName[tr]=Kişisel Bilgi Yöneticisi
+ GenericName[uk]=ПерÑональний тижневик
+-GenericName[uz]=ШахÑий органайзер
++GenericName[uz]=Shaxsiy organayzer
++GenericName[uz at cyrillic]=ШахÑий органайзер
+ GenericName[zh_CN]=个人日程安排
+ GenericName[zh_TW]=個人行程組織軟體
+ ServiceTypes=Browser/View,DCOP/Organizer
+Index: korganizer/calendarview.cpp
+===================================================================
+--- korganizer/calendarview.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/calendarview.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -1015,7 +1015,6 @@
+ KOTodoEditor *todoEditor = mDialogManager->getTodoEditor();
+ connectIncidenceEditor( todoEditor );
+ todoEditor->newTodo();
+- todoEditor->setDates( QDateTime(), false );
+ todoEditor->setTexts( summary, description );
+ todoEditor->addAttachments( attachments, attachmentMimetypes, inlineAttachment );
+ todoEditor->addAttendees( attendees );
+@@ -1884,6 +1883,11 @@
+ edit_copy();
+ }
+
++void CalendarView::pasteIncidence()
++{
++ edit_paste();
++}
++
+ void CalendarView::showIncidence( Incidence *incidence )
+ {
+ KOEventViewerDialog *eventViewer = new KOEventViewerDialog( this );
+Index: korganizer/dcopcalendar.desktop
+===================================================================
+--- korganizer/dcopcalendar.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/dcopcalendar.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -30,6 +30,7 @@
+ Comment[is]=Skipuleggjari með DCOP viðmóti
+ Comment[it]=Organizer con un'interfaccia DCOP
+ Comment[ja]=DCOP インターフェースをæŒã¤ã‚ªãƒ¼ã‚¬ãƒŠã‚¤ã‚¶
++Comment[ka]=áƒáƒ გáƒáƒœáƒ˜áƒ–áƒáƒ¢áƒáƒ ი DCOP ინტერფეისით
+ Comment[kk]=DCOP интерфейÑÑ‚Ñ– ҰйымдаÑтырғыш
+ Comment[km]=កម្មវិធី​រៀបចំ​ដែល​មាន​ចំណុច​ប្រទាក់ DCOP
+ Comment[lt]=TvarkyklÄ— su DCOP sÄ…saja
+Index: korganizer/korganizer_configcolors.desktop
+===================================================================
+--- korganizer/korganizer_configcolors.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configcolors.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -44,6 +44,7 @@
+ Name[is]=Litir
+ Name[it]=Colori
+ Name[ja]=色
++Name[ka]=ფერები
+ Name[kk]=ТүÑтері
+ Name[km]=ពណ៌
+ Name[lt]=Spalvos
+@@ -73,7 +74,8 @@
+ Name[th]=สี
+ Name[tr]=Renkler
+ Name[uk]=Кольори
+-Name[uz]=Ранглар
++Name[uz]=Ranglar
++Name[uz at cyrillic]=Ранглар
+ Name[ven]=Mivhala
+ Name[vi]=MÃ u
+ Name[xh]=Imibala
+@@ -108,6 +110,7 @@
+ Comment[is]=KOrganizer litastillingar
+ Comment[it]=Configurazione dei colori di Korganizer
+ Comment[ja]=KOrganizer 色è¨å®š
++Comment[ka]=KDE-ს áƒáƒ გáƒáƒœáƒ˜áƒ–áƒáƒ¢áƒáƒ ის ფერთრკáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer-дің Ñ‚Ò¯Ñтер параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ពណ៌ KOrganizer
+ Comment[lt]=KOrganizer spalvų konfigūravimas
+@@ -162,6 +165,7 @@
+ Keywords[is]=korganizer,litir
+ Keywords[it]=korganizer,colori
+ Keywords[ja]=korganizer,色
++Keywords[ka]=korganizer,ფერები
+ Keywords[km]=korganizer,ពណ៌
+ Keywords[lt]=korganizer,colors, spalvos
+ Keywords[mk]=korganizer,colors,корганизатор,бои
+@@ -185,5 +189,6 @@
+ Keywords[tg]=korganizer,colors,органайзер,рангҳо
+ Keywords[tr]=korganizer,renkler
+ Keywords[uk]=korganizer,кольори
+-Keywords[uz]=korganizer,органайзер,ранглар
++Keywords[uz]=korganizer,organayzer,ranglar
++Keywords[uz at cyrillic]=korganizer,органайзер,ранглар
+ Keywords[zh_CN]=korganizer,colors,颜色
+Index: korganizer/resourceview.cpp
+===================================================================
+--- korganizer/resourceview.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/resourceview.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -359,22 +359,35 @@
+ KRES::ConfigDialog *dlg = new KRES::ConfigDialog( this, QString("calendar"), resource,
+ "KRES::ConfigDialog" );
+
+- if ( dlg && dlg->exec() ) {
++ bool success = true;
++ if ( !dlg || !dlg->exec() )
++ success = false;
++
++ if ( success ) {
+ resource->setTimeZoneId( KOPrefs::instance()->mTimeZoneId );
+- if ( resource->isActive() ) {
+- resource->open();
+- resource->load();
++ if ( resource->isActive() && ( !resource->open() || !resource->load() ) ) {
++ // ### There is a resourceLoadError() signal declared in ResourceCalendar
++ // but no subclass seems to make use of it. We could do better.
++ KMessageBox::error( this, i18n("Unable to create the resource.")
++ .arg( type ) );
++ success = false;
+ }
++ }
++
++ if ( success ) {
+ manager->add( resource );
+ // we have to call resourceAdded manually, because for in-process changes
+ // the dcop signals are not connected, so the resource's signals would not
+ // be connected otherwise
+ mCalendar->resourceAdded( resource );
+- } else {
+- delete resource;
+- resource = 0;
+ }
+- if ( dlg ) delete dlg;
++
++ if ( !success )
++ delete resource;
++
++ delete dlg;
++
++ //### maybe only do this if ( success )
+ emitResourcesChanged();
+ }
+
+Index: korganizer/korganizer_part.rc
+===================================================================
+--- korganizer/korganizer_part.rc.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_part.rc 2008-06-29 20:10:37.000000000 +0200
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui>
+-<kpartgui name="korganizer" version="42">
++<kpartgui name="korganizer" version="43">
+
+ <MenuBar>
+ <Menu name="file"><text>&File</text>
+@@ -167,7 +167,7 @@
+ <Action name="new_event"/>
+ <Action name="new_todo"/>
+ <Separator/>
+- <Action name="edit_paste"/>
++ <Action name="korganizer_paste"/>
+ <Merge/>
+ </Menu>
+
+Index: korganizer/koeventpopupmenu.cpp
+===================================================================
+--- korganizer/koeventpopupmenu.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koeventpopupmenu.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -64,6 +64,9 @@
+ mEditOnlyItems.append(
+ insertItem( KOGlobals::self()->smallIcon("editcopy"), i18n("&Copy"),
+ this, SLOT( popupCopy() ) ) );
++ // paste is always possible
++ insertItem( KOGlobals::self()->smallIcon("editpaste"), i18n("&Paste"),
++ this, SLOT( popupPaste() ) );
+ mEditOnlyItems.append(
+ insertItem( KOGlobals::self()->smallIcon("editdelete"), i18n("&Delete"),
+ this, SLOT( popupDelete() ) ) );
+@@ -158,6 +161,11 @@
+ if (mCurrentIncidence) emit copyIncidenceSignal(mCurrentIncidence);
+ }
+
++void KOEventPopupMenu::popupPaste()
++{
++ emit pasteIncidenceSignal();
++}
++
+
+ void KOEventPopupMenu::popupAlarm()
+ {
+Index: korganizer/korganizer_configdesignerfields.desktop
+===================================================================
+--- korganizer/korganizer_configdesignerfields.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configdesignerfields.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -38,6 +38,7 @@
+ Name[is]=Sérsniðnar sÃður
+ Name[it]=Pagine personalizzate
+ Name[ja]=カスタムページ
++Name[ka]=სáƒáƒ›áƒáƒ›áƒ®áƒ›áƒáƒ ებლრგვერდები
+ Name[kk]=ҚоÑымша парақтар
+ Name[km]=ទំពáŸážšâ€‹áž•áŸ’ទាល់​ážáŸ’លួន
+ Name[lt]=Pasirinkti puslapiai
+@@ -89,6 +90,7 @@
+ Comment[is]=Stilla sérsniðnu sÃðurnar
+ Comment[it]=Configura le pagine personalizzate
+ Comment[ja]=カスタムページã®è¨å®š
++Comment[ka]=სáƒáƒ›áƒáƒ›áƒ®áƒ›áƒáƒ ებლრგვერდების კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=ҚоÑымша парақтарды баптау
+ Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ទំពáŸážšâ€‹áž•áŸ’ទាល់​ážáŸ’លួន
+ Comment[lt]=KonfigÅ«ruoti darbastalių skaiÄių ir pavadinimus
+@@ -136,6 +138,7 @@
+ Keywords[is]=korganizer, stillingar, stilla, sérsniðnir reitir
+ Keywords[it]=korganizer, configura, impostazioni, campi personalizzati
+ Keywords[ja]=korganizerã€è¨å®šã€è¨å®š,カスタムフィールド
++Keywords[ka]=korganizer, კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ,პáƒáƒ áƒáƒ›áƒ”ტრები,სáƒáƒ›áƒáƒ›áƒ®áƒ›áƒáƒ ებლრველები
+ Keywords[km]=korganizer,កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ,ការ​កំណážáŸ‹,វាល​ផ្ទាល់​ážáŸ’លួន
+ Keywords[lt]=korganizer, configure, settings, custom fields, konfigūruoti, nustatymai, pasirinkti laukai
+ Keywords[mk]=korganizer, configure, settings, custom fields, корганизатор, конфигурација, конфигурирање, поÑтавувања, ÑопÑтвени полиња
+Index: korganizer/koviewmanager.cpp
+===================================================================
+--- korganizer/koviewmanager.cpp.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/koviewmanager.cpp 2008-06-29 20:10:37.000000000 +0200
+@@ -184,6 +184,8 @@
+ mMainView, SLOT(copyIncidence(Incidence *)));
+ connect(view, SIGNAL(cutIncidenceSignal(Incidence *)),
+ mMainView, SLOT(cutIncidence(Incidence *)));
++ connect(view, SIGNAL(pasteIncidenceSignal()),
++ mMainView, SLOT(pasteIncidence()));
+ connect(view, SIGNAL(toggleAlarmSignal(Incidence *)),
+ mMainView, SLOT(toggleAlarm(Incidence *)));
+ connect(view,SIGNAL(dissociateOccurrenceSignal( Incidence *, const QDate & )),
+Index: korganizer/korganizer_configgroupautomation.desktop
+===================================================================
+--- korganizer/korganizer_configgroupautomation.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configgroupautomation.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -36,6 +36,7 @@
+ Name[is]=Hópsjálfvirkni
+ Name[it]=Automazione gruppi
+ Name[ja]=グループ自動化
++Name[ka]=ჯგუფური áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ˜áƒ–áƒáƒªáƒ˜áƒ
+ Name[kk]=Топтың біріккен жұмыÑÑ‹
+ Name[km]=ស្វáŸáž™áž”្រážáž·áž€áž˜áŸ’ម​ក្រុម
+ Name[lt]=Grupių automatizavimas
+@@ -86,6 +87,7 @@
+ Comment[is]=Stillingar KOrganizer hópsjálfvirkni
+ Comment[it]=Configurazione automazione gruppi di KOrganizer
+ Comment[ja]=KOrganizer グループ自動化è¨å®š
++Comment[ka]=KOrganizer-ის ჯგუფური áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡ კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer топтық жұмыÑының параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ស្វáŸáž™áž”្រážáž·áž€áž˜áŸ’ម​ក្រុម​របស់ KOrganizer
+ Comment[lt]=KOrganizer grupių automatizavimo konfigūravimas
+@@ -136,6 +138,7 @@
+ Keywords[is]=korganizer,hópar,sjálfvirkni
+ Keywords[it]=korganizer,gruppi,automazione
+ Keywords[ja]=korganizer,グループ,自動化
++Keywords[ka]=korganizer,ჯგუფი,áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ˜áƒ–áƒáƒªáƒ˜áƒ
+ Keywords[km]=korganizer,ក្រុម,ស្វáŸáž™áž”្រážáž·áž€áž˜áŸ’ម
+ Keywords[lt]=korganizer,group,automation, grupÄ—s,automatizavimas
+ Keywords[mk]=korganizer,group,automation,корганизатор,група,групи,автоматизација
+Index: korganizer/korganizer_configviews.desktop
+===================================================================
+--- korganizer/korganizer_configviews.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configviews.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -41,6 +41,7 @@
+ Name[is]=Sýn
+ Name[it]=Viste
+ Name[ja]=ビューア
++Name[ka]=ხედები
+ Name[kk]=КөрініÑтері
+ Name[km]=ទិដ្ឋភាព
+ Name[lt]=Žiūrikliai
+@@ -66,7 +67,8 @@
+ Name[tg]=Ðамудҳо
+ Name[tr]=Görünümler
+ Name[uk]=ПереглÑди
+-Name[uz]=Кўринишлар
++Name[uz]=Koʻrinishlar
++Name[uz at cyrillic]=Кўринишлар
+ Name[zh_CN]=视图
+ Name[zh_TW]=檢視
+ Comment=KOrganizer View Configuration
+@@ -94,6 +96,7 @@
+ Comment[is]=Stillingar KOrganizer sýna
+ Comment[it]=Configurazione viste di KOrganizer
+ Comment[ja]=KOrganizer ビューアè¨å®š
++Comment[ka]=KOrganizer ხედის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer-дің көрініÑінің параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ទិដ្ឋភាព​របស់ KOrganizer
+ Comment[lt]=KOrganizer žiūriklių konfigūravimas
+@@ -144,6 +147,7 @@
+ Keywords[hu]=korganizer,nézet
+ Keywords[is]=korganizer,sýn
+ Keywords[it]=korganizer,viste
++Keywords[ka]=korganizer,ხედი
+ Keywords[km]=korganizer,ទិដ្ឋភាព
+ Keywords[lt]=korganizer,view,žiūrikliai
+ Keywords[mk]=korganizer,view,корганизатор,приказ
+@@ -167,5 +171,6 @@
+ Keywords[tg]=korganizer,view,органайзер,намудҳо
+ Keywords[tr]=korganizer,görünüm
+ Keywords[uk]=korganizer,переглÑд
+-Keywords[uz]=korganizer,органайзер,кўриниш
++Keywords[uz]=korganizer,organayzer,koʻrinish
++Keywords[uz at cyrillic]=korganizer,органайзер,кўриниш
+ Keywords[zh_CN]=korganizer,view,视图
+Index: korganizer/korganizer_configmain.desktop
+===================================================================
+--- korganizer/korganizer_configmain.desktop.orig 2008-02-13 10:39:54.000000000 +0100
++++ korganizer/korganizer_configmain.desktop 2008-06-29 20:10:37.000000000 +0200
+@@ -39,6 +39,7 @@
+ Name[is]=Persónulegt
+ Name[it]=Personale
+ Name[ja]=個人è¨å®š
++Name[ka]=პირáƒáƒ“ი
+ Name[kk]=ДербеÑ
+ Name[km]=ផ្ទាល់​ážáŸ’លួន
+ Name[lt]=Suasmeninimas
+@@ -63,7 +64,8 @@
+ Name[tg]=Танзимотҳои шахÑÓ£
+ Name[tr]=KiÅŸisel
+ Name[uk]=ОÑобиÑÑ‚Ñ–
+-Name[uz]=ШахÑий
++Name[uz]=Shaxsiy
++Name[uz at cyrillic]=ШахÑий
+ Name[zh_CN]=个人
+ Name[zh_TW]=個人
+ Comment=KOrganizer Main Configuration
+@@ -93,6 +95,7 @@
+ Comment[is]=Aðalstillingar KOrganizer
+ Comment[it]=Configurazione principale di KOrganizer
+ Comment[ja]=KOrganizer 主è¦è¨å®š
++Comment[ka]=KOrganizer ძირითáƒáƒ“ი კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ
+ Comment[kk]=KOrganizer-дің негізгі параметрлері
+ Comment[km]=ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​សំážáž¶áž“់ៗ​របស់ KOrganizer
+ Comment[lt]=KOrganizer bendroji konfigūravimas
+@@ -142,6 +145,7 @@
+ Keywords[is]=korganizer,aðal,persónulegt
+ Keywords[it]=korganizer,principale,personale
+ Keywords[ja]=korganizer,メイン,個人
++Keywords[ka]=korganizer,ძირითáƒáƒ“ი,პირáƒáƒ“ი
+ Keywords[km]=korganizer,សំážáž¶áž“់,ផ្ទាល់​ážáŸ’លួន
+ Keywords[lt]=korganizer,main,personal,pagrindinis,asmeninis,bendroji
+ Keywords[mk]=korganizer,main,personal,корганизатор,главно,лично
+@@ -165,5 +169,6 @@
+ Keywords[tg]=korganizer,main,personal,почта,танзимотҳои шахÑÓ£,органайзер
+ Keywords[tr]=korganizer,temel,kiÅŸisel
+ Keywords[uk]=korganizer,оÑобиÑтий,ПерÑональний
+-Keywords[uz]=korganizer,органайзер,аÑоÑий,шахÑий
++Keywords[uz]=korganizer,organayzer,asosiy,shaxsiy
++Keywords[uz at cyrillic]=korganizer,органайзер,аÑоÑий,шахÑий
+ Keywords[zh_CN]=korganizer,main,personal,主è¦,个人
More information about the pkg-kde-commits
mailing list