[pkg-kde-commits] rev 2647 - trunk/packages/kdeadmin/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Dec 16 16:04:25 UTC 2005
Author: chrsmrtn
Date: 2005-12-16 16:04:22 +0000 (Fri, 16 Dec 2005)
New Revision: 2647
Added:
trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r488946.diff
Log:
Branch pull for kdeadmin.
Added: trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r488946.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r488946.diff 2005-12-16 15:11:12 UTC (rev 2646)
+++ trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r488946.diff 2005-12-16 16:04:22 UTC (rev 2647)
@@ -0,0 +1,296 @@
+#DPATCHLEVEL=0
+--- ksysv/ksysv.desktop (revision 484389)
++++ ksysv/ksysv.desktop (revision 488946)
+@@ -2,7 +2,6 @@
+ Encoding=UTF-8
+ Name=KSysV
+ Name[pt_BR]=KSysV
+-Name[xx]=xxKSysVxx
+ GenericName=SysV-Init Editor
+ GenericName[bg]=Редактор на SysV-Init
+ GenericName[br]=Aozer deraouiñ SysV
+@@ -36,7 +35,6 @@
+ GenericName[sv]=Sys V-starteditor
+ GenericName[tr]=SysV-Init Düzenleyici
+ GenericName[uk]=Редактор KSysV-Init
+-GenericName[xx]=xxSysV-Init Editorxx
+ GenericName[zh_CN]=SysV Init 编辑器
+ MimeType=
+ Exec=ksysv -caption "%c" %i %m
+--- ksysv/x-ksysv.desktop (revision 484389)
++++ ksysv/x-ksysv.desktop (revision 488946)
+@@ -60,7 +60,6 @@
+ Comment[ven]=Khonofiguresheni yo vhulungelwaho khayo
+ Comment[wa]=Apontiaedje d' enondaedje schapé
+ Comment[xh]=Uqwalaselo olugciniweyo lwe Init
+-Comment[xx]=xxSaved Init Configurationxx
+ Comment[zh_CN]=已保存的 Init 配置
+ Comment[zh_TW]=已儲存起始設定
+ Comment[zu]=Uhlanganiselo olugciniwe lwe Init
+--- ksysv/x-ksysv-log.desktop (revision 484389)
++++ ksysv/x-ksysv-log.desktop (revision 488946)
+@@ -49,7 +49,6 @@
+ Comment[tr]=SysV-Inıt Düzenleyici Günlük Dosyası
+ Comment[uk]=Файл журналу редактора SysV-Init
+ Comment[wa]=Fitchî djournå di l' aspougneu po SysV-Init
+-Comment[xx]=xxSysV-Init Editor Log Filexx
+ Comment[zh_CN]=SysV-Init 编辑器记录文件
+ Icon=ksysv
+ Type=MimeType
+--- kdat/kdat.desktop (revision 484389)
++++ kdat/kdat.desktop (revision 488946)
+@@ -11,7 +11,6 @@
+ Name[ta]=கேடாட்
+ Name[tg]=KДат
+ Name[th]=เทปสำรองข้อมูล - K
+-Name[xx]=xxKDatxx
+ GenericName=Tape Backup Tool
+ GenericName[af]=Kaset Rugsteun Program
+ GenericName[ar]=أداة حفظ شريط البيانات الإحتياطي
+@@ -71,7 +70,6 @@
+ GenericName[ven]=Tshishumiswa tsha Theipi tshau Thusedza
+ GenericName[wa]=Usteye di copeyes di såvrité so bindes
+ GenericName[xh]=Isixhobo Sokuncedisa Iteyipu
+-GenericName[xx]=xxTape Backup Toolxx
+ GenericName[zh_CN]=磁带备份工具
+ GenericName[zh_TW]=磁帶備份工具
+ GenericName[zu]=Ithuluzi Yethephu Yokugcina umsebenzi uphephile
+--- kuser/propdlg.cpp (revision 484389)
++++ kuser/propdlg.cpp (revision 488946)
+@@ -915,7 +915,12 @@
+ lstchg = now();
+ QDateTime datetime;
+ datetime.setTime_t( lstchg );
+- leslstchg->setText( KGlobal::locale()->formatDateTime( datetime, false ) );
++ if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Shadow ||
++ kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ||
++ kug->getUsers().getCaps() & KU::KUsers::Cap_BSD ) {
++
++ leslstchg->setText( KGlobal::locale()->formatDateTime( datetime, false ) );
++ }
+ cbdisabled->setChecked( false );
+ }
+ }
+--- kuser/kuserfiles.cpp (revision 484389)
++++ kuser/kuserfiles.cpp (revision 488946)
+@@ -239,6 +239,7 @@
+ kdDebug() << "open shadow file: " << shadow_file << endl;
+ if ((f = fopen( QFile::encodeName(shadow_file), "r")) == NULL) {
+ KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(shadow_file) );
++ caps &= ~Cap_Shadow;
+ return TRUE;
+ }
+ while ((spw = fgetspent( f ))) { // read a shadow password structure
+@@ -605,7 +606,7 @@
+
+ mode = umask(0077);
+ ret = savepwd();
+- if ( ret ) ret = savesdw();
++ if ( ret && ( caps & Cap_Shadow ) ) ret = savesdw();
+ umask( mode );
+ if ( !ret ) return false;
+
+--- kuser/kuser.desktop (revision 484389)
++++ kuser/kuser.desktop (revision 488946)
+@@ -19,7 +19,6 @@
+ Name[tg]=KИстифодакунанда
+ Name[th]=จัดการบัญชีผู้ใช้ - K
+ Name[uz]=Фойдаланувчилар
+-Name[xx]=xxKUserxx
+ GenericName=User Manager
+ GenericName[af]=Gebruiker Bestuurder
+ GenericName[ar]=مدير المستخدمين
+@@ -80,7 +79,6 @@
+ GenericName[ven]=Murangaphanda wa Mushumisi
+ GenericName[wa]=Manaedjeu d' uzeus
+ GenericName[xh]=Umphathi We Calendar
+-GenericName[xx]=xxUser Managerxx
+ GenericName[zh_CN]=用户管理程序
+ GenericName[zh_TW]=使用者管理程式
+ GenericName[zu]=Umphathi we Calendar
+--- lilo-config/kde/lilo.desktop (revision 484389)
++++ lilo-config/kde/lilo.desktop (revision 488946)
+@@ -66,7 +66,6 @@
+ Name[ven]=Muranga phanda wa Butu (LILO)
+ Name[wa]=Apontiaedje del enondrece (LILO)
+ Name[xh]=Umphathi wesiNgxobo (LILO)
+-Name[xx]=xxBoot Manager (LILO)xx
+ Name[zh_CN]=启动管理器(LILO)
+ Name[zh_TW]=開機啟動管理程式(LILO)
+ Name[zu]=Umphathi Wesingxobo (LILO)
+@@ -125,7 +124,6 @@
+ Comment[ven]=Dzudzanyani LILO (mulanguli wa boot ya Linux)
+ Comment[wa]=Chal vos ploz apontyî LILO (l' enondrece Linux)
+ Comment[xh]=Qwalalsela LILO (umphathi we boot ye Linux)
+-Comment[xx]=xxConfigure LILO (the Linux boot manager)xx
+ Comment[zh_CN]=配置 LILO (Linux 启动管理程序)
+
+ Keywords=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start
+@@ -177,7 +175,6 @@
+ Keywords[ven]=lilo,boot,bootup,boot manager,linux,Other Os,MBR,Mathomoni,Thoma
+ Keywords[wa]=LILO,boot,bootup,linux,Ôtes SO,MBR,startup,start,enondrece,enondaedje
+ Keywords[xh]=lilo,isingxobo,faka isingxobo, uphathi wesingxobo,linux,Ezinye OS,MBR,faka isiqalo,qala
+-Keywords[xx]=xxlilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,startxx
+ Keywords[zh_CN]=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start,启动,启动管理器,其它操作系统
+ Keywords[zu]=lilo,isingxobo,faka isingxobo umphathi wesingxobo,linux,Ezinye OS,MBR,faka isiqalo,qala
+
+--- kpackage/kpackage.desktop (revision 484389)
++++ kpackage/kpackage.desktop (revision 488946)
+@@ -16,7 +16,6 @@
+ Name[th]=จัดการแพ็คเกจ
+ Name[ven]=Tshiputo tsha K
+ Name[xh]=UdibanisolweK
+-Name[xx]=xxKPackagexx
+ Name[zu]=kphakethe
+ GenericName=Package Manager
+ GenericName[af]=Paket Bestuurder
+@@ -77,7 +76,6 @@
+ GenericName[ven]=Phakhedzhi ya Murangaphanda
+ GenericName[wa]=Manaedjeu di pacaedjes
+ GenericName[xh]=Umphathi Wokudityaniswe kunye
+-GenericName[xx]=xxPackage Managerxx
+ GenericName[zh_CN]=软件包管理器
+ GenericName[zh_TW]=套件管理程式
+ GenericName[zu]=Umphathi Wokusongwayo
+--- kfile-plugins/deb/kfile_deb.desktop (revision 484389)
++++ kfile-plugins/deb/kfile_deb.desktop (revision 488946)
+@@ -52,7 +52,6 @@
+ Name[uk]=Дані DEB
+ Name[ven]=Mbalo dza DEB
+ Name[wa]=Sitatistikes DEB
+-Name[xx]=xxDEB Statsxx
+ Name[zh_CN]=DEB 统计
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_deb
+--- kfile-plugins/rpm/kfile_rpm.desktop (revision 484389)
++++ kfile-plugins/rpm/kfile_rpm.desktop (revision 488946)
+@@ -53,7 +53,6 @@
+ Name[uk]=Дані RPM
+ Name[ven]=Mbalo dza RPM
+ Name[wa]=Sitatistikes RPM
+-Name[xx]=xxRPM Statsxx
+ Name[zh_CN]=RPM 统计
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_rpm
+--- knetworkconf/knetworkconf/knetworkconf.desktop (revision 484389)
++++ knetworkconf/knetworkconf/knetworkconf.desktop (revision 488946)
+@@ -14,6 +14,8 @@
+ Comment[de]=TCP/IP-Einstellungen einrichten
+ Comment[el]=Διαμόρφωση των ρυθμίσεων TCP/IP
+ Comment[es]=Configure los parámetros TCP/IP
++Comment[et]=TCP/IP seadistuste seadistamine
++Comment[eu]=Konfiguratu TCP/IP ezarpenak
+ Comment[fi]=Aseta TCP/IP-asetukset
+ Comment[fr]=Configuration des paramètres TCP/IP
+ Comment[ga]=Cumraigh Socruithe TCP/IP
+@@ -32,14 +34,12 @@
+ Comment[sr at Latn]=Podesite TCP/IP postavke
+ Comment[sv]=Anpassa TCP/IP-inställningar
+ Comment[uk]=Налаштувати параметри TCP/IP
+-Comment[xx]=xxConfigure TCP/IP settingsxx
+ Comment[zh_CN]=配置 TCP/IP 设置
+ Terminal=false
+ Name=KNetworkConf
+ Name[pa]=ਕੇ-ਨੈੱਟਵਰਕ-ਸੰਰਚਨਾ
+ Name[pt_BR]=KNetworkConf
+ Name[sv]=Knetworkconf
+-Name[xx]=xxKNetworkConfxx
+ GenericName=Configure TCP/IP Settings
+ GenericName[bg]=Конфигуриране на TCP/IP
+ GenericName[br]=Kefluniañ an dibarzhoù TCP/IP
+@@ -49,6 +49,8 @@
+ GenericName[de]=TCP/IP-Einstellungen einrichten
+ GenericName[el]=Διαμορφώστε τις ρυθμίσεις TCP/IP
+ GenericName[es]=Configure los parámetros TCP/IP
++GenericName[et]=TCP/IP seadistuste seadistamine
++GenericName[eu]=Konfiguratu TCP/IP ezarpenak
+ GenericName[fi]=Aseta TCP/IP-asetukset
+ GenericName[fr]=Configuration des paramètres TCP/IP
+ GenericName[ga]=Cumraigh Socruithe TCP/IP
+@@ -67,5 +69,4 @@
+ GenericName[sr at Latn]=Podesi TCP/IP postavke
+ GenericName[sv]=Anpassa TCP/IP-inställningar
+ GenericName[uk]=Налаштувати параметри TCP/IP
+-GenericName[xx]=xxConfigure TCP/IP Settingsxx
+ GenericName[zh_CN]=配置 TCP/IP 设置
+--- knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop (revision 484389)
++++ knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop (revision 488946)
+@@ -20,11 +20,13 @@
+ Comment[de]=Netzwerkeinstellungen einrichten
+ Comment[el]=Διαμόρφωση ρυθμίσεων δικτύου
+ Comment[es]=Configure los parámetros de red
++Comment[et]=Võrguseadistuste seadistamine
++Comment[eu]=Konfiguratu sareko ezarpenak
+ Comment[fi]=Aseta tietoverkon asetukset
+ Comment[fr]=Configuration des paramètres réseau
+ Comment[ga]=Cumraigh na Socruithe Líonra
+ Comment[hu]=A hálózat beállításai
+-Comment[is]=Umsjón net stillinga
++Comment[is]=Umsjón netstillinga
+ Comment[it]=Configura le impostazioni di rete
+ Comment[lt]=Konfigūruoti tinklo nustatymus
+ Comment[nb]=Sett opp nettverksinnstillinger
+@@ -38,7 +40,6 @@
+ Comment[sr at Latn]=Podešavanje postavki mreže
+ Comment[sv]=Anpassa nätverksinställningar
+ Comment[uk]=Налаштувати мережні параметри
+-Comment[xx]=xxConfigure Network Settingsxx
+ Comment[zh_CN]=配置网络设置
+ Terminal=false
+ Name=Network Settings
+@@ -51,11 +52,13 @@
+ Name[de]=Netzwerkeinstellungen
+ Name[el]=Ρυθμίσεις δικτύου
+ Name[es]=Parámetros de red
++Name[et]=Võrguseadistused
++Name[eu]=Sareko ezarpenak
+ Name[fi]=Verkkoasetukset
+ Name[fr]=Paramètres réseau
+ Name[ga]=Socruithe Líonra
+ Name[hu]=Hálózati beállítások
+-Name[is]=Net stillingar
++Name[is]=Netstillingar
+ Name[it]=Impostazioni di rete
+ Name[nb]=Nettverksoppsett
+ Name[nl]=Netwerkinstellingen
+@@ -68,7 +71,6 @@
+ Name[sr at Latn]=Postavke mreže
+ Name[sv]=Nätverksinställningar
+ Name[uk]=Мережні параметри
+-Name[xx]=xxNetwork Settingsxx
+ Name[zh_CN]=网络设置
+ Keywords=Network,DNS,routes,interfaces
+ Keywords[bg]=мрежа, рутер, интерфейс, мрежова, карта, Network, DNS, routes, interfaces
+@@ -79,6 +81,8 @@
+ Keywords[de]=Netzwerk,DNS,routes,interfaces
+ Keywords[el]=Δίκτυο,DNS,routes,διεπαφές
+ Keywords[es]=Red, DNS, rutas, interfaces
++Keywords[et]=Võrk,DNS,marsruudid,liidesed
++Keywords[eu]=Sarea,DNS,bideak, iterfazeak
+ Keywords[fi]=tietoverkko,DNS,reitit,rajapinnat
+ Keywords[fr]=réseau,DNS,serveur de noms,routes,interfaces
+ Keywords[ga]=Líonra,DNS,róid,comhéadain
+@@ -95,5 +99,4 @@
+ Keywords[sr at Latn]=Mreža,DNS,rute,interfejsi
+ Keywords[sv]=Nätverk,DNS,route,gränssnitt
+ Keywords[uk]=Network,DNS,routes,interfaces,мережа,інтерфейси
+-Keywords[xx]=xxNetwork,DNS,routes,interfacesxx
+ Keywords[zh_CN]=Network,DNS,routes,interfaces,网络,路由,接口
+--- kcron/kcron.desktop (revision 484389)
++++ kcron/kcron.desktop (revision 488946)
+@@ -15,7 +15,6 @@
+ Name[ta]=கேக்ரொன்
+ Name[tg]=Kрон
+ Name[th]=ตารางงาน - K
+-Name[xx]=xxKCronxx
+ GenericName=Task Scheduler
+ GenericName[af]=Opdrag Skeduleerder
+ GenericName[ar]=مجدول المهام
+@@ -76,7 +75,6 @@
+ GenericName[ven]=Muvhekanyi wa Mushumo
+ GenericName[wa]=Tiestires C
+ GenericName[xh]=Umcwangcisi Womsebenzi
+-GenericName[xx]=xxTask Schedulerxx
+ GenericName[zh_CN]=任务调度程序
+ GenericName[zh_TW]=工作排程器
+ GenericName[zu]=Umgcini sikhathi Somsebenzi
More information about the pkg-kde-commits
mailing list