[Pkg-kde-commits] rev 1539 -
branches/kde-3.4.0/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Tue Aug 23 17:10:29 UTC 2005
Author: chrsmrtn-guest
Date: 2005-08-23 17:10:28 +0000 (Tue, 23 Aug 2005)
New Revision: 1539
Added:
branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r452311.diff
Log:
New branch pull for kdebase.
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r452311.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r452311.diff 2005-08-23 00:33:32 UTC (rev 1538)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r452311.diff 2005-08-23 17:10:28 UTC (rev 1539)
@@ -0,0 +1,1021 @@
+#DPATCHLEVEL=0
+--- kate/plugins/defaultproject/katedefaultproject.desktop (revision 438047)
++++ kate/plugins/defaultproject/katedefaultproject.desktop (revision 452311)
+@@ -58,7 +58,7 @@
+ Name[tr]=Öntanımlı Kate Proje Eklentisi
+ Name[uk]=Типовий втулок проекту Kate
+ Name[uz]=Kate андоза лойиҳа плагини
+-Name[zh_CN]=Kat 默认项目插件
++Name[zh_CN]=Kate 默认项目插件
+ Comment=Default Plugin for Projects
+ Comment[af]=Standaard Inprop Module vir Projekte
+ Comment[ar]=الملحق الافتراضي للمشاريع
+--- kdepasswd/kcm/kcm_useraccount.desktop (revision 438047)
++++ kdepasswd/kcm/kcm_useraccount.desktop (revision 452311)
+@@ -23,7 +23,7 @@
+ Name[es]=Contraseña y cuenta de usuario
+ Name[et]=Parool ja kasutaja konto
+ Name[eu]=Pasahitza eta erabiltzaile kontua
+-Name[fi]=Salasanat & käyttäjätilit
++Name[fi]=Salasanat ja käyttäjätilit
+ Name[fr]=Compte utilisateur et mot de passe
+ Name[fy]=Wachtwurd en brûkersbehear
+ Name[ga]=Focal Faire & Cuntas Úsáideora
+--- kcontrol/background/background.desktop (revision 438047)
++++ kcontrol/background/background.desktop (revision 452311)
+@@ -125,7 +125,7 @@
+ Comment[nso]=Fetosa dipeakanyo tsa bokamorago
+ Comment[pa]=ਪਿੱਠਭੂਮੀ ਵਿਵਸਥਾ ਤਬਦੀਲ
+ Comment[pl]=Ustawienia tła
+-Comment[pt]=alterar a configuração do fundo
++Comment[pt]=Alterar a configuração do fundo
+ Comment[pt_BR]=Muda as configurações do fundo da tela
+ Comment[ro]=Configurează setările fundalului
+ Comment[ru]=Настройка фона рабочего стола
+--- kcontrol/nics/nic.desktop (revision 438047)
++++ kcontrol/nics/nic.desktop (revision 452311)
+@@ -30,7 +30,7 @@
+ Name[et]=Võrguliidesed
+ Name[eu]=Sare interfazeak
+ Name[fa]=واسطهای شبکه
+-Name[fi]=Verkkoliittymät
++Name[fi]=Verkkoliitynnät
+ Name[fr]=Interfaces réseau
+ Name[fy]=Netwurkynterfaces
+ Name[ga]=Comhéadain Líonra
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (revision 438047)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (revision 452311)
+@@ -55,7 +55,7 @@
+ Name[uz]=Wikipedia - Бепул энциклопедия
+ Name[vi]=Wikipedia -Bộ từ điển bách khoa mễn phí
+ Name[wa]=Wikipedia - Li libe eciclopedeye
+-Name[zh_CN]=Wikipedia - 免费的百科全书
++Name[zh_CN]=维基百科 - 免费的百科全书
+ Name[zh_TW]=Wikipedia - 免費的 Encyclopedia
+ ServiceTypes=SearchProvider
+ Keys=wp
+@@ -66,4 +66,5 @@
+ Query[it]=http://it.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[nb]=http://no.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Query[pa]=http://en.wikipedia.org/wiki/Special:Search?search=\{@}&go=ਜਾਓ
++Query[zh_CN]=http://zh.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Charset=utf8
+--- kcontrol/locale/default/entry.desktop (revision 438047)
++++ kcontrol/locale/default/entry.desktop (revision 452311)
+@@ -16,7 +16,7 @@
+ Name[es]=Inglés de EEUU
+ Name[et]=Inglise (US)
+ Name[eu]=EEBBetako ingelesa
+-Name[fi]=US-englanti
++Name[fi]=Yhdysvaltain englanti
+ Name[fr]=Anglais US
+ Name[fy]=VS Ingelsk
+ Name[gl]=Inglés de EEUU
+--- kcontrol/locale/language.desktop (revision 438047)
++++ kcontrol/locale/language.desktop (revision 452311)
+@@ -30,7 +30,7 @@
+ Name[et]=Riik/regioon ja keel
+ Name[eu]=Herrialdea eta hizkuntza
+ Name[fa]=کشور/زبان و منطقه
+-Name[fi]=Maa/alue ja kieli
++Name[fi]=Maa tai alue ja kieli
+ Name[fr]=Pays & langue
+ Name[fy]=Lân/regio en taal
+ Name[ga]=Tír/Réigiún agus Teanga
+--- kcontrol/konq/desktop.desktop (revision 438047)
++++ kcontrol/konq/desktop.desktop (revision 452311)
+@@ -16,6 +16,7 @@
+ Name[az]=Masa Üstləri
+ Name[bg]=Работни плотове
+ Name[bn]=একাধিক ডেস্কটপ
++Name[br]=Lies burev
+ Name[bs]=Višestruki desktopi
+ Name[ca]=Múltiples escriptoris
+ Name[cs]=Virtuální plochy
+--- kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (revision 438047)
++++ kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (revision 452311)
+@@ -38,7 +38,7 @@
+
+ extern "C"
+ {
+- ThumbCreator *new_creator()
++ KDE_EXPORT ThumbCreator *new_creator()
+ {
+ return new KFI::CFontThumbnail;
+ }
+--- kcontrol/kfontinst/lib/FcEngine.cpp (revision 438047)
++++ kcontrol/kfontinst/lib/FcEngine.cpp (revision 452311)
+@@ -833,6 +833,7 @@
+ QString name(url.fileName());
+ int pos;
+
++ FcInitReinitialize();
+ itsDescriptiveName=name;
+ itsSpacing=FC_PROPORTIONAL;
+ if(-1==(pos=name.find(", "))) // No style information...
+--- kcontrol/kio/cookies.desktop (revision 438047)
++++ kcontrol/kio/cookies.desktop (revision 452311)
+@@ -181,7 +181,7 @@
+ Keywords[ven]=Cookies,Burousini.Inithenete,WWW<Vhukwamani,Pholisi,Domaini
+ Keywords[vi]=Cookies,Duyệt,Internet,WWW,Mạng,Chính sách,Tên miền
+ Keywords[xh]=Cookies,Khangela iincwadi,Internet,WWW,Umsebenzi womnatha,Inkqubo,Ezongameleyo
+-Keywords[zh_CN]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,浏览,互连网,万维网,网络,策略,域
++Keywords[zh_CN]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,浏览,互联网,万维网,网络,策略,域
+ Keywords[zh_TW]=Cookies,Browsing,Internet,WWW,Network,Policy,Domain,瀏覽,網際網路,網路,策略,域名
+ Keywords[zu]=Cookies,Cinga,Internet,WWW,Uxhumano olusakazekile,Umthetho, Izindawo
+
+--- kcontrol/clock/clock.desktop (revision 438047)
++++ kcontrol/clock/clock.desktop (revision 452311)
+@@ -31,7 +31,7 @@
+ Name[et]=Kuupäev ja kellaaeg
+ Name[eu]=Data eta ordua
+ Name[fa]=تاریخ و زمان
+-Name[fi]=Päivämäärä & Aika
++Name[fi]=Päivämäärä ja aika
+ Name[fo]=Dato og tíð
+ Name[fr]=Date et heure
+ Name[fy]=Datum en Tiid
+--- kcontrol/xinerama/xinerama.desktop (revision 438047)
++++ kcontrol/xinerama/xinerama.desktop (revision 452311)
+@@ -11,6 +11,7 @@
+ Name[ar]=وسائط متعددة
+ Name[bg]=Многомониторен режим
+ Name[bn]=একাধিক মনিটর
++Name[br]=Lies skramm
+ Name[bs]=Višestruki monitori
+ Name[ca]=Múltiples monitors
+ Name[cs]=Více monitorů
+--- kcontrol/kthememanager/kthememanager.desktop (revision 438047)
++++ kcontrol/kthememanager/kthememanager.desktop (revision 452311)
+@@ -69,6 +69,7 @@
+ Keywords[fi]=teemat,ulkonäkö ja tuntuma
+ Keywords[fr]=thèmes,apparence et ergonomie
+ Keywords[fy]=tema's,úterlik en gedrach
++Keywords[ga]=téamaí,cuma
+ Keywords[gl]=temas,apariencia
+ Keywords[he]=ערכות, מראה ותחושה
+ Keywords[hi]=प्रसंग, रूप तथा आकार
+--- kcontrol/kthememanager/ktheme.cpp (revision 438047)
++++ kcontrol/kthememanager/ktheme.cpp (revision 452311)
+@@ -41,9 +41,10 @@
+ #include <ksimpleconfig.h>
+ #include <kstandarddirs.h>
+ #include <ktar.h>
++#include <kstyle.h>
+
+- KTheme::KTheme( QWidget *parent, const QString & xmlFile )
+- : m_parent(parent)
++KTheme::KTheme( QWidget *parent, const QString & xmlFile )
++ : m_parent(parent)
+ {
+ QFile file( xmlFile );
+ file.open( IO_ReadOnly );
+@@ -186,7 +187,7 @@
+ // 3. Icons
+ globalConf->setGroup( "Icons" );
+ QDomElement iconElem = m_dom.createElement( "icons" );
+- iconElem.setAttribute( "name", globalConf->readEntry( "Theme" ) );
++ iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );
+ createIconElems( "DesktopIcons", "desktop", iconElem, globalConf );
+ createIconElems( "MainToolbarIcons", "mainToolbar", iconElem, globalConf );
+ createIconElems( "PanelIcons", "panel", iconElem, globalConf );
+@@ -305,7 +306,7 @@
+ // 10. Widget style
+ globalConf->setGroup( "General" );
+ QDomElement widgetsElem = m_dom.createElement( "widgets" );
+- widgetsElem.setAttribute( "name", globalConf->readEntry( "widgetStyle" ) );
++ widgetsElem.setAttribute( "name", globalConf->readEntry( "widgetStyle",KStyle::defaultStyle() ) );
+ m_root.appendChild( widgetsElem );
+
+ // 12.
+--- kcontrol/keys/unix3.kksrc (revision 438047)
++++ kcontrol/keys/unix3.kksrc (revision 452311)
+@@ -12,6 +12,7 @@
+ Name[es]=Esquema UNIX
+ Name[et]=UNIX skeem
+ Name[eu]=UNIX eskema
++Name[fi]=UNIX-skeema
+ Name[fr]=Modèle UNIX
+ Name[ga]=Scéim UNIX
+ Name[he]=ערכת יוניקס
+--- kcontrol/keys/wm3.kksrc (revision 438047)
++++ kcontrol/keys/wm3.kksrc (revision 452311)
+@@ -8,7 +8,9 @@
+ Name[es]=WindowMaker (3 teclas auxiliares)
+ Name[et]=WindowMaker (3 muuteklahviga)
+ Name[eu]=WindowMaker (3 tekla modifikatzailekin)
++Name[fi]=WindowMaker (3 muokkausnäppäintä)
+ Name[fr]=WindowMaker (3 touches de modification)
++Name[ga]=WindowMaker (3 Eochair Mhionathraithe)
+ Name[he]=WindowMaker (3 משני מצב)
+ Name[hu]=WindowMaker (3 módosító billentyű)
+ Name[is]=WindowMaker (3 breytilyklar)
+--- kcontrol/keys/win3.kksrc (revision 438047)
++++ kcontrol/keys/win3.kksrc (revision 452311)
+@@ -11,7 +11,9 @@
+ Name[es]=Esquema Windows (Sin tecla Win)
+ Name[et]=Windows'i skeem (Win klahvita)
+ Name[eu]=Windows eskema (Win teklarik gabe)
++Name[fi]=Windows-skeema (ilman Win-näppäintä)
+ Name[fr]=Modèle Windows (sans la touche « Win »)
++Name[ga]=Scéim Windows (Gan Eochair Win)
+ Name[he]=ערכת חלונות (ללא כפתור win)
+ Name[hu]=Windows (Win billentyű nélkül)
+ Name[is]=Windowsþema (án Win lykils)
+--- kcontrol/keys/win4.kksrc (revision 438047)
++++ kcontrol/keys/win4.kksrc (revision 452311)
+@@ -11,7 +11,9 @@
+ Name[es]=Esquema Windows (Con tecla Win)
+ Name[et]=Windows'i skeem (Win klahviga)
+ Name[eu]=Windows eskema (Win teklarekin)
++Name[fi]=Windows-skeema (Win-näppäimellä)
+ Name[fr]=Modèle Windows (avec la touche « Win »)
++Name[ga]=Scéim Windows (Le hEochair Win)
+ Name[he]=ערכת חלונות (עם כפתור win)
+ Name[hu]=Windows (Win billentyűvel)
+ Name[is]=Windowsþema (með Win lykli)
+--- kcontrol/keys/mac4.kksrc (revision 438047)
++++ kcontrol/keys/mac4.kksrc (revision 452311)
+@@ -12,6 +12,7 @@
+ Name[es]=Esquema Mac
+ Name[et]=Mac skeem
+ Name[eu]=Mac eskema
++Name[fi]=Mac-skeema
+ Name[fr]=Modèle Mac
+ Name[ga]=Scéim Mac
+ Name[he]=ערכת מק
+--- kcontrol/keys/kde3.kksrc (revision 438047)
++++ kcontrol/keys/kde3.kksrc (revision 452311)
+@@ -9,6 +9,7 @@
+ Name[es]=Valores predefinidos de KDE para 3 teclas auxiliares
+ Name[et]=3 muuteklahviga KDE vaikeskeem
+ Name[eu]=KDE lehenetsia 3 tekla modifikatzailekin
++Name[fi]=KDE oletus 3:lle muokkausnäppäimelle
+ Name[fr]=Configuration par défaut de KDE avec trois touches de modification
+ Name[hu]=KDE-s alapértelmezés (3 módosító billentyűvel)
+ Name[is]=Sjálfgefið KDE fyrir 3 breytilykla
+@@ -35,6 +36,7 @@
+ Name[ven]=Default ya KDE ya khii tharu dzau lugisela
+ Name[vi]=KDE Default cho 3 Modifier Keys
+ Name[xh]=KDE Engagqibekanga ye 3 Izitsixo Mofifier
++Name[zh_CN]=三个修饰键的 KDE 默认值
+ Name[zh_TW]=KDE 預設使用 3 個輔助按鍵 (Alt/Ctrl/Shift)
+ Name[zu]=Okwendalo kwe-KDE okusetshenziselwa okhiye bokulungisa abangu-3
+ Uses Win Modifier=false
+--- kcontrol/keys/kde4.kksrc (revision 438047)
++++ kcontrol/keys/kde4.kksrc (revision 452311)
+@@ -9,6 +9,7 @@
+ Name[es]=Valores predefinidos de KDE para 4 teclas auxiliares
+ Name[et]=4 muuteklahviga KDE vaikeskeem
+ Name[eu]=KDE lehenetsia 4 tekla modifikatzailekin
++Name[fi]=KDE oletus 4:lle muokkausnäppäimelle
+ Name[fr]=Configuration par défaut de KDE avec quatre touches de modification
+ Name[hu]=KDE-s alapértelmezés (4 módosító billentyűvel)
+ Name[is]=Sjálfgefið KDE fyrir 4 breytilykla
+@@ -35,6 +36,7 @@
+ Name[ven]=Default ya KDE ya khii nna dzau lugisela
+ Name[vi]=KDE Default cho 4 Modifier Keys
+ Name[xh]=KDE Engagqibekanga ye 4 Izitsixo Mofifier
++Name[zh_CN]=四个修饰键的 KDE 默认值
+ Name[zh_TW]=KDE 預設使用 4 個輔助按鍵 (Meta/Alt/Ctrl/Shift)
+ Name[zu]=Okwendalo kwe-KDE okusetshenziselwa okhiye bokulungisa abangu-4
+ Uses Win Modifier=true
+--- pics/wallpapers/No-Ones-Laughing-3.jpg.desktop (revision 438047)
++++ pics/wallpapers/No-Ones-Laughing-3.jpg.desktop (revision 452311)
+@@ -7,7 +7,7 @@
+ Name[ca]=No fa gràcia
+ Name[cs]=Nikdo se nesměje
+ Name[da]=Der er ingen der griner
+-Name[el]=Κανείς δεν γελάει
++Name[el]=Κανείς δε γελάει
+ Name[eo]=Rido de neniu
+ Name[es]=Nadie se rie
+ Name[et]=Keegi ei naera
+--- kdmlib/kgreet_classic.cpp (revision 438047)
++++ kdmlib/kgreet_classic.cpp (revision 452311)
+@@ -59,7 +59,7 @@
+ pExp( -1 ),
+ running( false )
+ {
+- KdmItem *user_entry, *pw_entry;
++ KdmItem *user_entry = 0, *pw_entry= 0;
+ QGridLayout *grid = 0;
+ int line = 0;
+
+--- kdmlib/dmctl.cpp (revision 438047)
++++ kdmlib/dmctl.cpp (revision 452311)
+@@ -160,9 +160,19 @@
+ KApplication::ShutdownMode shutdownMode,
+ const QString &bootOption )
+ {
+- if (!bootOption.isEmpty() && DMType != NewKDM)
+- return;
++ bool cap_ask;
+
++ if (DMType == NewKDM) {
++ QCString re;
++ cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0;
++ } else {
++ if (!bootOption.isEmpty())
++ return;
++ cap_ask = false;
++ }
++ if (!cap_ask && shutdownMode == KApplication::ShutdownModeInteractive)
++ shutdownMode = KApplication::ShutdownModeDefault;
++
+ if (shutdownType != KApplication::ShutdownTypeNone) {
+ QCString cmd( "shutdown\t" );
+ cmd.append( shutdownType == KApplication::ShutdownTypeReboot ?
+--- kicker/share/kickerSettings.kcfg (revision 438047)
++++ kicker/share/kickerSettings.kcfg (revision 452311)
+@@ -88,7 +88,7 @@
+
+ <entry name="DetailedEntriesNamesFirst" type="Bool" >
+ <label>Show names first on detailed entries</label>
+- <default>true</default>
++ <default>false</default>
+ </entry>
+
+ <entry name="ShowMenuTitles" type="Bool" >
+--- kicker/share/kickertip.cpp (revision 438047)
++++ kicker/share/kickertip.cpp (revision 452311)
+@@ -239,15 +239,21 @@
+ m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg);
+ }
+
+-void KickerTip::internalUpdate()
++void KickerTip::tipFor(const QWidget* w)
+ {
+- m_dirty = true;
+- update();
+-}
++ if (m_tippingFor)
++ {
++ disconnect(m_tippingFor, SIGNAL(destroyed(QObject*)),
++ this, SLOT(tipperDestroyed(QObject*)));
++ }
+
+-void KickerTip::tipFor(const QWidget* w)
+-{
+ m_tippingFor = w;
++
++ if (m_tippingFor)
++ {
++ connect(m_tippingFor, SIGNAL(destroyed(QObject*)),
++ this, SLOT(tipperDestroyed(QObject*)));
++ }
+ }
+
+ void KickerTip::untipFor(const QWidget* w)
+@@ -265,6 +271,19 @@
+ return m_tippingFor == w;
+ }
+
++void KickerTip::tipperDestroyed(QObject* o)
++{
++ // we can't do a dynamic cast because we are in the process of dieing
++ // so static it is.
++ untipFor(static_cast<QWidget*>(o));
++}
++
++void KickerTip::internalUpdate()
++{
++ m_dirty = true;
++ repaint(false);
++}
++
+ void KickerTip::enableTipping(bool tip)
+ {
+ if (tip)
+--- kicker/share/kickertip.h (revision 438047)
++++ kicker/share/kickertip.h (revision 452311)
+@@ -65,6 +65,7 @@
+ void displayInternal();
+
+ protected slots:
++ void tipperDestroyed(QObject* o);
+ void internalUpdate();
+
+ private:
+--- kicker/applets/swallow/swallowapplet.desktop (revision 438047)
++++ kicker/applets/swallow/swallowapplet.desktop (revision 452311)
+@@ -56,6 +56,7 @@
+ Name[uk]=Аплет Swallow
+ Name[ven]=Apulete ya Swallow
+ Name[vi]=Applet Thiên Nga
++Name[zh_CN]=Swallow 小程序
+ Name[zh_TW]=Swallow 面板小程式
+ Name[zu]=I-Applet yokugwinya
+ Comment=The swallow panel applet
+@@ -114,6 +115,7 @@
+ Comment[uk]=Аплет панелі swallow
+ Comment[vi]=Panel applet thiên nga
+ Comment[xh]=I window eneenkcukacha ye swallow applet
++Comment[zh_CN]=Swallow 面板小程序
+ Comment[zh_TW]=swallow 面板小程式
+ Comment[zu]=I-applet lewindi lemininingwane lokugwinya
+ X-KDE-Library=swallow_panelapplet
+--- kicker/ui/k_mnu.cpp (revision 438047)
++++ kicker/ui/k_mnu.cpp (revision 452311)
+@@ -399,6 +399,7 @@
+ {
+ if (QApplication::closingDown())
+ {
++ dynamicSubMenus.setAutoDelete(false);
+ return;
+ }
+
+--- kicker/ui/service_mnu.cpp (revision 438047)
++++ kicker/ui/service_mnu.cpp (revision 452311)
+@@ -775,7 +775,14 @@
+ {
+ if (KURLDrag::target() != this)
+ {
+- close();
++ // we need to re-enter the event loop before calling close() here
++ // this gets called _before_ the drag object is destroyed, so we are
++ // still in its event loop. closing the menu before that event loop is
++ // exited may result in getting hung up in it which in turn prevents
++ // the execution of any code after the original exec() statement
++ // though the panels themselves continue on otherwise normally
++ // (we just have some sort of nested event loop)
++ QTimer::singleShot(0, this, SLOT(close()));
+ }
+ }
+
+--- kioslave/media/kdedmodule/halbackend.cpp (revision 438047)
++++ kioslave/media/kdedmodule/halbackend.cpp (revision 452311)
+@@ -24,6 +24,7 @@
+ #include <kdebug.h>
+
+ #define MOUNT_SUFFIX (hal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted"))
++#define MOUNT_ICON_SUFFIX (hal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount"))
+
+ /* Static instance of this class, for static HAL callbacks */
+ static HALBackend* s_HALBackend;
+@@ -340,22 +341,22 @@
+ medium->needMounting();
+ switch (hal_drive_get_type(halDrive)) {
+ case HAL_DRIVE_TYPE_COMPACT_FLASH:
+- medium->setIconName("compact_flash" + MOUNT_SUFFIX);
++ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX);
+ break;
+ case HAL_DRIVE_TYPE_MEMORY_STICK:
+- medium->setIconName("memory_stick" + MOUNT_SUFFIX);
++ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX);
+ break;
+ case HAL_DRIVE_TYPE_SMART_MEDIA:
+- medium->setIconName("smart_media" + MOUNT_SUFFIX);
++ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX);
+ break;
+ case HAL_DRIVE_TYPE_SD_MMC:
+- medium->setIconName("sd_mmc" + MOUNT_SUFFIX);
++ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX);
+ break;
+ case HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
+ medium->setIconName(QString::null); //FIXME need icon
+ break;
+ case HAL_DRIVE_TYPE_CAMERA:
+- medium->setIconName("camera" + MOUNT_SUFFIX);
++ medium->setIconName("camera" + MOUNT_ICON_SUFFIX);
+ break;
+ case HAL_DRIVE_TYPE_TAPE:
+ medium->setIconName(QString::null); //FIXME need icon
+--- kioslave/ldap/kio_ldap.h (revision 438047)
++++ kioslave/ldap/kio_ldap.h (revision 452311)
+@@ -7,6 +7,7 @@
+ #include <kio/slavebase.h>
+ #include <kio/authinfo.h>
+
++#define LDAP_DEPRECATED 1 /* Needed for ldap_simple_bind_s with openldap >= 2.3.x */
+ #include <lber.h>
+ #include <ldap.h>
+ #include <kabc/ldapurl.h>
+--- kioslave/smb/kio_smb_browse.cpp (revision 438047)
++++ kioslave/smb/kio_smb_browse.cpp (revision 452311)
+@@ -257,7 +257,10 @@
+ i18n( "Could not connect to host for %1" ).arg( url.prettyURL() ) );
+ break;
+ case ENOTDIR:
++ error( ERR_CANNOT_ENTER_DIRECTORY, url.prettyURL());
++ break;
+ case EFAULT:
++ case EINVAL:
+ error( ERR_DOES_NOT_EXIST, url.prettyURL());
+ break;
+ case EPERM:
+--- kioslave/smb/x-smb-workgroup.desktop (revision 438047)
++++ kioslave/smb/x-smb-workgroup.desktop (revision 452311)
+@@ -20,6 +20,7 @@
+ Comment[fi]=Windows-työryhmä
+ Comment[fr]=Groupe de travail Windows
+ Comment[fy]=Windows-wurkkeppel
++Comment[ga]=Grúpa Oibre Windows
+ Comment[gl]=Grupo de Traballo de Windows
+ Comment[he]=קבוצת עבודה של חלונות
+ Comment[hi]=विंडोज़ वर्क बुक
+--- kdeprint/slave/mimetypes/class.desktop (revision 438047)
++++ kdeprint/slave/mimetypes/class.desktop (revision 452311)
+@@ -18,6 +18,7 @@
+ Comment[fi]=Tulostinten luokka
+ Comment[fr]=Classe d'imprimantes
+ Comment[fy]=Printerklassen
++Comment[ga]=Aicme Printéirí
+ Comment[gl]=Clase de impresoras
+ Comment[he]=מחלקת מדפסות
+ Comment[hi]=प्रिंटर के वर्ग
+--- kappfinder/apps/Internet/xbiff.desktop (revision 438047)
++++ kappfinder/apps/Internet/xbiff.desktop (revision 452311)
+@@ -40,6 +40,7 @@
+ GenericName[fo]=Postkomufráboðan
+ GenericName[fr]=Surveillance du courrier électronique
+ GenericName[fy]=E-postnotifikaasje
++GenericName[ga]=Fógairt Ríomhphoist
+ GenericName[gl]=Alerta de Correo
+ GenericName[he]=הודעה לגבי דואר
+ GenericName[hi]=डाक सतर्क
+--- kappfinder/apps/Internet/coolmail.desktop (revision 438047)
++++ kappfinder/apps/Internet/coolmail.desktop (revision 452311)
+@@ -38,6 +38,7 @@
+ GenericName[fo]=Postkomufráboðan
+ GenericName[fr]=Surveillance du courrier électronique
+ GenericName[fy]=E-postnotifikaasje
++GenericName[ga]=Fógairt Ríomhphoist
+ GenericName[gl]=Alerta de Correo
+ GenericName[he]=הודעה לגבי דואר
+ GenericName[hi]=डाक सतर्क
+--- kappfinder/apps/Internet/Faces.desktop (revision 438047)
++++ kappfinder/apps/Internet/Faces.desktop (revision 452311)
+@@ -43,6 +43,7 @@
+ GenericName[fo]=Postkomufráboðan
+ GenericName[fr]=Surveillance du courrier électronique
+ GenericName[fy]=E-postnotifikaasje
++GenericName[ga]=Fógairt Ríomhphoist
+ GenericName[gl]=Alerta de Correo
+ GenericName[he]=הודעה לגבי דואר
+ GenericName[hi]=डाक सतर्क
+--- kappfinder/apps/Multimedia/XMovie.desktop (revision 438047)
++++ kappfinder/apps/Multimedia/XMovie.desktop (revision 452311)
+@@ -19,7 +19,7 @@
+ GenericName[be]=Прайгравальнік відэа
+ GenericName[bg]=Видео плеър
+ GenericName[bn]=ভিডিও প্রদর্শক
+-GenericName[br]=Ur c'hoarier Video
++GenericName[br]=Ur soner Video
+ GenericName[bs]=Video preglednik
+ GenericName[ca]=Reproductor de vídeo
+ GenericName[cs]=Přehrávač videa
+--- kappfinder/apps/Multimedia/mplayer.desktop (revision 438047)
++++ kappfinder/apps/Multimedia/mplayer.desktop (revision 452311)
+@@ -7,7 +7,7 @@
+ GenericName[be]=Прайгравальнік відэа
+ GenericName[bg]=Видео плеър
+ GenericName[bn]=ভিডিও প্রদর্শক
+-GenericName[br]=Ur c'hoarier Video
++GenericName[br]=Ur soner Video
+ GenericName[bs]=Video preglednik
+ GenericName[ca]=Reproductor de vídeo
+ GenericName[cs]=Přehrávač videa
+--- kappfinder/apps/Multimedia/oqtplayer.desktop (revision 438047)
++++ kappfinder/apps/Multimedia/oqtplayer.desktop (revision 452311)
+@@ -7,6 +7,7 @@
+ GenericName[be]=Прайгравальнік MOV відэа
+ GenericName[bg]=Видео плеър за AVI
+ GenericName[bn]=MOV ভিডিও প্রদর্শক
++GenericName[br]=Ur soner video MOV
+ GenericName[bs]=Preglednik MOV video datoteka
+ GenericName[ca]=Reproductor de vídeo MOV
+ GenericName[cs]=Přehrávač MOV videa
+--- kappfinder/apps/Multimedia/ogle.desktop (revision 438047)
++++ kappfinder/apps/Multimedia/ogle.desktop (revision 452311)
+@@ -7,7 +7,7 @@
+ GenericName[be]=Прайгравальнік DVD
+ GenericName[bg]=Плеър за DVD
+ GenericName[bn]=ডিভিডি প্রদর্শক
+-GenericName[br]=C'hoarier DVD
++GenericName[br]=Soner DVD
+ GenericName[ca]=Reproductor de DVD
+ GenericName[cs]=DVD přehrávač
+ GenericName[cy]=Chwaraewr DVD
+--- kappfinder/apps/Multimedia/xmms-enqueue.desktop (revision 438047)
++++ kappfinder/apps/Multimedia/xmms-enqueue.desktop (revision 452311)
+@@ -6,6 +6,7 @@
+ GenericName[az]=Çalğı Siyahısı Vasitəsi
+ GenericName[bg]=Инструмент за списъци за изпълнение
+ GenericName[bn]=গানের তালিকা টুল
++GenericName[br]=Ostilh roll tonioù
+ GenericName[bs]=Dodavanje na playlistu
+ GenericName[ca]=Eina per a llistes de reproducció
+ GenericName[cs]=Nástroj pro Playlistu
+@@ -21,6 +22,7 @@
+ GenericName[fi]=Soittolistatyökalu
+ GenericName[fr]=Outil pour liste de lecture
+ GenericName[fy]=Ofspyllist-helprogramma
++GenericName[ga]=Uirlis Seinmliosta
+ GenericName[gl]=Lista de Reproduccións
+ GenericName[he]=כלי רשימות ניגון
+ GenericName[hi]=गीत-सूची औज़ार
+--- kappfinder/apps/Multimedia/realplayer.desktop (revision 438047)
++++ kappfinder/apps/Multimedia/realplayer.desktop (revision 452311)
+@@ -7,7 +7,7 @@
+ GenericName[be]=Прайгравальнік відэа
+ GenericName[bg]=Видео плеър
+ GenericName[bn]=ভিডিও প্রদর্শক
+-GenericName[br]=Ur c'hoarier Video
++GenericName[br]=Ur soner Video
+ GenericName[bs]=Video preglednik
+ GenericName[ca]=Reproductor de vídeo
+ GenericName[cs]=Přehrávač videa
+--- kappfinder/apps/Multimedia/xine.desktop (revision 438047)
++++ kappfinder/apps/Multimedia/xine.desktop (revision 452311)
+@@ -7,7 +7,7 @@
+ GenericName[be]=Прайгравальнік відэа
+ GenericName[bg]=Видео плеър
+ GenericName[bn]=ভিডিও প্রদর্শক
+-GenericName[br]=Ur c'hoarier Video
++GenericName[br]=Ur soner Video
+ GenericName[bs]=Video preglednik
+ GenericName[ca]=Reproductor de vídeo
+ GenericName[cs]=Přehrávač videa
+--- kappfinder/apps/Multimedia/mtv.desktop (revision 438047)
++++ kappfinder/apps/Multimedia/mtv.desktop (revision 452311)
+@@ -7,7 +7,7 @@
+ GenericName[be]=Прайгравальнік відэа
+ GenericName[bg]=Видео плеър
+ GenericName[bn]=ভিডিও প্রদর্শক
+-GenericName[br]=Ur c'hoarier Video
++GenericName[br]=Ur soner Video
+ GenericName[bs]=Video preglednik
+ GenericName[ca]=Reproductor de vídeo
+ GenericName[cs]=Přehrávač videa
+--- applnk/kde-games-strategy.directory (revision 438047)
++++ applnk/kde-games-strategy.directory (revision 452311)
+@@ -20,7 +20,7 @@
+ Name[et]=Taktika ja strateegia
+ Name[eu]=Taktika eta estrategia
+ Name[fa]=تاکتیکی و استراتژیک
+-Name[fi]=Taktiikka & Strategia
++Name[fi]=Taktiikka ja strategia
+ Name[fo]=Taktikkur og strategi
+ Name[fr]=Tactique et stratégie
+ Name[fy]=Taktysk en strategysk
+--- applnk/kde-unknown.directory (revision 438047)
++++ applnk/kde-unknown.directory (revision 452311)
+@@ -20,7 +20,7 @@
+ Name[es]=Objetos perdidos
+ Name[et]=Tundmatud
+ Name[eu]=Galdu eta aurkitutakoak
+-Name[fi]=Hävinneet & Löydetyt
++Name[fi]=Hävinneet ja löydetyt
+ Name[fr]=Objets trouvés
+ Name[fy]=Wat oer is
+ Name[ga]=Caillte agus Aimsithe
+@@ -58,5 +58,5 @@
+ Name[uk]=Загублено та знайдено
+ Name[uz]=Номаълум
+ Name[wa]=Pierdous & rtrovés
+-Name[zh_CN]=捉迷藏
++Name[zh_CN]=未知类别
+ Icon=help
+--- applnk/kde-science.directory (revision 438047)
++++ applnk/kde-science.directory (revision 452311)
+@@ -21,7 +21,7 @@
+ Name[es]=Ciencia y matemáticas
+ Name[et]=Teadus
+ Name[eu]=Zientzia eta matematikaa
+-Name[fi]=Tiede ja Matematiikka
++Name[fi]=Tiede ja matematiikka
+ Name[fr]=Science et mathématiques
+ Name[fy]=Wittenskiplik en wiskunde
+ Name[ga]=Eolaíocht & Matamaitic
+--- konqueror/listview/konq_listviewwidget.cc (revision 438047)
++++ konqueror/listview/konq_listviewwidget.cc (revision 452311)
+@@ -124,7 +124,7 @@
+ connect( this, SIGNAL(returnPressed( QListViewItem * )),
+ this, SLOT(slotReturnPressed( QListViewItem * )) );
+ connect( this, SIGNAL( mouseButtonClicked( int, QListViewItem *, const QPoint&, int )),
+- this, SLOT( slotMouseButtonClicked( int, QListViewItem *, const QPoint&, int )) );
++ this, SLOT( slotMouseButtonClicked2( int, QListViewItem *, const QPoint&, int )) );
+ connect( this, SIGNAL(executed( QListViewItem * )),
+ this, SLOT(slotExecuted( QListViewItem * )) );
+
+@@ -828,7 +828,7 @@
+ emit m_pBrowserView->m_extension->selectionInfo( lst );
+ }
+
+-void KonqBaseListViewWidget::slotMouseButtonClicked( int _button,
++void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
+ QListViewItem *_item, const QPoint& pos, int )
+ {
+ if ( _button == MidButton )
+--- konqueror/listview/konq_listviewwidget.h (revision 438047)
++++ konqueror/listview/konq_listviewwidget.h (revision 452311)
+@@ -153,7 +153,8 @@
+
+ public slots:
+ //virtual void slotOnItem( KonqBaseListViewItem* _item );
+- void slotMouseButtonClicked( int _button, QListViewItem *_item, const QPoint& pos, int );
++ // The '2' was added to differentiate it from KListView::slotMouseButtonClicked()
++ void slotMouseButtonClicked2( int _button, QListViewItem *_item, const QPoint& pos, int );
+ virtual void slotExecuted( QListViewItem *_item );
+ void slotItemRenamed( QListViewItem *, const QString &, int );
+
+--- konqueror/listview/konq_detailedlistview.desktop (revision 438047)
++++ konqueror/listview/konq_detailedlistview.desktop (revision 452311)
+@@ -7,6 +7,7 @@
+ Name[az]=Ətraflı Siyahı Görünüşü
+ Name[bg]=Подробен преглед
+ Name[bn]=বিস্তারিত তালিকা ভিউ
++Name[br]=Gwell roll gant munudoù
+ Name[bs]=Pogled detaljne liste
+ Name[ca]=Vista de llista detallada
+ Name[cs]=Detailní pohled
+--- konqueror/konq_mainwindow.cc (revision 438047)
++++ konqueror/konq_mainwindow.cc (revision 452311)
+@@ -98,6 +98,7 @@
+ #include <kiconloader.h>
+ #include <kpopupmenu.h>
+ #include <kprocess.h>
++#include <kio/netaccess.h>
+ #include <kio/scheduler.h>
+ #include <kaccelmanager.h>
+ #include <kuser.h>
+@@ -428,7 +429,7 @@
+ QString fileName = path.mid( lastSlash + 1 );
+ QString testPath = path.left( lastSlash + 1 );
+ if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
+- && ( !url.isLocalFile() || QFile::exists( testPath ) ) )
++ && ( !url.isLocalFile() || QFile::exists( testPath ) ) && !KIO::NetAccess::exists( url, true ) )
+ {
+ nameFilter = fileName;
+ url.setFileName( QString::null );
+--- drkonqi/presets/developerrc (revision 438047)
++++ drkonqi/presets/developerrc (revision 452311)
+@@ -540,7 +540,7 @@
+ Comment[cy]=Cyfeiriad c?f annilys.
+ Comment[da]=Ugyldig hukommelsesreference.
+ Comment[de]=Ungültige Speicherzuweisung
+-Comment[el]=Άκυρη αναφορά στη μνήμη.
++Comment[el]=Μη έγκυρη αναφορά στη μνήμη.
+ Comment[eo]=Nevalida memoro-referenco.
+ Comment[es]=Referencia a memoria inválida.
+ Comment[et]=Vigane mäluviide.
+--- kwin/kcmkwin/kwinoptions/kwinfocus.desktop (revision 438047)
++++ kwin/kcmkwin/kwinoptions/kwinfocus.desktop (revision 452311)
+@@ -180,5 +180,6 @@
+ Keywords[ven]=thetshelesa,u vhetshela,u vusa,vusa,putedzani u vusa,khiibodo,CDE,alt-tab,desktop dzothe
+ Keywords[vi]=chọn,di chuyển,tự nâng lên,nâng lên,nhấn nâng lên,bàn phím,CDE,alt-tab,tất cả cửa sổ
+ Keywords[xh]=ucaco,ubuyiselo,phakamisa ngokuzenzekelayo,phakamisa,nqakraza phakamisa, ibhodi yezitshixho,CDE,alt-tab,zonke ii desktop
++Keywords[zh_CN]=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,焦点,放置,自动升起,升起,单击升起,键盘,全部桌面
+ Keywords[zh_TW]=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,焦點,佈置,自動抬升,抬升,單擊抬升,鍵盤,全部桌面
+ Keywords[zu]=ukunaka,ukubeka,ukukhuphula okuzenzekelayo,ukukhuphula, ukukhuphula ngokucofa,ibhodi yokhiye,CDE,alt-tab,wonke ama-desktop
+--- kwin/kcmkwin/kwinoptions/kwintranslucency.desktop (revision 438047)
++++ kwin/kcmkwin/kwinoptions/kwintranslucency.desktop (revision 452311)
+@@ -124,3 +124,4 @@
+ Keywords[sv]=genomskinlighet,skuggor
+ Keywords[ta]=ஒளிகசிவு,ஊடகத்தன்மை,நிழல்கள்
+ Keywords[uk]=translucency,transparence,shadows,прозорість,напівпрозорість,тіні
++Keywords[zh_CN]=透明度,阴影,translucency,transparence,shadows
+--- kwin/eventsrc (revision 438047)
++++ kwin/eventsrc (revision 452311)
+@@ -164,6 +164,7 @@
+ Comment[fi]=Virtuaalityöpöytä yksi on valittu
+ Comment[fr]=Le bureau virtuel 1 est sélectionné
+ Comment[fy]=Virtueel buroblêd ien is selektearre
++Comment[ga]=Roghnaíodh deasc fhíorúil a haon
+ Comment[gl]=Selecciónase o escritorio virtual número Un
+ Comment[he]=שולחן העבודה הווירטואלי אחד נבחר
+ Comment[hi]=आभासी डेस्कटॉप एक चुना गया है
+@@ -292,6 +293,7 @@
+ Comment[fi]=Virtuaalityöpöytä kaksi on valittu
+ Comment[fr]=Le bureau virtuel 2 est sélectionné
+ Comment[fy]=Virtueel buroblêd twa is selektearre
++Comment[ga]=Roghnaíodh deasc fhíorúil a dó
+ Comment[gl]=Selecciónase o escritorio virtual número Dous
+ Comment[he]=שולחן העבודה הווירטואלי שתיים נבחר
+ Comment[hi]=आभासी डेस्कटॉप दो चुना गया है
+@@ -420,6 +422,7 @@
+ Comment[fi]=Virtuaalityöpöytä kolme on valittu
+ Comment[fr]=Le bureau virtuel 3 est sélectionné
+ Comment[fy]=Virtueel buroblêd trije is selektearre
++Comment[ga]=Roghnaíodh deasc fhíorúil a trí
+ Comment[gl]=Selecciónase o escritorio virtual número Tres
+ Comment[he]=שולחן העבודה הווירטואלי שלוש נבחר
+ Comment[hi]=आभासी डेस्कटॉप तीन चुना गया है
+@@ -548,6 +551,7 @@
+ Comment[fi]=Virtuaalityöpöytä neljä on valittu
+ Comment[fr]=Le bureau virtuel 4 est sélectionné
+ Comment[fy]=Virtueel buroblêd fjouwer is selektearre
++Comment[ga]=Roghnaíodh deasc fhíorúil a ceathair
+ Comment[gl]=Selecciónase o escritorio virtual número Catro
+ Comment[he]=שולחן העבודה הווירטואלי ארבע נבחר
+ Comment[hi]=आभासी डेस्कटॉप चार चुना गया है
+@@ -676,6 +680,7 @@
+ Comment[fi]=Virtuaalityöpöytä viisi on valittu
+ Comment[fr]=Le bureau virtuel 5 est sélectionné
+ Comment[fy]=Virtueel buroblêd viif is selektearre
++Comment[ga]=Roghnaíodh deasc fhíorúil a cúig
+ Comment[gl]=Selecciónase o escritorio virtual número Cinco
+ Comment[he]=שולחן העבודה הווירטואלי חמש נבחר
+ Comment[hi]=आभासी डेस्कटॉप पांच चुना गया है
+@@ -804,6 +809,7 @@
+ Comment[fi]=Virtuaalityöpöytä kuusi on valittu
+ Comment[fr]=Le bureau virtuel 6 est sélectionné
+ Comment[fy]=Virtueel buroblêd seis is selektearre
++Comment[ga]=Roghnaíodh deasc fhíorúil a sé
+ Comment[gl]=Selecciónase o escritorio virtual número Seis
+ Comment[he]=שולחן העבודה הווירטואלי שש נבחר
+ Comment[hi]=आभासी डेस्कटॉप छः चुना गया है
+@@ -932,6 +938,7 @@
+ Comment[fi]=Virtuaalityöpöytä seitsemän on valittu
+ Comment[fr]=Le bureau virtuel 7 est sélectionné
+ Comment[fy]=Virtueel buroblêd sân is selektearre
++Comment[ga]=Roghnaíodh deasc fhíorúil a seacht
+ Comment[gl]=Selecciónase o escritorio virtual número Sete
+ Comment[he]=שולחן העבודה הווירטואלי שבע נבחר
+ Comment[hi]=आभासी डेस्कटॉप सात चुना गया है
+@@ -1060,6 +1067,7 @@
+ Comment[fi]=Virtuaalityöpöytä kahdeksan on valittu
+ Comment[fr]=Le bureau virtuel 8 est sélectionné
+ Comment[fy]=Virtueel buroblêd acht is selektearre
++Comment[ga]=Roghnaíodh deasc fhíorúil a hocht
+ Comment[gl]=Selecciónase o escritorio virtual número Oito
+ Comment[he]=שולחן העבודה הווירטואלי שמונה נבחר
+ Comment[hi]=आभासी डेस्कटॉप आठ चुना गया है
+@@ -2637,7 +2645,7 @@
+ Name[vi]=Hộp thoại mới
+ Name[wa]=Novea purnea di kesse
+ Name[xh]=Incoko yababini Entsha
+-Name[zh_CN]=新建对话框
++Name[zh_CN]=新对话框
+ Name[zh_TW]=新對話盒
+ Name[zu]=Ingxoxo Entsha
+ Comment=Transient window (a dialog) appears
+@@ -2689,6 +2697,7 @@
+ Comment[tr]=Bir iletişim kutusu belirdi
+ Comment[uk]=З'являється тимчасове вікно (діалог)
+ Comment[uz]=Мулоқат ойнаси пайдо бўлди
++Comment[zh_CN]=出现了临时窗口(对话框)
+ default_sound=KDE_Dialog_Appear.ogg
+ default_presentation=0
+
+@@ -2813,6 +2822,7 @@
+ Comment[tr]=Bir iletişim kutusu kaldırıldı
+ Comment[uk]=Зникає тимчасове вікно (діалог)
+ Comment[uz]=Мулоқат ойнаси ёпилди
++Comment[zh_CN]=删除了临时窗口(对话框)
+ default_sound=KDE_Dialog_Disappear.ogg
+ default_presentation=0
+
+--- kwin/client.cpp (revision 438047)
++++ kwin/client.cpp (revision 452311)
+@@ -1556,7 +1556,7 @@
+
+ bool Client::wantsTabFocus() const
+ {
+- return ( isNormalWindow() || isDialog() || isOverride()) && wantsInput();
++ return ( isNormalWindow() || isDialog() || isOverride()) && wantsInput() && !skip_taskbar;
+ }
+
+
+--- konsole/kwrited.desktop (revision 438047)
++++ konsole/kwrited.desktop (revision 452311)
+@@ -105,6 +105,7 @@
+ Comment[tg]=Иттилоотҳоро аз корвандҳои маҳаллӣ, кир бо дастурҳои write(1) ё wall(1) фиристода шуда буданд, қабул мекунад
+ Comment[tr]=Yerel kullanıcılarda write(1) veya wall(1) ile gönderilmiş mesajları izle
+ Comment[uk]=Спостерігання за повідомленнями від локальних користувачів, відісланих через write(1) або wall(1)
++Comment[zh_CN]=监视本地用户发出的 write(1) 或 wall(1)
+ Type=Service
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+--- konsole/eventsrc (revision 438047)
++++ konsole/eventsrc (revision 452311)
+@@ -83,6 +83,7 @@
+ Name[tr]=Görünen oturumda zil
+ Name[uk]=Дзвінок у видимому сеансі
+ Name[vi]=Chuông trong các session nhìn thấy
++Name[zh_CN]=可见会话中的响铃
+ Name[zh_TW]=在可見的工作階段使用響鈴
+ Comment=Bell emitted within a visible session
+ Comment[af]=Klokkie lui in die sigbare sessie
+@@ -136,6 +137,7 @@
+ Comment[tr]=Görünen oturum ile zil çal
+ Comment[uk]=Пролунав дзвінок у видимому сеансі
+ Comment[vi]=Chuông phát ra trong một session nhìn thấy
++Comment[zh_CN]=可见会话中发生的响铃
+ Comment[zh_TW]=在可見的工作階段使用響鈴
+ default_sound=KDE_Beep.ogg
+ default_presentation=1
+@@ -195,6 +197,7 @@
+ Name[tr]=Görünmeyen oturumda zil
+ Name[uk]=Дзвінок у невидимому сеансі
+ Name[vi]=Chuông trong các session không nhìn thấy
++Name[zh_CN]=不可见会话中的响铃
+ Name[zh_TW]=在不可見的工作階段使用響鈴
+ Comment=Bell emitted within a non-visible session
+ Comment[af]=Klokkie lui in onsigbare sessie
+@@ -247,6 +250,7 @@
+ Comment[tr]=Görünmeyen oturumda zil
+ Comment[uk]=Пролунав дзвінок у невидимому сеансі
+ Comment[vi]=Chuông phát ra trong một session không nhìn thấy
++Comment[zh_CN]=不可见会话中发生的响铃
+ Comment[zh_TW]=在不可見的工作階段使用響鈴
+ default_sound=KDE_Beep.ogg
+ default_presentation=16
+@@ -304,6 +308,7 @@
+ Name[tr]=İzlenen oturumda etkinlik
+ Name[uk]=Діяльність в контрольованому сеансі
+ Name[vi]=Các hoạt động trong session được theo dõi
++Name[zh_CN]=被监视会话中的活动
+ Name[zh_TW]=活動於監視中的工作階段
+ Comment=Activity detected in a monitored session
+ Comment[af]=Aktiwiteit opgetel in 'n sessie wat gemonitor word
+@@ -354,6 +359,7 @@
+ Comment[tr]=İzlenen oturumda etkinlik var
+ Comment[uk]=В контрольованому сеансі зареєстровано діяльність
+ Comment[vi]=Hoạt động phát hiện ra của một session bị theo dõi
++Comment[zh_CN]=被监视会话中检测到的活动
+ Comment[zh_TW]=活動被偵測到於監視中的工作階段
+ default_presentation=16
+
+@@ -410,6 +416,7 @@
+ Name[tr]=İzlenen oturumda sessizlik
+ Name[uk]=Тиша в контрольованому сеансі
+ Name[vi]=Im lặng trong các session được theo dõi
++Name[zh_CN]=被监视会话中的缄默
+ Name[zh_TW]=沉默於監視中工作階段
+ Comment=Silence detected in a monitored session
+ Comment[af]=Stilte opgetel in 'n sessie wat gemonitor word
+@@ -461,6 +468,7 @@
+ Comment[tr]=İzlenen oturumda sessizlik var
+ Comment[uk]=В контрольованому сеансі зареєстровано тишу
+ Comment[vi]=Im lặng phát hiện ra của một session bị theo dõi
++Comment[zh_CN]=被监视会话中检测到的缄默
+ Comment[zh_TW]=沉漠被偵測到於監視中的工作階段
+ default_presentation=16
+
+@@ -519,6 +527,7 @@
+ Name[tr]=Oturum sıfırdan farklı bir durumla çıktı
+ Name[uk]=Сеанс завершився з кодом помилки
+ Name[vi]=Session kết thúc với trạng thái khác 0
++Name[zh_CN]=非零状态完成的会话
+ Name[zh_TW]=工作階段結束於非零狀態
+ Comment=A session has exited with non-zero status
+ Comment[af]='n Sessie het geëindig met 'n nie-zero status
+@@ -574,5 +583,6 @@
+ Comment[tr]=Bir oturum hata vererek çıktı
+ Comment[uk]=Сеанс завершився з кодом помилки
+ Comment[vi]=Một session vừa kết thúc với trạng thái khác 0
++Comment[zh_CN]=会话以非零状态退出
+ Comment[zh_TW]=工作階段結束於非零狀態
+ default_presentation=0
+--- l10n/yu/entry.desktop (revision 438047)
++++ l10n/yu/entry.desktop (revision 452311)
+@@ -58,6 +58,7 @@
+ Name[uz]=Югославия
+ Name[vi]=Nam Tư
+ Name[wa]=Yougoslaveye
++Name[zh_CN]=南斯拉夫
+ Name[zh_TW]=南斯拉夫
+ Region=southeurope
+ Languages=sr
+--- l10n/bn/entry.desktop (revision 438047)
++++ l10n/bn/entry.desktop (revision 452311)
+@@ -6,6 +6,7 @@
+ Name[be]=Брунэй
+ Name[bg]=Бруней
+ Name[bn]=ব্রুনেই দারএসসলাম
++Name[br]=Darussalam Brunei
+ Name[cs]=Brunej
+ Name[cy]=Brwnei Darwsalam
+ Name[da]=Brunei
+--- kdm/backend/ctrl.c (revision 438047)
++++ kdm/backend/ctrl.c (revision 452311)
+@@ -479,6 +479,7 @@
+ Reply( "shutdown root\t" );
+ else
+ Reply( "shutdown\t" );
++ Reply( "shutdown ask\t" );
+ if (d->allowNuke != SHUT_NONE) {
+ if (d->allowNuke == SHUT_ROOT && d->userSess)
+ Reply( "nuke root\t" );
+--- kdm/kfrontend/sessions/blackbox.desktop (revision 438047)
++++ kdm/kfrontend/sessions/blackbox.desktop (revision 452311)
+@@ -27,7 +27,7 @@
+ Comment[es]=Un administrador de ventanas rápido y ligero
+ Comment[et]=Kiire ja vähenõudlik aknahaldur
+ Comment[eu]=Leiho kudeatzaile bizkor eta arina
+-Comment[fi]=Kevyt & nopea ikkunaohjelma
++Comment[fi]=Kevyt ja nopea ikkunaohjelma
+ Comment[fr]=Un gestionnaire de fenêtres rapide et léger
+ Comment[fy]=In flugge lichtgewicht finstersmanager
+ Comment[ga]=Bainisteoir fuinneoga gasta éadrom
+--- ksysguard/example/eventsrc (revision 438047)
++++ ksysguard/example/eventsrc (revision 452311)
+@@ -250,5 +250,6 @@
+ Comment[ven]=Tshisedzi tsho engedza phungudzo i sasaladzeaho
+ Comment[vi]=bộ cảm vượt quá giới hạn chịu đựng
+ Comment[xh]=Umda wokufumana ingxaki ekhoyo woluvo
++Comment[zh_CN]=传感器达到关键限制
+ Comment[zh_TW]=偵測器超過臨界限制
+ Comment[zu]=Umuzwa udlule isilinganiso esibucayi
More information about the Pkg-kde-commits
mailing list