Hello community, here is the log from the commit of package kdebase3 checked in at Mon Apr 14 01:32:59 CEST 2008. -------- --- KDE/kdebase3/kdebase3.changes 2008-04-12 08:16:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2008-04-13 20:59:34.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Apr 13 16:10:51 CEST 2008 - dmueller@suse.de + +- fix build against glibc 2.8 +- fix session restore of kde3 apps if kde 4.x is installed + as well + +------------------------------------------------------------------- New: ---- kde3-session-restore.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.d18392/_old 2008-04-14 01:32:24.000000000 +0200 +++ /var/tmp/diff_new_pack.d18392/_new 2008-04-14 01:32:24.000000000 +0200 @@ -61,7 +61,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.9 -Release: 30 +Release: 32 %define kde_version 3.5.9 Requires: kdebase3-runtime == %{version} Source0: kdebase-%{kde_version}.tar.bz2 @@ -219,6 +219,7 @@ Patch229: beagle-0.3.diff Patch230: remove-beagle-stuff.diff Patch231: kde3-session.diff +Patch232: kde3-session-restore.diff %description This package contains kdebase, one of the basic packages of the K @@ -458,7 +459,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 466 +Release: 468 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -655,6 +656,7 @@ %patch230 %endif %patch231 +%patch232 rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png cp %SOURCE17 l10n/tw/flag.png @@ -1639,6 +1641,7 @@ %doc %lang(en) /opt/kde3/share/doc/HTML/en/kioslave %exclude /opt/kde3/%_lib/kde3/kio_smb.* %exclude /opt/kde3/share/services/smb.protocol +/opt/kde3/bin/kde3 /opt/kde3/bin/kreadconfig /opt/kde3/bin/kwriteconfig /opt/kde3/bin/kprinter @@ -1658,6 +1661,10 @@ %verify(not mode) %attr(4755,root,shadow) /opt/kde3/bin/kcheckpass %changelog +* Sun Apr 13 2008 dmueller@suse.de +- fix build against glibc 2.8 +- fix session restore of kde3 apps if kde 4.x is installed + as well * Sat Apr 12 2008 stbinner@suse.de - rename session type from "KDE" to "KDE3" (bnc#379355) * Thu Apr 10 2008 ro@suse.de ++++++ 3_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.d18392/_old 2008-04-14 01:32:24.000000000 +0200 +++ /var/tmp/diff_new_pack.d18392/_new 2008-04-14 01:32:24.000000000 +0200 @@ -3,10 +3,53 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 784700 ++current HEAD: 796383 +svn di between //tags/KDE/3.5.9/kdebase and //branches/KDE/3.5/kdebase +--- ksmserver/startup.cpp ++++ ksmserver/startup.cpp +@@ -265,7 +265,9 @@ + continue; + } + if ( wm == config->readEntry( QString("program")+n ) ) +- continue; ++ continue; // wm already started ++ if( config->readBoolEntry( QString( "wasWm" )+n, false )) ++ continue; // it was wm before, but not now, don't run it (some have --replace in command :( ) + startApplication( restartCommand, + config->readEntry( QString("clientMachine")+n ), + config->readEntry( QString("userId")+n )); +--- ksmserver/server.cpp ++++ ksmserver/server.cpp +@@ -879,6 +879,7 @@ + config->writePathEntry( QString("discardCommand")+n, c->discardCommand() ); + config->writeEntry( QString("restartStyleHint")+n, restartHint ); + config->writeEntry( QString("userId")+n, c->userId() ); ++ config->writeEntry( QString("wasWm")+n, isWM( c )); + } + config->writeEntry( "count", count ); + +--- kdepasswd/kcm/kcm_useraccount.desktop ++++ kdepasswd/kcm/kcm_useraccount.desktop +@@ -101,7 +101,7 @@ + Keywords[he]=ססמאות, דוא"ל, שם, ארגון, שם אמתי,תמונת כניסה, מצב echo, password,email,name,organization,realname,login image,face,echo mode + Keywords[hr]=password,email,name,organization,realname,login image,face,echo mode,lozinka,e-pošta,naziv,ime,organizacija,pravo ime,slika prijave,lice,odzivnik + Keywords[hu]=jelszó,e-mail,név,szervezet,valódi név,bejelentkezési kép,arc,kiírási mód +-Keywords[it]=password,email,nome,organizzazione,nome vero,immagine login,icona login,faccia,modo echo ++Keywords[it]=password,email,nome,organizzazione,nome vero,immagine login,icona login,immagine accesso,faccia,modo echo + Keywords[ja]=パスワード;Eメール;名前;組織;本名;ログイン画像;顔;エコーモード + Keywords[km]=ពាក្យសម្ងាត់; អ៊ីមែល; ឈ្មោះ; អង្គការ; ឈ្មោះពិត; រូបភាពពេលចូល; មុខ; របៀបបង្ហាញ + Keywords[lt]=password,email,name,organization,realname,login image,face,echo mode,slaptažodis,e. paštas,el.paštas,vardas,organizacija,tikrasis vardas,veidas --- kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop +++ kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop +@@ -24,7 +24,7 @@ + Name[hi]=एफएसएफ/यूनेस्को फ्री सॉफ़्टवेयर डिरेक्ट्री + Name[hr]=FSF/UNESCO mapa slobodnog softvera + Name[hu]=FSF/UNESCO szabadszoftver-gyűjtemény +-Name[it]=Elenco software liberp FSF/UNESCO ++Name[it]=Elenco software libero FSF/UNESCO + Name[ja]=FSF/UNESCO フリーソフトウェア ディレクトリ + Name[kk]=FSF/UNESCO ашық бағдарламалық жасау каталогы + Name[km]=ថតកម្មវិធីឥតគិតថ្លៃរបស់ FSF/UNESCO @@ -60,6 +60,7 @@ Name[zh_TW]=FSF/UNESCO 自由軟體目錄 ServiceTypes=SearchProvider @@ -45,6 +88,16 @@ return; } +--- kicker/menuext/kate/katesessionmenu.desktop ++++ kicker/menuext/kate/katesessionmenu.desktop +@@ -44,6 +44,7 @@ + Name[th]=เมนูเซสชั่นของ Kate + Name[tr]=Kate Oturum Menüsü + Name[uk]=Меню сеансів Kate ++Name[uz]=Kate сеанс менюси + Name[wa]=Dressêye di sessions Kate + Name[zh_CN]=Kate 会话菜单 + Name[zh_TW]=Kate 工作階段選單 --- kicker/extensions/taskbar/taskbarextension.desktop +++ kicker/extensions/taskbar/taskbarextension.desktop @@ -54,7 +54,7 @@ @@ -65,6 +118,96 @@ Comment[se]=Olgguldas bargoholga viiddádus Comment[sk]=Rozšírenie externého panelu úloh Comment[sl]=Zunanja razširitev opravilne vrstice +--- kioslave/media/medianotifier/medianotifier.desktop ++++ kioslave/media/medianotifier/medianotifier.desktop +@@ -57,6 +57,7 @@ + Name[th]=เดมอนแจ้งเตือนสำหรับสื่อบันทึก + Name[tr]=CD/USB/Firewire Durum İzleme Sistemi + Name[uk]=Демон сповіщення про носії інформації ++Name[uz]=Сақлаш ускуналар учун демон + Name[vi]=Trình nền Thông báo Ổ lưu trữ + Name[wa]=Demon di notifiaedje media + Name[zh_CN]=介质通知守护程序 +--- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ++++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop +@@ -47,6 +47,7 @@ + Name[th]=หน้าคุณสมบัติของสื่อ + Name[tr]=Ortam Özellikleri Sayfası + Name[uk]=Сторінка властивостей носіїв інформації ++Name[uz]=Сақлаш ускуналарнинг хоссалари + Name[vi]=Trang tài sản phương tiện + Name[wa]=Pådje des prôpietés media + Name[zh_CN]=介质属性页面 +--- kioslave/media/mediamanager/halbackend.cpp ++++ kioslave/media/mediamanager/halbackend.cpp +@@ -849,6 +849,13 @@ + result << tmp; + } + ++ if ( valids.contains("locale") ) ++ { ++ value = config.readBoolEntry( "locale", true ); ++ tmp = QString( "locale=%1" ).arg( value ? "true" : "false" ); ++ result << tmp; ++ } ++ + if (valids.contains("utf8")) + { + value = config.readBoolEntry("utf8", true); +@@ -922,7 +929,7 @@ + + QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); + +- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; ++ const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", "locale", 0 }; + for (int index = 0; names[index]; ++index) + if (valids.contains(names[index])) + config.writeEntry(names[index], valids[names[index]] == "true"); +@@ -942,6 +949,10 @@ + config.writeEntry("automount", valids["automount"]); + } + ++ if (valids.contains("locale") ) { ++ config.writeEntry("locale", valids["locale"]); ++ } ++ + return true; + } + +@@ -1140,6 +1151,11 @@ + soptions << QString("uid=%1").arg(getuid()); + } + ++ if (valids["locale"] == "true") ++ { ++ soptions << QString("locale=%1").arg( KGlobal::locale()->language() ); ++ } ++ + if (valids["ro"] == "true") + soptions << "ro"; + +--- Makefile.am.in ++++ Makefile.am.in +@@ -9,7 +9,7 @@ + + AUTOMAKE_OPTIONS = foreign 1.6.1 + +-bin_SCRIPTS = startkde ++bin_SCRIPTS = startkde kde3 + + EXTRA_DIST = admin bsd-port debian kdebase.spec.in README.pam kde.pamd kscreensaver.pamd mkpamserv + +--- startkde ++++ startkde +@@ -387,6 +387,8 @@ + kdeinit_shutdown + dcopserver_shutdown --wait + artsshell -q terminate ++# KDE4 support ++kde4 kdeinit4_shutdown 2>/dev/null + + echo 'startkde: Running shutdown scripts...' 1>&2 + --- konqueror/konquerorsu.desktop +++ konqueror/konquerorsu.desktop @@ -60,7 +60,7 @@ @@ -76,6 +219,198 @@ Name[rw]=Mucungadosiye - Uburyo Ukoresha Mukuru Name[se]=Fiilagieđahalli – Supergeavaheaddjemodus Name[sk]=Správca súborov - Super-používateľský mód +--- konqueror/sidebar/trees/init/remote/ftp/.directory ++++ konqueror/sidebar/trees/init/remote/ftp/.directory +@@ -46,6 +46,7 @@ + Name[sv]=FTP-arkiv + Name[tr]=FTP Arşivleri + Name[uk]=Архіви FTP ++Name[uz]=FTP архивлар + Name[ven]=Fhethu huno vhulungwa zwa kale ha FTP + Name[wa]=Årtchives FTP + Name[xh]=Ushicilelo lukawonke-wonke kunye namanye amaxwebhu embali e FTP +--- konqueror/sidebar/trees/init/remote/web/.directory ++++ konqueror/sidebar/trees/init/remote/web/.directory +@@ -46,6 +46,7 @@ + Name[tg]=Саҳифаҳои Веб + Name[tr]=Web Siteleri + Name[uk]=Веб-сайти ++Name[uz]=Веб-сайтлар + Name[ven]=Webu saiti + Name[wa]=Sites waibes + Name[xh]=Amanxuwa e Web +--- kde3 ++++ kde3 +@@ -0,0 +1,9 @@ ++#!/bin/sh ++# ++# Script for launching KDE3 applications from outside of the KDE3 desktop ++# ++# Modify this to match your specific needs, such as setting up needed env. variables, ++# and make sure this script is in $PATH (e.g. make a symlink if necessary). ++# ++ ++exec "$@" +--- khotkeys/data/konqueror_gestures_kde321.khotkeys ++++ khotkeys/data/konqueror_gestures_kde321.khotkeys +@@ -124,6 +124,7 @@ + Comment[tg]=Равзанаи Konqueror + Comment[tr]=Konqueror penceresi + Comment[uk]=Вікно Konqueror ++Comment[uz]=Konqueror ойнаси + Comment[wa]=Purnea di Konqueror + Comment[zh_CN]=Konqueror 窗口 + Comment[zh_TW]=Konqueror 視窗 +@@ -228,6 +229,7 @@ + Name[tg]=Гузашта + Name[tr]=Geri + Name[uk]=Назад ++Name[uz]=Орқага + Name[wa]=En erî + Name[zh_CN]=后退 + Name[zh_TW]=返回 +@@ -244,6 +246,7 @@ + Comment[eo]=Opera-stilo: Premu, iru supren, malpremu.\nNOTU: Malakordas kun "Nova Langeto", tial estas malebligita defaŭlte. + Comment[es]=Estilo Opera: Pulsar, subir, soltar.\nNOTA: Entra en conflicto con «Nueva solapa», por lo que está deshabilitado por omisión. + Comment[et]=Opera stiilis: vajuta, liiguta üles, vabasta.\nMärkus: konfliktis toiminguga 'Uus kaart' ja seetõttu vaikimisi välja lülitatud. ++Comment[fr]=Comme Opera : Appuyez, déplacez en haut, relâchez.\nRemarque : Entre en conflit avec le mouvement de nouvel onglet, il est donc désactivé par défaut. + Comment[fy]=Opera-styl: yndrukke, nei omheech, loslitte.\nTink derom: Konflikten mei 'Nije ljepper', en sa binne standert útskeakele. + Comment[hr]=U stilu Opere: Pritisni, pomakni prema gore, otpusti.\nNAPOMENA: U sukobu s gestikulacijom "Nova kartica" te je iz tog razloga onemogućeno zadanim postavkama. + Comment[hu]=Opera-stílus: lenyomás, fel, elengedés.\nMEGJEGYZÉS: Ütközik az 'Új lap' paranccsal, ezért alapértelmezésben le van tiltva. +@@ -306,6 +309,7 @@ + Name[tg]=Манъи боркунӣ + Name[tr]=Yüklemeyi Durdur + Name[uk]=Зупинити завантаження ++Name[uz]=Юклашни тўхтатиш + Name[wa]=Åwe tcherdjî + Name[zh_TW]=停止載入 + Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA +@@ -370,6 +374,7 @@ + Comment[eo]=Irante supren en URL/dosieruja strukturo.\nMozila-stilo: Premu, iru supren, iru maldekstren, iru supren, malpremu. + Comment[es]=Subir en la estructura de URL/directorios.\nEstilo Mozilla: Pulsar, subir, mover a la izquierda, subir, soltar. + Comment[et]=Liikumine URL-i/kataloogistruktuuris üles.\nMozilla stiilis: vajuta, liiguta üles, liiguta vasakule, liiguta üles, vabasta. ++Comment[fr]=Remonter d'un cran dans l'URL ou les dossiers.\nComme Mozilla : Appuyez, déplacez en haut, à gauche, en haut, relâchez. + Comment[fy]=Omheech gean yn adres-/triemtafelstruktuer.\nMozilla-styl: Yndrukke, nei omheech, nei lofts, nei omheech, loslitte. + Comment[hr]=Kretanje razinu prema gore u strukturi URL adrese ili mape.\nU stilu Mozille: Pritisni, pomakni prema gore, pomakni ulijevo, otpusti. + Comment[hu]=Felfelé lép a könyvtárstruktúrában (vagy az URL-ben).\nMozilla-stílus: lenyomás, fel, balra, fel, elengedés. +@@ -432,6 +437,7 @@ + Name[tg]=Боло + Name[tr]=Yukarı + Name[uk]=Вгору ++Name[uz]=Юқорига + Name[wa]=Pu hôt + Name[zh_CN]=向上 + Name[zh_TW]=上一層 +@@ -496,6 +502,7 @@ + Comment[eo]=Irante supren en URL/dosieruja strukturo.\nOpera-stilo: Premu, iru supren, iru maldekstren, iru supren, malpremu.\nNOTU: Malakordas kun "Aktivigi Antaŭan Langeton", tial estas malebligita defaŭlte. + Comment[es]=Subir en la estructura de URL/directorios.\nEstilo Opera: Pulsar, subir, mover a la izquierda, subir, soltar.\nNOTA: Entra en conflicto con «Activar la solapa anterior», por lo que está deshabilitado por omisión. + Comment[et]=Liikumine URL-i/kataloogistruktuuris üles.\nOpera stiilis: vajuta, liiguta üles, liiguta vasakule, liiguta üles, vabasta.\nMärkus: konfliktis toiminguga "Eelmise kaardi aktiveerimine" ja seetõttu vaikimisi välja lülitatud. ++Comment[fr]=Remonter d'un cran dans l'URL ou les dossiers.\nComme Opera : Appuyez, déplacez en haut, à gauche, en haut, relâchez.\nRemarque : Identique au mouvement d'activation de l'onglet précédent, il est donc désactivé par défaut. + Comment[fy]=Omheech gean yn adres-/triemtafelstruktuer.\nOpera-styl: Yndrukke, nei omheech, nei lofts, nei omheech, loslitte. \nTink derom: Konflikten mei "Foarige ljepper aktivearje", en sa is standert útskeakele. + Comment[hr]=Kretanje razinu prema gore u strukturi URL adrese ili mape.\nU stilu Opere: Pritisni, pomakni prema gore, pomakni ulijevo, pomakni prema gore, otpusti.\nNAPOMENA: U sukobu s gestikulacijom "Aktiviraj prethodnu karticu" te je iz tog razloga onemogućeno zadanim postavkama. + Comment[hu]=Felfelé lép a könyvtárstruktúrában (vagy az URL-ben).\nOpera-stílus: lenyomás, fel, balra, fel, elengedés.\nMEGJEGYZÉS: Ütközik az "Előző lap" paranccsal, ezért alapértelmezésben le van tiltva. +@@ -683,6 +690,7 @@ + Name[sv]=Aktivera nästa flik + Name[tr]=Sonraki Sekmeyi Etkinleştir + Name[uk]=Активізувати наступну вкладку ++Name[uz]=Кейинги табни активлаштириш + Name[wa]=Mete en alaedje li linwete shuvante + Name[zh_TW]=跳到下一個分頁 + Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA +@@ -809,6 +817,7 @@ + Name[sv]=Aktivera föregående flik + Name[tr]=Önceki Sekmeyi Etkinleştir + Name[uk]=Активізувати попередню вкладку ++Name[uz]=Олдинги табни активлаштириш + Name[wa]=Mete en alaedje li linwete di dvant + Name[zh_TW]=跳到前一個分頁 + Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA +@@ -983,6 +992,7 @@ + Name[sv]=Duplicera flik + Name[tr]=Sekmeyi İkile + Name[uk]=Дублювати вкладку ++Name[uz]=абнинг нусхасини яратиш + Name[wa]=Dobler li linwete + Name[zh_TW]=複製分頁 + Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA +@@ -1107,6 +1117,7 @@ + Name[sv]=Duplicera fönster + Name[tr]=Pencereyi İkile + Name[uk]=Дублювати вікно ++Name[uz]=Ойнани нусхасини яратиш + Name[wa]=Dobler li purnea + Name[zh_TW]=複製視窗 + Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA +@@ -1195,6 +1206,7 @@ + Comment[sv]=Tryck ner, flytta höger, släpp. + Comment[tr]=Bas, sağa taşı, üzerine gel. + Comment[uk]=Натиснути, праворуч, відпустити. ++Comment[uz]=Босинг, ўнгга, қўйиб юборинг. + Comment[wa]=Tchôkî, dischinde, låtchî. + Comment[zh_TW]=按住,往右移,再放開。 + Enabled=true +@@ -1237,6 +1249,7 @@ + Name[tg]=Навбатӣ + Name[tr]=İleri + Name[uk]=Вперед ++Name[uz]=Олдинга + Name[wa]=Avancî + Name[zh_CN]=前进 + Name[zh_TW]=往前 +@@ -1302,11 +1315,12 @@ + Comment[eo]=Premu, iru malsupren, iru duone supren, iru dekstren, iru malsupren, malpremu.\n(Skizante minusklan "h".) + Comment[es]=Pulsar, bajar, subir hasta la mitad, mover a la derecha, bajar, soltar.\n(Dibujando una «h» minúscula.) + Comment[et]=Vajuta, liiguta alla, liiguta pool teed üles, liiguta paremale, liiguta alla, vabasta.\n(Väikese h-tähe joonistamine.) ++Comment[fr]=Appuyez, déplacez en bas, à moitié en haut, à droite, puis en bas, relâchez.\n (Dessinez un « h » minuscule). + Comment[fy]=Yndrukke, nei omleech, heal nei omheech, nei rjochts, nei omleech, loslitte.\n(Tekenje in lytse letter 'h'.) + Comment[hr]=Pritisni, pomakni prema dolje, pomakni prema gore za pola, pomakni udesno, pomakni prema dolje, otpusti.\n(Crtanje malog slova "h".) + Comment[hu]=Lenyomás, le, kicsit fel, jobbra, le, elengedés.\n(Kis 'h' betű.) + Comment[is]=Ýta, færa niður, færa að hálfu upp, færa til hægri, færa niður, sleppa.\n(Teiknar lítið 'h'.) +-Comment[it]=Premin sposta in giù, sposta in su a metà, sposta a destra, sposta in giù, rilascia.\n(Disegna un'"h" minuscola.) ++Comment[it]=Premi, sposta in giù, sposta in su a metà, sposta a destra, sposta in giù, rilascia.\n(Disegna un'"h" minuscola.) + Comment[ja]=マウスの中ボタンを押したまま、マウスを下に動かし、次に半分の距離だけ上に動かし、さらに右->下の順に動かし、ボタンを放します。\n(小文字の 'h' を描くように) + Comment[km]=ចុច ផ្លាស់ទីចុះក្រោម ផ្លាស់ទីពាក់កណ្ដាលឡើងលើ ផ្លាស់ទីទៅស្ដាំ ផ្លាស់ទីចុះក្រោម លែង\n(គូរអក្សរអក្សរ 'h' ។) + Comment[ko]=누르고, 아래로 이동하고, 위로 이동하고, 아래로 이동하고, 놓기. +@@ -1469,6 +1483,7 @@ + Comment[eo]=Premu, iru dekstren, iru malsupren, iru dekstren, malpremu.\nMozila stilo: Premu, iru malsupren, iru dekstren, malpremu. + Comment[es]=Pulsar, mover a la derecha, bajar, mover a la derecha, soltar.\nEstilo Mozilla: Pulsar, bajar, mover a la derecha, soltar. + Comment[et]=Vajuta, liiguta paremale, liiguta alla, liiguta paremale, vabasta.\nMozilla stiilis: vajuta, liiguta alla, liiguta paremale, vabasta. ++Comment[fr]=Appuyez, déplacez à droite, en bas, à droite, relâchez.\nComme Mozilla : Appuyez, déplacez en bas, à droite, relâchez. + Comment[fy]=Yndrukke, nei rjochts, nei omleech, nei rjochts, loslitte.\nMozilla-styl: Yndrukke, nei omleech, nei rjochts, loslitte. + Comment[hr]=Pritisni, pomakni udesno, pomakni prema dolje, pomakni udesno, otpusti.\nU stilu Mozille: Pritisni, pomakni prema dolje, pomakni udesno, otpusti. + Comment[hu]=Lenyomás, jobbra, le, jobbra, elengedés.\nMozilla-stílus: Lenyomás, le, jobbra, elengedés. +@@ -1528,6 +1543,7 @@ + Name[te]=టాబ్ ను ముసివెయి + Name[tr]=Sekmeyi Kapat + Name[uk]=Закрити вкладку ++Name[uz]=Табни ёпиш + Name[wa]=Clôre li linwete + Name[zh_TW]=關閉分頁 + Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA +@@ -1595,6 +1611,7 @@ + Comment[eo]=Premu, iru supren, malpremu.\nMalakordas kun la Opera stilo "Supren #2", kiu estas malebligita defaŭlte. + Comment[es]=Pulsar, subir, soltar.\nEntra en conflicto con el «Subir #2» de Opera, por lo que está deshabilitado por omisión. + Comment[et]=Vajuta, liiguta üles, vabasta.\nKonfliktis Opera stiilis 'Üles nr. 2', mis on vaikimisi välja lülitatud. ++Comment[fr]=Appuyez, déplacez en haut, relâchez.\nConflit avec le « Haut #2 » d'Opera, il est donc désactivé par défaut. + Comment[fy]=Yndrukke, nei omheech, loslitte.\nKonflikt mei Opera-styl 'nei omheech #2', hokker standert útskeakele is. + Comment[hr]=Pritisni, pomakni prema gore, otpusti.\nU sukobu s Operinim "Gore br.2", koji je onemogućen po zadanim postavkama. + Comment[hu]=Lenyomás, fel, elengedés.\nÜtközik az Opera-stílusú 'Fel (2)' paranccsal, amelyik alapértelmezésben le van tiltva. +@@ -1654,6 +1671,7 @@ + Name[te]=కొత్త టాబ్ + Name[tr]=Yeni Sekme + Name[uk]=Нова вкладка ++Name[uz]=Янги таб + Name[wa]=Novele linwete + Name[zh_TW]=新分頁 + Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA +@@ -1947,6 +1965,7 @@ + Name[tg]=Бозсозӣ + Name[tr]=Yeniden Yükle + Name[uk]=Перезавантажити ++Name[uz]=Қайтадан юклаш + Name[wa]=Ritcherdjî + Name[zh_CN]=重新装入 + Name[zh_TW]=重新載入 --- khotkeys/kcontrol/actions_listview_widget.cpp +++ khotkeys/kcontrol/actions_listview_widget.cpp @@ -110,6 +110,7 @@ @@ -177,6 +512,49 @@ edit_listview_item( selected_item ); } +--- kwin/options.cpp ++++ kwin/options.cpp +@@ -82,21 +82,12 @@ + focusStealingPreventionLevel = 0; + + KConfig *gc = new KConfig("kdeglobals", false, false); +- bool isVirtual = KApplication::desktop()->isVirtualDesktop(); + gc->setGroup("Windows"); +- xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", isVirtual ) && +- isVirtual; +- if (xineramaEnabled) +- { +- xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true); +- xineramaMovementEnabled = gc->readBoolEntry ("XineramaMovementEnabled", true); +- xineramaMaximizeEnabled = gc->readBoolEntry ("XineramaMaximizeEnabled", true); +- xineramaFullscreenEnabled = gc->readBoolEntry ("XineramaFullscreenEnabled", true); +- } +- else +- { +- xineramaPlacementEnabled = xineramaMovementEnabled = xineramaMaximizeEnabled = xineramaFullscreenEnabled = false; +- } ++ xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", true ); ++ xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true); ++ xineramaMovementEnabled = gc->readBoolEntry ("XineramaMovementEnabled", true); ++ xineramaMaximizeEnabled = gc->readBoolEntry ("XineramaMaximizeEnabled", true); ++ xineramaFullscreenEnabled = gc->readBoolEntry ("XineramaFullscreenEnabled", true); + delete gc; + + placement = Placement::policyFromString( config->readEntry("Placement"), true ); +--- kwin/group.cpp ++++ kwin/group.cpp +@@ -747,9 +747,9 @@ + if( (*it2)->hasTransient( *it1, false ) && (*it3)->hasTransient( *it1, false )) + { + if( (*it2)->hasTransient( *it3, true )) +- (*it3)->transients_list.remove( *it1 ); +- if( (*it3)->hasTransient( *it2, true )) + (*it2)->transients_list.remove( *it1 ); ++ if( (*it3)->hasTransient( *it2, true )) ++ (*it3)->transients_list.remove( *it1 ); + } + } + } --- kwin/main.cpp +++ kwin/main.cpp @@ -16,10 +16,12 @@ @@ -232,6 +610,31 @@ quit(); } +--- kwin/manage.cpp ++++ kwin/manage.cpp +@@ -331,6 +331,22 @@ + if( (*it)->isShown( true )) + init_minimize = false; // SELI even e.g. for NET::Utility? + } ++ // if a dialog is shown for minimized window, minimize it too ++ if( !init_minimize && isTransient() && mainClients().count() > 0 ) ++ { ++ bool visible_parent = false; ++ ClientList mainclients = mainClients(); ++ for( ClientList::ConstIterator it = mainclients.begin(); ++ it != mainclients.end(); ++ ++it ) ++ if( (*it)->isShown( true )) ++ visible_parent = true; ++ if( !visible_parent ) ++ { ++ init_minimize = true; ++ demandAttention(); ++ } ++ } + + if( init_minimize ) + minimize( true ); // no animation --- kwin/workspace.cpp +++ kwin/workspace.cpp @@ -1608,6 +1608,7 @@ @@ -310,6 +713,45 @@ Comment[rw]=Konsole Linux Nshya Comment[se]=Ođđa Linux-konsolla Comment[sk]=Nová linuxová konzola +--- l10n/rs/entry.desktop ++++ l10n/rs/entry.desktop +@@ -37,6 +37,7 @@ + Name[th]=เซอร์เบีย + Name[tr]=Sırbistan + Name[uk]=Сербія ++Name[uz]=Сербия + Name[wa]=Serbeye + Name[zh_TW]=塞爾維亞 + Region=southeurope +--- l10n/me/entry.desktop ++++ l10n/me/entry.desktop +@@ -27,6 +27,7 @@ + Name[th]=มอนตินิโกร + Name[tr]=Karadağ + Name[uk]=Чорногорія ++Name[uz]=Монтенегро + Name[zh_TW]=蒙特內哥羅 + Region=southeurope + Languages=sr +--- kdesu/configure.in.in ++++ kdesu/configure.in.in +@@ -1,6 +1,15 @@ + dnl Check for "struct ucred" + AC_MSG_CHECKING("struct ucred") +-AC_EGREP_HEADER([struct ucred], [sys/socket.h], have_ucred=yes) ++AC_TRY_COMPILE( ++[ ++ #define _GNU_SOURCE 1 ++ #include <sys/socket.h> ++], ++[ ++ struct ucred red; ++], have_ucred=yes ++ , have_ucred=no ++) + if test "$have_ucred" = "yes"; then + AC_DEFINE(HAVE_STRUCT_UCRED, 1, [Define if you have the struct ucred]) + AC_MSG_RESULT(yes) --- ksysguard/ksysguardd/Linux/lmsensors.c +++ ksysguard/ksysguardd/Linux/lmsensors.c @@ -29,7 +29,7 @@ ++++++ kde3-session-restore.diff ++++++ Index: kde3 =================================================================== --- kde3 (revision 793519) +++ kde3 (working copy) @@ -6,4 +6,7 @@ # and make sure this script is in $PATH (e.g. make a symlink if necessary). # +PATH=/opt/kde3/bin:${PATH/:/opt/kde3/bin} +export PATH + exec "$@" ++++++ optional-kwin.diff ++++++ --- /var/tmp/diff_new_pack.d18392/_old 2008-04-14 01:32:30.000000000 +0200 +++ /var/tmp/diff_new_pack.d18392/_new 2008-04-14 01:32:30.000000000 +0200 @@ -186,9 +186,9 @@ } - if ( wm == config->readEntry( QString("program")+n ) ) + if ( isWM( config->readEntry( QString("program")+n )) ) - continue; - startApplication( restartCommand, - config->readEntry( QString("clientMachine")+n ), + continue; // wm already started + if( config->readBoolEntry( QString( "wasWm" )+n, false )) + continue; // it was wm before, but not now, don't run it (some have --replace in command : --- ksmserver/server.cpp +++ ksmserver/server.cpp @@ -114,7 +114,7 @@ ++++++ startkde.diff ++++++ --- /var/tmp/diff_new_pack.d18392/_old 2008-04-14 01:32:30.000000000 +0200 +++ /var/tmp/diff_new_pack.d18392/_new 2008-04-14 01:32:30.000000000 +0200 @@ -62,7 +62,7 @@ Simple) if test "$kpersonalizerrc_general_firstlogin" = "true"; then ksplashsimple -@@ -384,9 +399,11 @@ done +@@ -384,11 +399,13 @@ done echo 'startkde: Shutting down...' 1>&2 # Clean up @@ -72,6 +72,8 @@ kdeinit_shutdown dcopserver_shutdown --wait -artsshell -q terminate + # KDE4 support + kde4 kdeinit4_shutdown 2>/dev/null echo 'startkde: Running shutdown scripts...' 1>&2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org