[Pkg-kde-commits] rev 2150 - in
branches/kde-3.4.0/packages/kdebase/debian: . patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Nov 5 15:24:04 UTC 2005
Author: chrsmrtn
Date: 2005-11-05 15:24:03 +0000 (Sat, 05 Nov 2005)
New Revision: 2150
Added:
branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r477941.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/29_kcontrol_adminmode_from_3_5.diff
Modified:
branches/kde-3.4.0/packages/kdebase/debian/changelog
Log:
Branch update and the kcontrol "I can use admin mode again!" patch,
courtesy of Jonathan Riddell. Doesn't seem to break anything...
Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-11-04 23:53:54 UTC (rev 2149)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-11-05 15:24:03 UTC (rev 2150)
@@ -1,10 +1,15 @@
kdebase (4:3.4.3-3) UNRELEASED; urgency=low
+ * KDE_3_4_BRANCH update (up to r477941).
+
+++ Changes by Christopher Martin:
* Add "noextendedglob" to zsh's options when reading the X startup scripts
for kdm. This works around some of its quirks. (Closes: #336305)
+ * Backport a fix from KDE 3.5 for a bug that caused switching to
+ Administrator mode in KControl to fail on occasion. (Closes: #306951)
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
kdebase (4:3.4.3-2) experimental; urgency=low
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r477941.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r477941.diff 2005-11-04 23:53:54 UTC (rev 2149)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r477941.diff 2005-11-05 15:24:03 UTC (rev 2150)
@@ -0,0 +1,945 @@
+#DPATCHLEVEL=0
+--- kcontrol/background/bgdialog_ui.ui (revision 470887)
++++ kcontrol/background/bgdialog_ui.ui (revision 477941)
+@@ -640,9 +640,9 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcombobox.h</includehint>
++
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/background/bgadvanced_ui.ui (revision 470887)
++++ kcontrol/background/bgadvanced_ui.ui (revision 477941)
+@@ -456,7 +456,7 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
++
++
+ </includehints>
+ </UI>
+--- kcontrol/knotify/playersettings.ui (revision 470887)
++++ kcontrol/knotify/playersettings.ui (revision 477941)
+@@ -323,8 +323,8 @@
+ </tabstops>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>kurlrequester.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/componentchooser/componentchooser.desktop (revision 470887)
++++ kcontrol/componentchooser/componentchooser.desktop (revision 477941)
+@@ -55,7 +55,7 @@
+ Name[pt]=Selector de Componentes
+ Name[pt_BR]=Seletor de Componentes
+ Name[ro]=Selector de componente
+-Name[ru]=Выбор компонентов
++Name[ru]=Компоненты по умолчанию
+ Name[se]=Oasseválljejeaddji
+ Name[sk]=Výber komponentov
+ Name[sl]=Izbiralec komponent
+--- kcontrol/componentchooser/componentchooser_ui.ui (revision 470887)
++++ kcontrol/componentchooser/componentchooser_ui.ui (revision 477941)
+@@ -128,6 +128,6 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>klistbox.h</includehint>
++
+ </includehints>
+ </UI>
+--- kcontrol/accessibility/accessibilityconfigwidget.ui (revision 470887)
++++ kcontrol/accessibility/accessibilityconfigwidget.ui (revision 477941)
+@@ -1614,18 +1614,18 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcmodule.h</includehint>
+- <includehint>kurlrequester.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
++
++
++
++
++
++
++
++
++
++
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/info/memory_linux.cpp (revision 470887)
++++ kcontrol/info/memory_linux.cpp (revision 477941)
+@@ -1,5 +1,4 @@
+ #include <sys/sysinfo.h>
+-#include <linux/kernel.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <qfile.h>
+--- kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui (revision 470887)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui (revision 477941)
+@@ -129,9 +129,9 @@
+ </tabstops>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>klineedit.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kcombobox.h</includehint>
++
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop (revision 470887)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop (revision 477941)
+@@ -24,6 +24,7 @@
+ Name[hu]=Merriam-Webster szinonimaszótár
+ Name[is]=Merriam-Webster samheitaorðabók
+ Name[it]=Dizionario dei sinonimi Merriam-Webster
++Name[ja]=Merriam-Webster シソーラス
+ Name[ko]=메리암-웹스터 백과사전
+ Name[lv]=Merriam-Webster Enciklopēdija
+ Name[mk]=Merriam-Webster Енциклопедија
+--- kcontrol/konq/desktopbehavior.ui (revision 470887)
++++ kcontrol/konq/desktopbehavior.ui (revision 477941)
+@@ -420,7 +420,7 @@
+ </tabstops>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>klistview.h</includehint>
+- <includehint>klistview.h</includehint>
++
++
+ </includehints>
+ </UI>
+--- kcontrol/kicker/lookandfeeltab.ui (revision 470887)
++++ kcontrol/kicker/lookandfeeltab.ui (revision 477941)
+@@ -615,18 +615,18 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kurlrequester.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
++
++
++
++
++
++
++
++
++
++
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/kicker/applettab.ui (revision 470887)
++++ kcontrol/kicker/applettab.ui (revision 477941)
+@@ -222,6 +222,6 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>qwidget.h</includehint>
++
+ </includehints>
+ </UI>
+--- kcontrol/kicker/advancedOptions.ui (revision 470887)
++++ kcontrol/kicker/advancedOptions.ui (revision 477941)
+@@ -304,7 +304,7 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>knuminput.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
++
++
+ </includehints>
+ </UI>
+--- kcontrol/kicker/hidingtab.ui (revision 470887)
++++ kcontrol/kicker/hidingtab.ui (revision 477941)
+@@ -743,6 +743,6 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>knuminput.h</includehint>
++
+ </includehints>
+ </UI>
+--- kcontrol/kicker/menutab.ui (revision 470887)
++++ kcontrol/kicker/menutab.ui (revision 477941)
+@@ -433,10 +433,10 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>klistview.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
++
++
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/kicker/positiontab.ui (revision 470887)
++++ kcontrol/kicker/positiontab.ui (revision 477941)
+@@ -1118,9 +1118,9 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
++
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/arts/generaltab.ui (revision 470887)
++++ kcontrol/arts/generaltab.ui (revision 477941)
+@@ -301,6 +301,6 @@
+ </widget>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>knuminput.h</includehint>
++
+ </includehints>
+ </UI>
+--- kcontrol/arts/hardwaretab.ui (revision 470887)
++++ kcontrol/arts/hardwaretab.ui (revision 477941)
+@@ -285,8 +285,8 @@
+ </widget>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>kurlrequester.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/kio/kproxydlg_ui.ui (revision 470887)
++++ kcontrol/kio/kproxydlg_ui.ui (revision 477941)
+@@ -436,6 +436,6 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kpushbutton.h</includehint>
++
+ </includehints>
+ </UI>
+--- kcontrol/kio/uagentproviderdlg_ui.ui (revision 470887)
++++ kcontrol/kio/uagentproviderdlg_ui.ui (revision 477941)
+@@ -200,8 +200,8 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>klineedit.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>klineedit.h</includehint>
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/kio/kcookiespoliciesdlg_ui.ui (revision 470887)
++++ kcontrol/kio/kcookiespoliciesdlg_ui.ui (revision 477941)
+@@ -320,7 +320,7 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>klistview.h</includehint>
+- <includehint>klistviewsearchline.h</includehint>
++
++
+ </includehints>
+ </UI>
+--- kcontrol/kio/kcookiesmanagementdlg_ui.ui (revision 470887)
++++ kcontrol/kio/kcookiesmanagementdlg_ui.ui (revision 477941)
+@@ -318,6 +318,6 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>klistviewsearchline.h</includehint>
++
+ </includehints>
+ </UI>
+--- kcontrol/kio/useragentdlg_ui.ui (revision 470887)
++++ kcontrol/kio/useragentdlg_ui.ui (revision 477941)
+@@ -349,7 +349,7 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>klineedit.h</includehint>
+- <includehint>klistview.h</includehint>
++
++
+ </includehints>
+ </UI>
+--- kcontrol/css/cssconfig.ui (revision 470887)
++++ kcontrol/css/cssconfig.ui (revision 477941)
+@@ -828,7 +828,7 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
++
++
+ </includehints>
+ </UI>
+--- kcontrol/konqhtml/nsconfigwidget.ui (revision 470887)
++++ kcontrol/konqhtml/nsconfigwidget.ui (revision 477941)
+@@ -264,10 +264,10 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>qwidget.h</includehint>
+- <includehint>kurlrequester.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>klistbox.h</includehint>
++
++
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/xinerama/xineramawidget.ui (revision 470887)
++++ kcontrol/xinerama/xineramawidget.ui (revision 477941)
+@@ -321,6 +321,6 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>qwidget.h</includehint>
++
+ </includehints>
+ </UI>
+--- kcontrol/randr/krandrtray.desktop (revision 470887)
++++ kcontrol/randr/krandrtray.desktop (revision 477941)
+@@ -25,6 +25,7 @@
+ GenericName[hu]=Képernyőbeállító
+ GenericName[is]=Stærð og snúningur skjáa
+ GenericName[it]=Ruota e ridimensiona lo schermo
++GenericName[ja]=スクリーンのリサイズと回転
+ GenericName[lt]=Ekrano dydžio keitimas ir pasukimas
+ GenericName[nb]=Endre skjermstørrelsen og rotere
+ GenericName[nl]=Scherm roteren en grootte wijzigen
+--- kcontrol/randr/randr.desktop (revision 470887)
++++ kcontrol/randr/randr.desktop (revision 477941)
+@@ -131,7 +131,7 @@
+ Keywords[cy]=newid maint,cylchdroi,dangos,lliw,dyfnder,maint,llorweddol,fertigol
+ Keywords[da]=ændr,rotér,visning,farve,dybde,størrelse,vandret,lodret
+ Keywords[de]=Größe ändern,rotieren,anzeigen,Farbe,Tiefe,Größe,horizontal,vertikal,waagrecht,senkrecht
+-Keywords[el]=αλλαγή μεγέθους,περιστροφή,οθόνη,χρώμα,βάθος,μέγεθος,οριζόντια,κάθετα
++Keywords[el]=αλλαγή μεγέθους,περιστροφή,οθόνη,χρώμα,βάθος,μέγεθος,οριζόντια,κατακόρυφα
+ Keywords[en_GB]=resize,rotate,display,colour,depth,size,horizontal,vertical
+ Keywords[eo]=grandigi,turni,direkto,ekrano,ekranbloko,grandeco,koloro,horizontala,vertikala
+ Keywords[es]=redimensionar,rotar,mostrar,color,colores,tamaño,horizontal,vertical
+--- kcontrol/kthememanager/kthemedlg.ui (revision 470887)
++++ kcontrol/kthememanager/kthemedlg.ui (revision 477941)
+@@ -512,6 +512,6 @@
+ </slots>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>kurllabel.h</includehint>
++
+ </includehints>
+ </UI>
+--- kcontrol/konsole/sessiondialog.ui (revision 470887)
++++ kcontrol/konsole/sessiondialog.ui (revision 477941)
+@@ -437,8 +437,8 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kurlrequester.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
++
++
++
+ </includehints>
+ </UI>
+--- kcontrol/keys/unix3.kksrc (revision 470887)
++++ kcontrol/keys/unix3.kksrc (revision 477941)
+@@ -19,6 +19,7 @@
+ Name[hu]=UNIX
+ Name[is]=UNIX þema
+ Name[it]=Schema UNIX
++Name[ja]=UNIX スキーマ
+ Name[lo]=ຊຸດຮູບແບບ KWM
+ Name[lt]=UNIX schema
+ Name[mn]=UNIX-Схем
+--- kcontrol/keys/wm3.kksrc (revision 470887)
++++ kcontrol/keys/wm3.kksrc (revision 477941)
+@@ -15,6 +15,7 @@
+ Name[hu]=WindowMaker (3 módosító billentyű)
+ Name[is]=WindowMaker (3 breytilyklar)
+ Name[it]=WindowMaker (3 tasti modificatori)
++Name[ja]=WindowMaker (3 モディファイアキー)
+ Name[lt]=WindowMaker (3 klavišai - modifikatoriai)
+ Name[mn]=WindowMaker (3 сэлгүүр товчилуур)
+ Name[nb]=WindowMaker (3 modifikatortaster)
+--- kcontrol/keys/win3.kksrc (revision 470887)
++++ kcontrol/keys/win3.kksrc (revision 477941)
+@@ -18,6 +18,7 @@
+ Name[hu]=Windows (Win billentyű nélkül)
+ Name[is]=Windowsþema (án Win lykils)
+ Name[it]=Schema Windows (senza tasto Win)
++Name[ja]=Windows スキーマ (Win キーなし)
+ Name[lo]=ຊຸດຮູບແບບວິນໂດ (ບໍ່ມີປຸ່ມ Win)
+ Name[lt]=Windows schema (be Win klavišo)
+ Name[lv]=Windows Shēma (Bez Win-Taustiņa)
+--- kcontrol/keys/win4.kksrc (revision 470887)
++++ kcontrol/keys/win4.kksrc (revision 477941)
+@@ -18,6 +18,7 @@
+ Name[hu]=Windows (Win billentyűvel)
+ Name[is]=Windowsþema (með Win lykli)
+ Name[it]=Schema Windows (con tasto Win)
++Name[ja]=Windows スキーマ (Win キーあり)
+ Name[lo]=ຊຸດຮູບແບບວິນໂດ (ມີປຸ່ມ Win)
+ Name[lt]=Windows schema (su Win klavišu)
+ Name[lv]=Windows Shēma (Ar Win-Taustiņu)
+--- kcontrol/keys/mac4.kksrc (revision 470887)
++++ kcontrol/keys/mac4.kksrc (revision 477941)
+@@ -19,6 +19,7 @@
+ Name[hu]=Mac
+ Name[is]=Mac þema
+ Name[it]=Schema Mac
++Name[ja]=Macintosh スキーマ
+ Name[lo]=ຊຸດຮູບແບບ Mac
+ Name[lt]=Mac schema
+ Name[lv]=Mac Shēma
+--- kcontrol/keys/kde3.kksrc (revision 470887)
++++ kcontrol/keys/kde3.kksrc (revision 477941)
+@@ -14,6 +14,7 @@
+ Name[hu]=KDE-s alapértelmezés (3 módosító billentyűvel)
+ Name[is]=Sjálfgefið KDE fyrir 3 breytilykla
+ Name[it]=Predefinito di KDE per 3 tasti modificatori
++Name[ja]=3 モディファイアキーの KDE でのデフォルト
+ Name[lo]=ຄ່າປະລິຍາຍຂອງ KDE ສຳລັບປຸ່ມໃຊ້ຮ່ວມ 3 ປຸ່ມ
+ Name[lt]=KDE numatytoji 3 klavišams - modifikatoriams
+ Name[lv]=KDE Noklusētais priekš 3 Modifikatoru Taustiņiem
+--- kcontrol/keys/kde4.kksrc (revision 470887)
++++ kcontrol/keys/kde4.kksrc (revision 477941)
+@@ -14,6 +14,7 @@
+ Name[hu]=KDE-s alapértelmezés (4 módosító billentyűvel)
+ Name[is]=Sjálfgefið KDE fyrir 4 breytilykla
+ Name[it]=Predefinito di KDE per 4 tasti modificatori
++Name[ja]=4 モディファイアキーの KDE でのデフォルト
+ Name[lo]=ຄ່າປະລິຍາຍຂອງ KDE ສຳລັບປຸ່ມໃຊ້ຮ່ວມ 4 ປຸ່່ມ
+ Name[lt]=KDE numatytoji 4 klavišams - modifikatoriams
+ Name[lv]=KDE Noklusētais priekš 4 Modifikatoru Taustiņiem
+--- kcontrol/dnssd/configdialog.ui (revision 470887)
++++ kcontrol/dnssd/configdialog.ui (revision 477941)
+@@ -197,9 +197,9 @@
+ </slots>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>kcmodule.h</includehint>
+- <includehint>keditlistbox.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>klineedit.h</includehint>
++
++
++
++
+ </includehints>
+ </UI>
+--- pics/wallpapers/Time-For-Lunch-2.jpg.desktop (revision 470887)
++++ pics/wallpapers/Time-For-Lunch-2.jpg.desktop (revision 477941)
+@@ -21,6 +21,7 @@
+ Name[hu]=Ebédidő
+ Name[is]=Tími fyrir mat
+ Name[it]=L'ora di pranzo
++Name[ja]=昼食の時間
+ Name[lt]=Laikas pietauti
+ Name[nb]=Tid for lunsj
+ Name[nds]=Tiet för't Eten
+--- pics/wallpapers/Totally-New-Product-1.jpg.desktop (revision 470887)
++++ pics/wallpapers/Totally-New-Product-1.jpg.desktop (revision 477941)
+@@ -19,6 +19,7 @@
+ Name[hu]=Vadonatúj termék
+ Name[is]=Algerlega ný vara
+ Name[it]=Prodotto davvero nuovo
++Name[ja]=完全な新規プロダクト
+ Name[lo]=ผลิตภัณฑ์ใหม่ทั้งหมด
+ Name[lt]=Visiškai naujas produktas
+ Name[lv]=Pilnīgi Jauns Produkts
+--- pics/wallpapers/Planning-And-Probing-1.jpg.desktop (revision 470887)
++++ pics/wallpapers/Planning-And-Probing-1.jpg.desktop (revision 477941)
+@@ -18,6 +18,7 @@
+ Name[hu]=Terv és próba
+ Name[is]=Skipulag og þreifing
+ Name[it]=Pianifica e prova
++Name[ja]=計画と検証
+ Name[lt]=Planavimas ir tikrinimas
+ Name[nb]=Planlegge og teste
+ Name[nl]=Plannen en zoeken
+--- pics/wallpapers/fulmine.jpg.desktop (revision 470887)
++++ pics/wallpapers/fulmine.jpg.desktop (revision 477941)
+@@ -11,6 +11,7 @@
+ Name[fy]=Wjerljocht
+ Name[hi]=फुलमाइन
+ Name[is]=Elding
++Name[ja]=フルタイム
+ Name[nb]=Lynnedslag
+ Name[nl]=Bliksemschicht
+ Name[nn]=Lynnedslag
+--- kicker/applets/swallow/prefwidgetbase.ui (revision 470887)
++++ kicker/applets/swallow/prefwidgetbase.ui (revision 477941)
+@@ -125,10 +125,10 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>keditlistbox.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kurlrequester.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
++
++
++
++
++
+ </includehints>
+ </UI>
+--- kicker/applets/clock/fuzzy.ui (revision 470887)
++++ kicker/applets/clock/fuzzy.ui (revision 477941)
+@@ -280,8 +280,8 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kfontrequester.h</includehint>
++
++
++
+ </includehints>
+ </UI>
+--- kicker/applets/clock/digital.ui (revision 470887)
++++ kicker/applets/clock/digital.ui (revision 477941)
+@@ -298,8 +298,8 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
++
++
++
+ </includehints>
+ </UI>
+--- kicker/applets/clock/settings.ui (revision 470887)
++++ kicker/applets/clock/settings.ui (revision 477941)
+@@ -504,12 +504,12 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kfontrequester.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kfontrequester.h</includehint>
+- <includehint>klistview.h</includehint>
++
++
++
++
++
++
++
+ </includehints>
+ </UI>
+--- kicker/applets/clock/analog.ui (revision 470887)
++++ kicker/applets/clock/analog.ui (revision 477941)
+@@ -337,8 +337,8 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
+- <includehint>kcolorbutton.h</includehint>
++
++
++
+ </includehints>
+ </UI>
+--- kicker/applets/minipager/minipagerapplet.desktop (revision 470887)
++++ kicker/applets/minipager/minipagerapplet.desktop (revision 477941)
+@@ -20,6 +20,7 @@
+ Name[hu]=Asztal-előnézet és lapozó
+ Name[is]=Skjáborðs forskoðara
+ Name[it]=Anteprime e gestione dei desktop
++Name[ja]=デスクトッププレビューア/ページャ
+ Name[lt]=Darbastalių peržiūrėjimo ir puslapiavimo priemonė
+ Name[nb]=Forhåndsvising og bytte av skrivebord
+ Name[nds]=Schriefdisch-Ümschalter
+--- kappfinder/apps/Internet/Nmapfe.desktop (revision 470887)
++++ kappfinder/apps/Internet/Nmapfe.desktop (revision 477941)
+@@ -15,7 +15,7 @@
+ GenericName[cy]=Sganiwr Pyrth
+ GenericName[da]=Portskanner
+ GenericName[de]=Ports überprüfen
+-GenericName[el]=Ανιχνευτής θυρών
++GenericName[el]=Σαρωτής θυρών
+ GenericName[eo]=Programo por eltrovi malfermitajn pordojn de komputilo
+ GenericName[es]=Explorador de puertos
+ GenericName[et]=Portskänner
+--- kappfinder/apps/Utilities/SystemLogViewer.desktop (revision 470887)
++++ kappfinder/apps/Utilities/SystemLogViewer.desktop (revision 477941)
+@@ -5,6 +5,7 @@
+ Name[ar]=عارض سجلات النظام
+ Name[az]=Sistem Qeyd Nümayişçisi
+ Name[bn]=সিস্টেম লগ প্রদর্শক
++Name[br]=Gweler kerzlevr ar reizhiad
+ Name[bs]=Preglednik sistemskih dnevnika
+ Name[ca]=Visor de la bitàcola del sistema
+ Name[cs]=Prohlížeč systémových logů
+--- kdesktop/minicli_ui.ui (revision 470887)
++++ kdesktop/minicli_ui.ui (revision 477941)
+@@ -588,12 +588,12 @@
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>kpassdlg.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>klineedit.h</includehint>
++
++
++
++
++
++
++
+ </includehints>
+ </UI>
+--- konqueror/kttsplugin/khtmlkttsd.desktop (revision 470887)
++++ konqueror/kttsplugin/khtmlkttsd.desktop (revision 477941)
+@@ -29,6 +29,7 @@
+ Name[hu]=Szövegfelolvasó modul
+ Name[is]=Texti-í-tal íforrit
+ Name[it]=Plugin lettura del testo (text-to-speech)
++Name[ja]=Text-to-Speech プラグイン
+ Name[lt]=Teksto vertimo kalba priedas
+ Name[nb]=Programtillegg for tekst-til-tale
+ Name[nds]=Vörleser-Plugin
+--- konqueror/sidebar/trees/init/remote/web/look_web.desktop (revision 470887)
++++ konqueror/sidebar/trees/init/remote/web/look_web.desktop (revision 477941)
+@@ -19,6 +19,7 @@
+ Name[hu]=KDE grafikai kiegészítők
+ Name[is]=KDE augnayndi
+ Name[it]=Bellezza di KDE
++Name[ja]=KDE アイキャンディ
+ Name[nb]=KDE-pynt
+ Name[nds]=Wat för de Ogen vun KDE
+ Name[nl]=Oogstrelend KDE
+--- konqueror/sidebar/trees/history_module/history_dlg.ui (revision 470887)
++++ konqueror/sidebar/trees/history_module/history_dlg.ui (revision 477941)
+@@ -227,13 +227,13 @@
+ <layoutdefaults spacing="6" margin="0"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
++
++
++
++
++
++
++
++
+ </includehints>
+ </UI>
+--- libkonq/konq_pixmapprovider.cc (revision 470887)
++++ libkonq/konq_pixmapprovider.cc (revision 477941)
+@@ -93,7 +93,7 @@
+ {
+ iconMap.clear();
+ QStringList list;
+- list = kc->readListEntry( key );
++ list = kc->readPathListEntry( key );
+ QStringList::Iterator it = list.begin();
+ QString url, icon;
+ while ( it != list.end() ) {
+@@ -124,7 +124,7 @@
+
+ ++it;
+ }
+- kc->writeEntry( key, list );
++ kc->writePathEntry( key, list );
+ }
+
+ void KonqPixmapProvider::notifyChange( bool isHost, QString hostOrURL,
+--- kdcop/kdcopview.ui (revision 470887)
++++ kdcop/kdcopview.ui (revision 477941)
+@@ -146,7 +146,7 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kdcoplistview.h</includehint>
+- <includehint>klistbox.h</includehint>
++
++
+ </includehints>
+ </UI>
+--- drkonqi/presets/enduserrc (revision 470887)
++++ drkonqi/presets/enduserrc (revision 477941)
+@@ -237,7 +237,7 @@
+ Name[cy]=Efallai y dymunwch yrru adroddiad o'r nam i'r awdur. Cywirwch os mae o wedi'i restru ar http://bugs.kde.org, neu anfonwch ebost i'r awdur. Ceisiwch gynnwys cyn gymaint o wybodaeth â phosibl, ac efallai'r dogfennau gwreiddiol. Os oes modd i chi ail-greu'r gwall, cynhwyswch hwn hefyd.
+ Name[da]=Måske har du lyst til at sende en fejlrapport om dette program. Tjek om fejlen allerede er der på listen ihttp://bugs.kde.org, skriv ellers til forfatteren. Husk at inkludere så meget information som muligt, måske de oprindelige dokumenter. Hvis du er i stand til at reproducere fejlen, så husk også at nævne dette.
+ Name[de]=Vielleicht möchten Sie einen Problembericht (Bug Report) für dieses Programm erstellen? Bitte überprüfen Sie in diesem Fall, ob es unter http://bugs.kde.org aufgeführt ist, sonst schreiben Sie bitte eine Mail an den Autor (im Zweifelsfall auf Englisch). Geben Sie so viele Informationen wie möglich, die zur Reproduktion des Problems beitragen können, evtl. einschließlich der Dokumente, bei denen es auftritt.
+-Name[el]=Ίσως θέλετε να στείλετε μια αναφορά σφάλματος γι' αυτήν την εφαρμογή. Ελέγξτε εάν είναι καταχωρημένη στο http://bugs.kde.org αλλιώς στείλετε email στο συγγραφέα. Παρακαλούμε συμπεριλάβετε τη μέγιστη δυνατή πληροφορία, ίσως και τα αυθεντικά έγγραφα. Εάν έχετε κάποιον τρόπο να αναπαραχθεί το σφάλμα, συμπεριλάβετέ τον.
++Name[el]=Ίσως θέλετε να στείλετε μια αναφορά σφάλματος γι' αυτήν την εφαρμογή. Ελέγξτε εάν είναι καταχωρημένη στο http://bugs.kde.org αλλιώς στείλετε email στο συγγραφέα. Παρακαλώ συμπεριλάβετε τη μέγιστη δυνατή πληροφορία, ίσως και τα αυθεντικά έγγραφα. Εάν έχετε κάποιον τρόπο να αναπαραχθεί το σφάλμα, συμπεριλάβετέ τον.
+ Name[eo]=Vi povus sendi eraroraporton pri ĉi tiu aplikaĵo. Kontrolu ĉu la listo ĉe http://bugs.kde.org jam enhavas ĝin, alie sendu retpoŝton al la aŭtoro. Bonvolu kunsendi tiom da informoj, kiom eblas, laŭeble la originalajn dokumentojn. Se vi trovis manieron reprodukti la eraron, bonvolu krome aldoni ĝin.
+ Name[es]=Puede que quiera enviar un informe de fallos de esta aplicación. Por favor, compruebe si aparece en http://bugs.kde.org, si no, envíe un mensaje al autor. Por favor, incluya tanta información como pueda, tal vez incluso los documentos originales. Si hay una forma de reproducir el error, inclúyala también.
+ Name[et]=Kui soovid rakenduse kohta veateadet saata, kontrolli kõigepealt, ega sellest ei tea juba http://bugs.kde.org. Kui mitte, saada veateade autorile ja lisa palun nii palju infot, kui võimalik. Kui võimalik, siis ka originaaldokumendid. Kui tead, kuidas viga korrata, siis lisa ka see info.
+--- ktip/ktip.desktop (revision 470887)
++++ ktip/ktip.desktop (revision 477941)
+@@ -30,6 +30,7 @@
+ GenericName[hu]=Hasznos tippek
+ GenericName[is]=Gagnlegar ábendingar
+ GenericName[it]=Suggerimenti utili
++GenericName[ja]=役に立つヒトコト
+ GenericName[lt]=Naudingi patarimai
+ GenericName[nb]=Nyttige tips
+ GenericName[nds]=Gode Tipps
+--- kwin/kcmkwin/kwinrules/ruleswidgetbase.ui (revision 470887)
++++ kwin/kcmkwin/kwinrules/ruleswidgetbase.ui (revision 477941)
+@@ -2276,55 +2276,55 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>klistbox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>krestrictedline.h</includehint>
+- <includehint>krestrictedline.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>krestrictedline.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>krestrictedline.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>krestrictedline.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>krestrictedline.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>krestrictedline.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
+- <includehint>kcombobox.h</includehint>
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+ </includehints>
+ </UI>
+--- kdm/kfrontend/kgreeter.cpp (revision 470887)
++++ kdm/kfrontend/kgreeter.cpp (revision 477941)
+@@ -719,6 +719,8 @@
+ KStdGreeter::verifyFailed()
+ {
+ goButton->setEnabled( false );
++ if (userView)
++ userView->setEnabled( false );
+ inherited::verifyFailed();
+ }
+
+@@ -726,6 +728,8 @@
+ KStdGreeter::verifyRetry()
+ {
+ goButton->setEnabled( true );
++ if (userView)
++ userView->setEnabled( true );
+ }
+
+
+@@ -907,16 +911,16 @@
+ void
+ KThemedGreeter::slotSessMenu()
+ {
+- sessMenu->popup( session_button->rect().center() );
++ sessMenu->popup( mapToGlobal( session_button->rect().center() ) );
+ }
+
+ void
+ KThemedGreeter::slotActionMenu()
+ {
+ if (system_button)
+- optMenu->popup( system_button->rect().center() );
++ optMenu->popup( mapToGlobal( system_button->rect().center() ) );
+ else
+- optMenu->popup( rect().center() );
++ optMenu->popup( mapToGlobal( rect().center() ) );
+ }
+
+ void
+--- ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui (revision 470887)
++++ ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui (revision 477941)
+@@ -254,10 +254,10 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kurlrequester.h</includehint>
+- <includehint>klineedit.h</includehint>
+- <includehint>kpushbutton.h</includehint>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
++
++
++
++
++
+ </includehints>
+ </UI>
+--- ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui (revision 470887)
++++ ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui (revision 477941)
+@@ -470,6 +470,6 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <includehints>
+- <includehint>kcolorbutton.h</includehint>
++
+ </includehints>
+ </UI>
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/29_kcontrol_adminmode_from_3_5.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/29_kcontrol_adminmode_from_3_5.diff 2005-11-04 23:53:54 UTC (rev 2149)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/29_kcontrol_adminmode_from_3_5.diff 2005-11-05 15:24:03 UTC (rev 2150)
@@ -0,0 +1,11 @@
+--- kde.orig/kdesu/kdesu/kdesu.cpp
++++ kde.patched/kdesu/kdesu/kdesu.cpp
+@@ -297,7 +297,7 @@
+
+ if (!new_dcop)
+ {
+- QCString ksycoca = "KDESYCOCA="+QFile::encodeName(locateLocal("tmp", "ksycoca"));
++ QCString ksycoca = "KDESYCOCA="+QFile::encodeName(locateLocal("cache", "ksycoca"));
+ env << ksycoca;
+
+ options += "xf"; // X-only, dcop forwarding enabled.
More information about the pkg-kde-commits
mailing list