SOURCES: kdepim-branch.diff - updated

arekm arekm at pld-linux.org
Mon Feb 26 13:18:15 CET 2007


Author: arekm                        Date: Mon Feb 26 12:18:15 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdepim-branch.diff (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.38 SOURCES/kdepim-branch.diff:1.39
--- SOURCES/kdepim-branch.diff:1.38	Sat Feb 24 15:54:33 2007
+++ SOURCES/kdepim-branch.diff	Mon Feb 26 13:18:10 2007
@@ -1,7 +1,41 @@
+Index: akregator/ChangeLog
+===================================================================
+--- akregator/ChangeLog	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/ChangeLog	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -2,6 +2,14 @@
+ ===================
+ (c) 2004-2006 the Akregator authors.
+ 
++Changes after 1.2.6:
++-----------------------------
++
++Bug fixes:
++
++ 2007/02/24 fix crash when using "Load the full website when reading articles" and an error (e.g. 404) 
++            is returned (2nd try) (#126812) -fo 
++
+ Changes after 1.2.5:
+ -----------------------------
+ 
+Index: akregator/src/articleviewer.cpp
+===================================================================
+--- akregator/src/articleviewer.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/articleviewer.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -160,6 +160,10 @@
+ ArticleViewer::ArticleViewer(QWidget *parent, const char *name)
+     : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
+ {
++    setJScriptEnabled(false);
++    setJavaEnabled(false);
++    setPluginsEnabled(false);
++    
+     m_showSummaryVisitor = new ShowSummaryVisitor(this);
+     setXMLFile(locate("data", "akregator/articleviewer.rc"), true);
+ 
 Index: akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
 ===================================================================
---- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -23,6 +23,7 @@
  Name[ms]=Hujung belakang storan Metakit 
  Name[nb]=Metakit lagringsbakstykke
@@ -18,7 +52,11 @@
  Comment[bg]=Приставка за Akregator
  Comment[br]=Lugent evit Akregator
  Comment[ca]=Endollable per a Akregator
-@@ -63,6 +65,7 @@
+@@ -60,9 +62,11 @@
+ Comment[ja]=Akregator 用プラグイン
+ Comment[km]=កម្មវិធី​ជំនួយ Akregator
+ Comment[lt]=Akregator skirtas priedas
++Comment[mk]=Приклучок за Akregator
  Comment[ms]=Plugin untuk Akregator
  Comment[nb]=Programtillegg for Akregator
  Comment[nds]=Moduul för Akregator
@@ -28,8 +66,8 @@
  Comment[pl]=Wtyczka dla Akregatora
 Index: akregator/src/akregator_part.cpp
 ===================================================================
---- akregator/src/akregator_part.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ akregator/src/akregator_part.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- akregator/src/akregator_part.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/akregator_part.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -513,13 +513,21 @@
      {
          if (!factory())
@@ -58,8 +96,8 @@
      }
 Index: akregator/src/akregator_view.h
 ===================================================================
---- akregator/src/akregator_view.h	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ akregator/src/akregator_view.h	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- akregator/src/akregator_view.h	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/akregator_view.h	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -277,13 +277,9 @@
              void disconnectFromFeedList(FeedList* feedList);
  
@@ -75,10 +113,57 @@
              void connectFrame(Frame *);
  
              void setTabIcon(const QPixmap&);
+Index: akregator/src/pageviewer.cpp
+===================================================================
+--- akregator/src/pageviewer.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/pageviewer.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -356,15 +356,22 @@
+ 
+ void PageViewer::urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs args)
+ {
+-    if (button == LeftButton)
++    if (url.startsWith(QString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) )
+     {
+-        m_url = completeURL(url);
+-        browserExtension()->setURLArgs(args); 
+-        slotOpenLinkInThisTab();
++        KHTMLPart::urlSelected(url,button,state,_target,args);
+     }
+     else
+     {
+-        Viewer::urlSelected(url,button,state,_target,args);
++        if (button == LeftButton)
++        {
++            m_url = completeURL(url);
++            browserExtension()->setURLArgs(args); 
++            slotOpenLinkInThisTab();
++        }
++        else
++        {
++            Viewer::urlSelected(url,button,state,_target,args);
++        }
+     }
+ }
+ 
+Index: akregator/src/viewer.cpp
+===================================================================
+--- akregator/src/viewer.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/viewer.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -51,10 +51,7 @@
+     : KHTMLPart(parent, name), m_url(0)
+ {
+     setZoomFactor(100);
+-    setJScriptEnabled(false);
+-    setJavaEnabled(true);
+     setMetaRefreshEnabled(true);
+-    setPluginsEnabled(true);
+     setDNDEnabled(true);
+     setAutoloadImages(true);
+     setStatusMessagesEnabled(true);
 Index: akregator/src/akregator_plugin.desktop
 ===================================================================
---- akregator/src/akregator_plugin.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ akregator/src/akregator_plugin.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- akregator/src/akregator_plugin.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/akregator_plugin.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -3,6 +3,7 @@
  X-KDE-ServiceType=Akregator/Plugin
  Comment=Plugin for Akregator
@@ -87,7 +172,11 @@
  Comment[bg]=Приставка за Akregator
  Comment[br]=Lugent evit Akregator
  Comment[ca]=Endollable per a Akregator
-@@ -27,6 +28,7 @@
+@@ -24,9 +25,11 @@
+ Comment[ja]=Akregator 用プラグイン
+ Comment[km]=កម្មវិធី​ជំនួយ Akregator
+ Comment[lt]=Akregator skirtas priedas
++Comment[mk]=Приклучок за Akregator
  Comment[ms]=Plugin untuk Akregator
  Comment[nb]=Programtillegg for Akregator
  Comment[nds]=Moduul för Akregator
@@ -97,8 +186,8 @@
  Comment[pl]=Wtyczka dla Akregatora
 Index: akregator/src/akregator.desktop
 ===================================================================
---- akregator/src/akregator.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ akregator/src/akregator.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- akregator/src/akregator.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/akregator.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -1,6 +1,7 @@
  [Desktop Entry]
  Encoding=UTF-8
@@ -125,8 +214,8 @@
  Comment[pl]=Program podsumowujący kanały RSS dla KDE
 Index: akregator/src/eventsrc
 ===================================================================
---- akregator/src/eventsrc	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ akregator/src/eventsrc	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- akregator/src/eventsrc	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/eventsrc	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -2,6 +2,7 @@
  IconName=akregator
  Comment=Akregator
@@ -160,7 +249,11 @@
  Name[bg]=Нови статии
  Name[br]=Pennadoù nevez
  Name[ca]=Nous articles
-@@ -120,6 +125,7 @@
+@@ -117,9 +122,11 @@
+ Name[ja]=新規記事
+ Name[km]=អត្ថបទ​ថ្មី
+ Name[lt]=Nauji straipsniai
++Name[mk]=Нови написи
  Name[ms]=Artikel Baru
  Name[nb]=Nye artikler
  Name[nds]=Niege Artikeln
@@ -168,7 +261,7 @@
  Name[nl]=Nieuwe artikelen
  Name[nn]=Nye artiklar
  Name[pl]=Nowe artykuły
-@@ -140,6 +146,7 @@
+@@ -140,6 +147,7 @@
  Name[zh_TW]=新文章
  Comment=New articles were fetched
  Comment[af]=Nuwe artikels was afgelaai
@@ -176,7 +269,11 @@
  Comment[bg]=Пристигнали са нови статии
  Comment[ca]=S'han obtingut nous articles
  Comment[cs]=Byly staženy nové články
-@@ -164,6 +171,7 @@
+@@ -161,9 +169,11 @@
+ Comment[ja]=新規記事を取得しました
+ Comment[km]=បាន​ប្រមូល​អត្ថបទ​ថ្មី
+ Comment[lt]=Nauji straipsniai parsiųsti
++Comment[mk]=Беа земени нови написи
  Comment[ms]=Artikel baru telah dikutip
  Comment[nb]=Nye artikler ble hentet
  Comment[nds]=Niege Artikeln wöörn haalt
@@ -186,8 +283,8 @@
  Comment[pl]=Pobrano nowe artykuły
 Index: akregator/src/akregator_view.cpp
 ===================================================================
---- akregator/src/akregator_view.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ akregator/src/akregator_view.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- akregator/src/akregator_view.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ akregator/src/akregator_view.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -367,20 +367,9 @@
      }
  
@@ -221,8 +318,8 @@
      else
 Index: kmobile/libkmobile.desktop
 ===================================================================
---- kmobile/libkmobile.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/libkmobile.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kmobile/libkmobile.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/libkmobile.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -29,6 +29,7 @@
  Name[ms]=Pemacu Perkakasan Tahap Rendah Peranti Mudah Alih KDE 
  Name[nb]=KDE lavnivå maskinvaredriver for mobile enheter
@@ -233,8 +330,8 @@
  Name[pl]=Niskopoziomowy sterownik sprzętu urządzenia przenośnego dla KDE
 Index: kmobile/devices/gnokii/libkmobile_gnokii.desktop
 ===================================================================
---- kmobile/devices/gnokii/libkmobile_gnokii.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/devices/gnokii/libkmobile_gnokii.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kmobile/devices/gnokii/libkmobile_gnokii.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/devices/gnokii/libkmobile_gnokii.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -2,6 +2,7 @@
  Encoding=UTF-8
  Name=Mobile Phone or Organizer (gnokii)
@@ -261,8 +358,8 @@
  Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gnokii
 Index: kmobile/devices/skeleton/libkmobile_skeleton.desktop
 ===================================================================
---- kmobile/devices/skeleton/libkmobile_skeleton.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/devices/skeleton/libkmobile_skeleton.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kmobile/devices/skeleton/libkmobile_skeleton.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/devices/skeleton/libkmobile_skeleton.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -30,6 +30,7 @@
  Name[ms]=Peranti Rangka
  Name[nb]=Ramme-enhet
@@ -281,8 +378,8 @@
  Comment[pl]=Szkieletowe urządzenie przenośne
 Index: kmobile/devices/gammu/libkmobile_gammu.desktop
 ===================================================================
---- kmobile/devices/gammu/libkmobile_gammu.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/devices/gammu/libkmobile_gammu.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kmobile/devices/gammu/libkmobile_gammu.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/devices/gammu/libkmobile_gammu.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -2,6 +2,7 @@
  Encoding=UTF-8
  Name=Mobile Phone or Organizer (gammu)
@@ -309,9 +406,13 @@
  Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gammu
 Index: kmobile/devices/digicam/libkmobile_digicam.desktop
 ===================================================================
---- kmobile/devices/digicam/libkmobile_digicam.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/devices/digicam/libkmobile_digicam.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
-@@ -31,6 +31,7 @@
+--- kmobile/devices/digicam/libkmobile_digicam.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/devices/digicam/libkmobile_digicam.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -28,9 +28,11 @@
+ Name[ja]=デジタルカメラ
+ Name[km]=ម៉ាស៊ីន​ថត​រូប​ឌីជីថល
+ Name[lt]=Skaitmeninė kamera
++Name[mk]=Дигитална камера
  Name[ms]=Kamera Digital 
  Name[nb]=Digitalkamera
  Name[nds]=Digitaalkamera
@@ -319,7 +420,11 @@
  Name[nl]=Digitale camera
  Name[nn]=Digitalt kamera
  Name[pa]=ਡਿਜ਼ੀਟਲ ਕੈਮਰਾ
-@@ -80,6 +81,7 @@
+@@ -77,9 +79,11 @@
+ Comment[ja]=本ドライバは多種のデジタルカメラをサポートします
+ Comment[km]=កម្មវិធី​បញ្ជា​នេះ​គាំទ្រ​ម៉ាស៊ីន​ថត​រូប​ឌីជីថល​ជាច្រើន
+ Comment[lt]=Ši tvarkyklė palaiko daugelį skaitmeninių kamerų
++Comment[mk]=Овој управувач поддржува многу дигитални камери
  Comment[ms]=Pemacu ini menyokong banyak kamera digital 
  Comment[nb]=Denne driveren støtter mange digitalkameraer
  Comment[nds]=Ein Driever, de vele Digitaalkameras ünnerstütt
@@ -329,8 +434,8 @@
  Comment[pl]=Ten sterownik obsługuje wiele aparatów cyfrowych
 Index: kmobile/kmobile.desktop
 ===================================================================
---- kmobile/kmobile.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/kmobile.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kmobile/kmobile.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/kmobile.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -9,6 +9,7 @@
  Name=KMobile
  Name[cy]=KSymudol
@@ -349,7 +454,11 @@
  GenericName[bg]=Мобилни устройства
  GenericName[br]=Merañ an trobarhelloù lem-laka
  GenericName[bs]=Upravljajte mobilnim uređajima
-@@ -45,6 +47,7 @@
+@@ -42,9 +44,11 @@
+ GenericName[ja]=モバイル機器の管理
+ GenericName[km]=គ្រប់គ្រង​ឧបករណ៍​ចល័ត
+ GenericName[lt]=Mobiliųjų įrenginių tvarkymas
++GenericName[mk]=Менаџирање мобилни уреди
  GenericName[ms]=Menguruskan Peranti Mudah Alih
  GenericName[nb]=Håndtere mobile enheter
  GenericName[nds]=Mobilreedschappen plegen
@@ -357,7 +466,7 @@
  GenericName[nl]=Mobiele apparaten beheren
  GenericName[nn]=Handtera mobileiningar
  GenericName[pl]=Zarządzanie urządzeniami przenośnymi
-@@ -67,7 +70,7 @@
+@@ -67,7 +71,7 @@
  
  Comment=A KDE Mobile Devices Manager
  Comment[af]='n KDE draagbare toestel bestuurder
@@ -366,7 +475,11 @@
  Comment[bg]=Управление на мобилни устройства
  Comment[bs]=KDE upravitelj mobilnim uređajima
  Comment[ca]=Un gestor de KDE per a dispositius mòbils
-@@ -95,6 +98,7 @@
+@@ -92,9 +96,11 @@
+ Comment[ja]=KDE モバイル機器マネージャ
+ Comment[km]=កម្មវិធី​គ្រប់គ្រង​ឧបករណ៍​ចល័ត KDE
+ Comment[lt]=KDE mobiliųjų įrenginių tvarkyklė
++Comment[mk]=Менаџер на мобилни уреди во KDE
  Comment[ms]=Pengurus Peranti Mudah Alih   KDE 
  Comment[nb]=En KDE-håndterer for mobile enheter
  Comment[nds]=En Pleger för Mobilreedschappen
@@ -376,8 +489,8 @@
  Comment[pl]=Program obsługujący urządzenia przenośne dla KDE
 Index: kmobile/kioslave/mimetypes/mobile_addressbook.desktop
 ===================================================================
---- kmobile/kioslave/mimetypes/mobile_addressbook.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/kioslave/mimetypes/mobile_addressbook.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kmobile/kioslave/mimetypes/mobile_addressbook.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/kioslave/mimetypes/mobile_addressbook.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -2,6 +2,7 @@
  Encoding=UTF-8
  Comment=Contacts in Mobile Device
@@ -386,7 +499,11 @@
  Comment[be]=Кантакты ў мабільнай прыладзе
  Comment[bg]=Контакти в мобилни устройства
  Comment[bs]=Kontakti u mobilnom uređaju
-@@ -30,6 +31,7 @@
+@@ -27,9 +28,11 @@
+ Comment[ja]=モバイル機器内の連絡先
+ Comment[km]=ទំនាក់​ទំនង​ក្នុង​ឧបករណ៍​ចល័ត
+ Comment[lt]=Kontaktai mobiliajame įrenginyje
++Comment[mk]=Контакти од мобилен уред
  Comment[ms]=Orang hubungan di dalam Peranti Mudah Alih
  Comment[nb]=Kontaktliste i mobil enhet
  Comment[nds]=Kontakten op de Mobilreedschap
@@ -396,9 +513,13 @@
  Comment[pl]=Wizytówki w urządzeniu przenośnym
 Index: kmobile/kioslave/mimetypes/mobile_notes.desktop
 ===================================================================
---- kmobile/kioslave/mimetypes/mobile_notes.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/kioslave/mimetypes/mobile_notes.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
-@@ -30,6 +30,7 @@
+--- kmobile/kioslave/mimetypes/mobile_notes.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/kioslave/mimetypes/mobile_notes.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -27,9 +27,11 @@
+ Comment[ja]=モバイル機器内のメモ
+ Comment[km]=ចំណាំ​ក្នុង​ឧបករណ៍​ចល័ត
+ Comment[lt]=Užrašai mobiliajame įrenginyje
++Comment[mk]=Белешки од мобилен уред
  Comment[ms]=Nota dalam Peranti Mudah Alih
  Comment[nb]=Notater i mobil enhet
  Comment[nds]=Notizen op Mobilreedschap
@@ -408,9 +529,13 @@
  Comment[pl]=Notatki w urządzeniu przenośnym
 Index: kmobile/kioslave/mimetypes/mobile_calendar.desktop
 ===================================================================
---- kmobile/kioslave/mimetypes/mobile_calendar.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/kioslave/mimetypes/mobile_calendar.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
-@@ -30,6 +30,7 @@
+--- kmobile/kioslave/mimetypes/mobile_calendar.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/kioslave/mimetypes/mobile_calendar.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -27,9 +27,11 @@
+ Comment[ja]=モバイル機器内のカレンダー
+ Comment[km]=ប្រតិទិន​ក្នុង​ឧបករណ៍​ចល័ត
+ Comment[lt]=Kalendorius mobiliajame įrenginyje
++Comment[mk]=Календар од мобилен уред
  Comment[ms]=Kalendar dalam Peranti Mudah Alih
  Comment[nb]=Kalender i mobil enhet
  Comment[nds]=Kalenner op Mobilreedschap
@@ -418,7 +543,7 @@
  Comment[nl]=Agenda in mobiel apparaat
  Comment[nn]=Kalender i mobileiningar
  Comment[pl]=Kalendarz w urządzeniu przenośnym
-@@ -46,7 +47,7 @@
+@@ -46,7 +48,7 @@
  Comment[tg]=Тақвим дар дастгоҳи мобилӣ
  Comment[tr]=Cep Telefonu Takvimi
  Comment[uk]=Календар у мобільному пристрої
@@ -429,8 +554,8 @@
  Type=MimeType
 Index: kmobile/kioslave/mimetypes/mobile_device.desktop
 ===================================================================
---- kmobile/kioslave/mimetypes/mobile_device.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kmobile/kioslave/mimetypes/mobile_device.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kmobile/kioslave/mimetypes/mobile_device.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kmobile/kioslave/mimetypes/mobile_device.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -2,6 +2,7 @@
  Encoding=UTF-8
  Comment=Mobile Device
@@ -439,7 +564,11 @@
  Comment[be]=Мабільная прылада
  Comment[bg]=Мобилни устройства
  Comment[br]=Trobarzhell lem-laka
-@@ -31,6 +32,7 @@
+@@ -28,9 +29,11 @@
+ Comment[ja]=モバイル機器
+ Comment[km]=ឧបករណ៍​ចល័ត
+ Comment[lt]=Mobilusis įrenginys
++Comment[mk]=Мобилен уред
  Comment[ms]=Peranti Mudah Alih
  Comment[nb]=Mobil enhet
  Comment[nds]=Mobilreedschap
@@ -449,8 +578,8 @@
  Comment[pa]=ਮੋਬਾਇਲ ਜੰਤਰ
 Index: wizards/groupwarewizard.desktop
 ===================================================================
---- wizards/groupwarewizard.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ wizards/groupwarewizard.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- wizards/groupwarewizard.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ wizards/groupwarewizard.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -16,7 +16,7 @@
  Name[fa]=جادوگر KDE Groupware
  Name[fi]=KDE Groupwaren ohjattu toiminto
@@ -470,8 +599,8 @@
  Name[pl]=Asystent KDE Groupware
 Index: kresources/egroupware/kabc_xmlrpc.desktop
 ===================================================================
---- kresources/egroupware/kabc_xmlrpc.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/egroupware/kabc_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/egroupware/kabc_xmlrpc.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/egroupware/kabc_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -25,6 +25,7 @@
  Name[ms]=Pelayan eGroupware (melalui  XML-RPC)
  Name[nb]=eGroupware-tjener (via XML-RPPC)
@@ -482,8 +611,8 @@
  Name[pl]=Serwer eGroupware (poprzez XML-RPC)
 Index: kresources/egroupware/knotes_xmlrpc.desktop
 ===================================================================
---- kresources/egroupware/knotes_xmlrpc.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/egroupware/knotes_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/egroupware/knotes_xmlrpc.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/egroupware/knotes_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -25,6 +25,7 @@
  Name[ms]=Pelayan eGroupware (melalui  XML-RPC)
  Name[nb]=eGroupware-tjener (via XML-RPPC)
@@ -494,8 +623,8 @@
  Name[pl]=Serwer eGroupware (poprzez XML-RPC)
 Index: kresources/egroupware/kcal_xmlrpc.desktop
 ===================================================================
---- kresources/egroupware/kcal_xmlrpc.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/egroupware/kcal_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/egroupware/kcal_xmlrpc.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/egroupware/kcal_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -25,6 +25,7 @@
  Name[ms]=Pelayan eGroupware (melalui  XML-RPC)
  Name[nb]=eGroupware-tjener (via XML-RPPC)
@@ -506,8 +635,8 @@
  Name[pl]=Serwer eGroupware (poprzez XML-RPC)
 Index: kresources/tvanytime/kcal_tvanytime.desktop
 ===================================================================
---- kresources/tvanytime/kcal_tvanytime.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/tvanytime/kcal_tvanytime.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/tvanytime/kcal_tvanytime.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/tvanytime/kcal_tvanytime.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -2,6 +2,7 @@
  Encoding=UTF-8
  Name=TV Schedules
@@ -516,8 +645,11 @@
  Name[bg]=Разписание TV
  Name[ca]=Programació de la TV
  Name[cs]=TV programy
-@@ -24,6 +25,7 @@
+@@ -22,8 +23,10 @@
+ Name[ja]=TV スケジュール
+ Name[km]=កាលវិភាគ​ទូរទស្សន៍
  Name[lt]=TV tvarkaraščiai
++Name[mk]=ТВ програми
  Name[nb]=TV-program
  Name[nds]=Feernsehprogramm
 +Name[ne]=टीभी कार्यतालिका
@@ -526,9 +658,13 @@
  Name[pl]=Program telewizyjny
 Index: kresources/exchange/exchange.desktop
 ===================================================================
---- kresources/exchange/exchange.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/exchange/exchange.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
-@@ -31,6 +31,7 @@
+--- kresources/exchange/exchange.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/exchange/exchange.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -28,9 +28,11 @@
+ Name[ja]=Exchange 2000 サーバ
+ Name[km]=ម៉ាស៊ីន​បម្រើ Exchange ២០០០
+ Name[lt]=Exchange 2000 serveris
++Name[mk]=Exchange 2000-сервер
  Name[ms]=Pelayan Exchange 2000 
  Name[nb]=Exchange 2000-tjener
  Name[nds]=Exchange2000-Server
@@ -538,9 +674,13 @@
  Name[pl]=Serwer Exchange 2000
 Index: kresources/exchange/exchange_deprecated.desktop
 ===================================================================
---- kresources/exchange/exchange_deprecated.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/exchange/exchange_deprecated.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
-@@ -26,6 +26,7 @@
+--- kresources/exchange/exchange_deprecated.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/exchange/exchange_deprecated.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
+@@ -23,9 +23,11 @@
+ Name[ja]=Exchange 2000 サーバ (廃止予定)
+ Name[km]=ម៉ាស៊ីន​បម្រើ Exchange ២០០០ (មិន​សូវ​ល្អ)
+ Name[lt]=Exchange 2000 serveris (deprecated)
++Name[mk]=Exchange 2000-сервер (застарено)
  Name[ms]=Pelayan Exchange 2000  (tidak disetujui)
  Name[nb]=Exchange 2000-tjener (frarådet)
  Name[nds]=Exchange2000-Server (utlopen Ünnerstütten)
@@ -550,8 +690,8 @@
  Name[pl]=Serwer Exchange 2000 (przestarzałe)
 Index: kresources/groupwise/kcal_groupwise.desktop
 ===================================================================
---- kresources/groupwise/kcal_groupwise.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/groupwise/kcal_groupwise.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/groupwise/kcal_groupwise.desktop	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/groupwise/kcal_groupwise.desktop	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -25,6 +25,7 @@
  Name[ms]=Pelayan Novell GroupWise 
  Name[nb]=Novell GroupWise-tjener
@@ -562,8 +702,8 @@
  Name[pl]=Serwer Novell GroupWise
 Index: kresources/groupwise/soap/stdsoap2.h
 ===================================================================
---- kresources/groupwise/soap/stdsoap2.h	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/groupwise/soap/stdsoap2.h	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/groupwise/soap/stdsoap2.h	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/groupwise/soap/stdsoap2.h	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -507,7 +507,9 @@
  # endif
  #endif
@@ -576,8 +716,8 @@
  extern "C" {
 Index: kresources/groupwise/soap/gwconverter.cpp
 ===================================================================
---- kresources/groupwise/soap/gwconverter.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/groupwise/soap/gwconverter.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/groupwise/soap/gwconverter.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/groupwise/soap/gwconverter.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -131,3 +131,41 @@
    QDateTime utc = charToQDateTime( str );
    return KPimPrefs::utcToLocalTime( utc, timezone );
@@ -622,8 +762,8 @@
 +
 Index: kresources/groupwise/soap/incidenceconverter.cpp
 ===================================================================
---- kresources/groupwise/soap/incidenceconverter.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/groupwise/soap/incidenceconverter.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/groupwise/soap/incidenceconverter.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/groupwise/soap/incidenceconverter.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -626,20 +626,20 @@
      std::vector<ngwt__Recipient*>::const_iterator it;
  
@@ -652,8 +792,8 @@
      }
 Index: kresources/groupwise/soap/groupwiseserver.cpp
 ===================================================================
---- kresources/groupwise/soap/groupwiseserver.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 636868)
-+++ kresources/groupwise/soap/groupwiseserver.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 636868)
+--- kresources/groupwise/soap/groupwiseserver.cpp	(.../tags/KDE/3.5.6/kdepim)	(wersja 637414)
++++ kresources/groupwise/soap/groupwiseserver.cpp	(.../branches/KDE/3.5/kdepim)	(wersja 637414)
 @@ -1023,11 +1023,12 @@
    }
    else  // If I am not the organizer restrict my changes to accept or decline requests or task completion
@@ -671,8 +811,8 @@
          else if ( (*it)->status() == KCal::Attendee::Declined )
 Index: kresources/groupwise/soap/gwconverter.h
 ===================================================================
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.38&r2=1.39&f=u



More information about the pld-cvs-commit mailing list