[Pkg-kde-commits] rev 1377 - branches/kde-3.4.0/packages/kdebase/debian/patches

Christopher Martin chrsmrtn-guest at costa.debian.org
Tue Jul 26 20:25:30 UTC 2005 

Author: chrsmrtn-guest
Date: 2005-07-26 20:25:28 +0000 (Tue, 26 Jul 2005)
New Revision: 1377

Added:
   branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r438047.diff
Modified:
   branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
Log:
New branch diff for kdebase. Also re-sync the font patch to match.


Added: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r438047.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r438047.diff	2005-07-26 20:23:27 UTC (rev 1376)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r438047.diff	2005-07-26 20:25:28 UTC (rev 1377)
@@ -0,0 +1,5244 @@
+#DPATCHLEVEL=0
+--- kate/plugins/defaultproject/katedefaultproject.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kate/plugins/defaultproject/katedefaultproject.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -58,7 +58,7 @@
+ Name[tr]=Öntanımlı Kate Proje Eklentisi
+ Name[uk]=Типовий втулок проекту Kate
+ Name[uz]=Kate андоза лойиҳа плагини
+-Name[zh_CN]=Kate 默认项目插件
++Name[zh_CN]=Kat 默认项目插件
+ Comment=Default Plugin for Projects
+ Comment[af]=Standaard Inprop Module vir Projekte
+ Comment[ar]=الملحق الافتراضي للمشاريع
+--- kate/data/x-kate-project.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kate/data/x-kate-project.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -58,7 +58,7 @@
+ Comment[tr]=Kate Proje Dosyası
+ Comment[uk]=Файл проекту Kate
+ Comment[uz]=Kate лойиҳа файли
+-Comment[zh_CN]=Kate 项目插件
++Comment[zh_CN]=Kate 项目文件
+ 
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- kdepasswd/kcm/kcm_useraccount.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdepasswd/kcm/kcm_useraccount.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,7 +41,7 @@
+ Name[nds]=Passwoort & Brukerkonto
+ Name[nl]=Wachtwoord en gebruikerbeheer
+ Name[nn]=Passord og brukarkonto
+-Name[pa]=ਉਪਭੋਗਤਾ ਖਾਤਾ ਤੇ ਉਪਭੋਗੀ ਖਾਤਾ
++Name[pa]=ਗੁਪਤ-ਕੋਡ ਅਤੇ ਉਪਭੋਗੀ ਖਾਤਾ
+ Name[pl]=Hasło i konto użytkownika
+ Name[pt]=Senha e Conta do Utilizador
+ Name[pt_BR]=Senha & Conta do Usuário
+@@ -136,7 +136,7 @@
+ Comment[nds]=Brukerinformatschonen, as t.B. Passwoort, Naam un Nettpostadress
+ Comment[nl]=Gebruikerinformatie zoals wachtwoord, naam en e-mailadres
+ Comment[nn]=Brukarinformasjon som passord, namn og e-postadresse
+-Comment[pa]=ਉਪਭੋਗਤਾ ਜਾਣਕਾਰੀ ਜਿਵੇਂ ਕਿ ਗੁਪਤ-ਕੋਡ, ਨਾਂ ਅਤੇ ਈ-ਪੱਤਰ
++Comment[pa]=ਉਪਭੋਗੀ ਜਾਣਕਾਰੀ ਜਿਵੇਂ ਕਿ ਗੁਪਤ-ਕੋਡ, ਨਾਂ ਅਤੇ ਈ-ਮੇਲ
+ Comment[pl]=Informacje o koncie użytkownika: hasło, imię i nazwisko, e-mail itd.
+ Comment[pt]=Informações do utilizador tais como senha, nome e e-mail
+ Comment[pt_BR]=Informações do usuário tais como senha, nome e e-mail
+--- kpersonalizer/kpersonalizer.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kpersonalizer/kpersonalizer.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -47,7 +47,7 @@
+ Name[nl]=KDE's Configuratie Assistent
+ Name[nn]=Vegvisar for skrivebordsoppsett
+ Name[nso]=Wizard ya Dipeakanyo tsa Desktop
+-Name[pa]=ਵਿਹੜਾ ਵਿਵਸਥਾ ਸਹਾਇਕ
++Name[pa]=ਵਿਹੜਾ ਸੈਟਿੰਗ ਸਹਾਇਕ
+ Name[pl]=Asystent ustawień środowiska
+ Name[pt]=Assistente de Configuração do Ambiente de Trabalho
+ Name[pt_BR]=Assistente de Configurações para a Área de Trabalho
+--- kcontrol/usbview/kcmusb.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/usbview/kcmusb.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -185,6 +185,7 @@
+ Keywords[nl]=USB,devices,viewer,control,weergaveprogramma
+ Keywords[nn]=USB,einingar,visar,kontroll
+ Keywords[nso]=USB,maano,selebeledi,taolo
++Keywords[pa]=USB,ਜੰਤਰ,ਦਰਸ਼ਕ,ਕੰਟਰੋਲ
+ Keywords[pl]=USB,urzÄ…dzenia,przeglÄ…darka,sterowanie
+ Keywords[pt]=USB,dispositivos,visualizador,controlo
+ Keywords[pt_BR]=USB,dispositivos,visualizador,controle
+--- kcontrol/taskbar/kcmtaskbar.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/taskbar/kcmtaskbar.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,7 +52,7 @@
+ Name[nn]=Oppgåvelinje
+ Name[nso]=Bar ya Mosongwana
+ Name[oc]=Barra de tasques
+-Name[pa]=ਸੰਦਪੱਟੀ
++Name[pa]=ਕੰਮ-ਪੱਟੀ
+ Name[pl]=Pasek zadań
+ Name[pt]=Barra de Tarefas
+ Name[pt_BR]=Barra de tarefas
+@@ -114,7 +114,7 @@
+ Comment[nds]=Den Programmbalken in't Paneel instellen
+ Comment[nl]=Hier kunt u de taakbalk van het paneel instellen
+ Comment[nn]=Oppsett av oppgåvelinja i panelet
+-Comment[pa]=ਪੈਨਲ ਸੰਦਪੱਟੀ ਸੰਰਚਨਾ
++Comment[pa]=ਪੈਨਲ ਕੰਮ-ਪੱਟੀ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja paska zadań panelu
+ Comment[pt]=Configuração da barra de tarefas do painel
+ Comment[pt_BR]=Configura a barra de tarefas
+--- kcontrol/nics/nic.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/nics/nic.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,7 +52,7 @@
+ Name[nl]=Netwerkinterfaces
+ Name[nn]=Nettverksgrensesnitt
+ Name[nso]=Difahlego tsa Kgokagano
+-Name[pa]=ਨੈਟਵਰਕ ਇੰਟਰਫੇਸ਼
++Name[pa]=ਨੈਟਵਰਕ ਇੰਟਰਫੇਸ
+ Name[pl]=Interfejsy sieciowe
+ Name[pt]=Interfaces de Rede
+ Name[pt_BR]=Interfaces de Rede
+@@ -121,7 +121,7 @@
+ Comment[nl]=Netwerkinterface-informatie
+ Comment[nn]=Informasjon om nettverksgrensesnitt
+ Comment[nso]=Tshedimoso ya Difahlego tsa Kgokagano
+-Comment[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਜਾਣਕਾਰੀ
++Comment[pa]=ਨੈਟਵਰਕ ਇੰਟਰਫੇਸ ਜਾਣਕਾਰੀ
+ Comment[pl]=Informacje o interfejsie sieciowym
+ Comment[pt]=Informações sobre as interfaces de rede
+ Comment[pt_BR]=Informações sobre rede
+--- kcontrol/smserver/kcmsmserver.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/smserver/kcmsmserver.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -55,7 +55,7 @@
+ Name[nl]=Sessiebeheer
+ Name[nn]=Økthandsamar
+ Name[nso]=Molaodi wa Tiragalo
+-Name[pa]=ਅਜਲਾਸ ਪ੍ਰਬੰਧਕ
++Name[pa]=ਸ਼ੈਸ਼ਨ ਪ੍ਰਬੰਧਕ
+ Name[pl]=Menedżer sesji
+ Name[pt]=Gestor de Sessões
+ Name[pt_BR]=Gerenciador de Sessão
+@@ -119,7 +119,7 @@
+ Comment[nl]=Hier kunt u het sessiebeheer en de afmeld-instellingen bepalen
+ Comment[nn]=Oppsett av økthandsamar og utlogging
+ Comment[nso]=Beakanya molaodi wa tiragalo le dipeakanyo tsa gotswa
+-Comment[pa]=ਆਪਣੇ ਅਜਲਾਸ ਪ੍ਰਬੰਧਕ ਤੇ ਲਾਗਆਉਟ ਵਿਵਸਥਾ ਸੰਰਚਨਾ
++Comment[pa]=ਆਪਣੇ ਸ਼ੈਸ਼ਨ ਪ੍ਰਬੰਧਕ ਤੇ ਲਾਗਆਉਟ ਸੈਟਿੰਗ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja menedżera sesji i ustawień wylogowania
+ Comment[pt]=Configuração do gestor de sessões e das opções de finalização
+ Comment[pt_BR]=Configura o gerenciador de sessão e definições de logout
+--- kcontrol/konq/desktoppath.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/konq/desktoppath.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,7 +50,7 @@
+ Name[nl]=Paden
+ Name[nn]=Stiar
+ Name[nso]=Ditsejana
+-Name[pa]=ਰਸਤੇ
++Name[pa]=ਮਾਰਗ
+ Name[pl]=Ścieżki
+ Name[pt]=Localizações
+ Name[pt_BR]=Caminhos
+@@ -116,7 +116,7 @@
+ Comment[nl]=Hier kunt u de locatie voor het opslaan van belangrijke bestanden wijzigen
+ Comment[nn]=Endra plasseringa av viktige filer
+ Comment[nso]=Fetosa tulo yeo go bolokwago difaele tse bohlokwa
+-Comment[pa]=ਜ਼ਰੂਰੀ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਸਥਿਤੀ ਤਬਦੀਲ
++Comment[pa]=ਜ਼ਰੂਰੀ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਟਿਕਾਣਾ ਤਬਦੀਲ
+ Comment[pl]=Miejsce przechowywania ważnych plików
+ Comment[pt]=Alterar as localizações onde os ficheiros importantes estão guardados
+ Comment[pt_BR]=Modifica a localização onde importantes arquivos devem ser armazenados
+@@ -190,7 +190,7 @@
+ Keywords[ven]=konqueror,mulanguli wa faela,ludila,desktop,malatwa,dzitsumbavhulwo,mathomo
+ Keywords[vi]=konqueror,trình quản lý file,đường dẫn,desktop,thùng rác,thư mục,tự khởi động
+ Keywords[xh]=konqueror,umphathi wefayile,umendo, desktop,umonakalo,abalawuli,qala ngokuzenzekelayo
+-Keywords[zh_CN]=konqueror,filemanager,paths,desktop,trash,directories,autostart,文件管理器,路径,桌面,回收站,目录,自动启动
++Keywords[zh_CN]=konqueror,filemanager,paths,desktop,trash,directories,autostart,文件管理器,路径,桌面,目录,自动启动,回收站
+ Keywords[zh_TW]=konqueror,filemanager,paths,desktop,trash,directories,autostart,征服家,檔案管理程式,路徑,桌面,垃圾桶,目錄,自動啟動
+ Keywords[zu]=konqueror,imenenja yamafayela,izindlela,desktop,izibi,uhlu lwamafayela,ukuqala ngokuzenzekela
+ 
+--- kcontrol/konq/webappearance.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/konq/webappearance.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,7 +52,7 @@
+ Name[nl]=Uiterlijk
+ Name[nn]=Utsjånad
+ Name[nso]=Ponagalo
+-Name[pa]=ਦਰਿਸ਼
++Name[pa]=ਦਿੱਖ
+ Name[pl]=WyglÄ…d
+ Name[pt]=Aparência
+ Name[pt_BR]=Aparência
+--- kcontrol/konq/filebehavior.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/konq/filebehavior.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -181,3 +181,4 @@
+ Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,särskilt fönster,visa fönster,beteende,minnesanvändning,hemadress,nätverksåtgärder,förloppsdialogruta,papperskorg,ta bort,bekräftelse
+ Keywords[ta]=கான்கொரர்,கோப்பு மேலாளர்,kfm,குறிப்புகள்,கோப்பு குறிப்புகள்,தனி சாளரம்,நீள்வட்ட சாளரம்,நடத்தை,நினைவு பயன்பாடு,வீட்டு வலைப்பின்னல்,வலைப்பின்னல் செயல்பாடுகள், வழிமுறை உரையாடல்,குப்பைத்தொட்டி, நீக்கு,உறுதிப்படுத்தல்
+ Keywords[uk]=konqueror,менеджер файлів,kfm,підказки,підказки по файлах,окремі вікна,створення вікон,поведінка,використання пам'яті,домашній URL,робота з мережею,вікно поступу,смітник,
++Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,文件管理器,提示,文件提示,拆分窗口,新开窗口,行为,内存使用,主 URL,网络操作,进度对话框,回收站,删除,确认
+--- kcontrol/konq/fileappearance.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/konq/fileappearance.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,7 +52,7 @@
+ Name[nl]=Uiterlijk
+ Name[nn]=Utsjånad
+ Name[nso]=Ponagalo
+-Name[pa]=ਦਰਿਸ਼
++Name[pa]=ਦਿੱਖ
+ Name[pl]=WyglÄ…d
+ Name[pt]=Aparência
+ Name[pt_BR]=Aparência
+--- kcontrol/konq/filepreviews.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/konq/filepreviews.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,7 +46,7 @@
+ Name[nds]=Vöransichten & Meta-Daten
+ Name[nl]=Voorbeelden en meta-data
+ Name[nn]=Førehandsvising og metadata
+-Name[pa]=ਨਮੂਨਾ ਤੇ ਮੇਟਾ-ਡਾਟਾ
++Name[pa]=ਝਲਕ ਅਤੇ ਮੇਟਾ-ਡਾਟਾ
+ Name[pl]=PodglÄ…dy i metadane
+ Name[pt]=Antevisões e Meta Dados
+ Name[pt_BR]=Pré-visualizações & Metadados
+--- kcontrol/kicker/kicker_config_appearance.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kicker/kicker_config_appearance.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,7 +52,7 @@
+ Name[nl]=Uiterlijk
+ Name[nn]=Utsjånad
+ Name[nso]=Ponagalo
+-Name[pa]=ਦਰਿਸ਼
++Name[pa]=ਦਿੱਖ
+ Name[pl]=WyglÄ…d
+ Name[pt]=Aparência
+ Name[pt_BR]=Aparência
+--- kcontrol/privacy/privacy.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/privacy/privacy.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -34,7 +34,7 @@
+ Comment[nds]=Privaatruum - Mit dit Moduul kannst Du dat Systeem vun de Sporen vun't Bruken reenmaken
+ Comment[nl]=Privacy - een configuratiemodule waarmee u ongewenste sporen die gebruikers achterlaten kunt wissen.
+ Comment[nn]=Personvern – ein kontrollmodul som fjernar uønskte spor som brukeren etterlèt seg i systemet
+-Comment[pa]=ਨਿੱਜੀ - ਇੱਕ ਕੇਕੰਟਰੋਲ ਮੈਡੀਊਲ ਹੈ, ਜੋ ਕਿ ਸਿਸਟਮ ਤੇ ਉਪਭੋਗਤਾ ਦਾ ਪਛਾਣ ਨੂੰ ਸਮਾਪਤ ਕਰਦਾ ਹੈ
++Comment[pa]=ਰਹੱਸ - ਇੱਕ ਕੇ-ਕੰਟਰੋਲ ਮੈਡੀਊਲ ਹੈ, ਜੋ ਕਿ ਸਿਸਟਮ ਤੇ ਉਪਭੋਗੀ ਦਾ ਪਛਾਣ ਨੂੰ ਸਮਾਪਤ ਕਰਦਾ ਹੈ
+ Comment[pl]=Ustawienia prywatności - moduł, który pozwala usunąć niepożądane ślady pozostawiane przez użytkownika w systemie
+ Comment[pt]=Privacidade - um módulo do kcontrol para limpar os registos indesejáveis que o utilizador deixa no sistema
+ Comment[pt_BR]=Privacidade - um módulo de controle do KDE para limpar traços não-desejados do usuário no sistema
+@@ -89,6 +89,7 @@
+ Keywords[nds]=Privaatsfäär
+ Keywords[nl]=privacy
+ Keywords[nn]=personvern,privat
++Keywords[pa]=Privacy,privacy,ਰਹੱਸ
+ Keywords[pl]=Prywatność,prywatność,ustawienia prywatności
+ Keywords[pt]=privacidade
+ Keywords[pt_BR]=Privacidade,privacidade
+@@ -140,7 +141,7 @@
+ Name[nb]=Personvern
+ Name[nds]=Privaatruum
+ Name[nn]=Personvern
+-Name[pa]=ਨਿੱਜੀਤਵ
++Name[pa]=ਰਹੱਸ
+ Name[pl]=Prywatność
+ Name[pt]=Privacidade
+ Name[pt_BR]=Privacidade
+--- kcontrol/screensaver/testwin.h	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/screensaver/testwin.h	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -1,9 +1,9 @@
+ #ifndef TESTWIN_H
+ #define TESTWIN_H
+ 
+-#include <qxembed.h>
++#include "kswidget.h"
+ 
+-class TestWin : public QXEmbed
++class TestWin : public KSWidget
+ {
+     Q_OBJECT
+ public:
+--- kcontrol/screensaver/screensaver.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/screensaver/screensaver.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -117,7 +117,7 @@
+ Comment[nl]=Schermbeveiliging instellen
+ Comment[nn]=Innstillingar for skjermsparar
+ Comment[nso]=Dipeakanyo tsa Seboloki sa Pontsho
+-Comment[pa]=ਵਿਹਲੇ ਪਰਦੇ ਵਿਵਸਥਾ
++Comment[pa]=ਵਿਹਲੇ ਪਰਦੇ ਸੈਟਿੰਗ
+ Comment[pl]=Ustawienia wygaszacza ekranu
+ Comment[pt]=Configuração do Protector de Ecrã
+ Comment[pt_BR]=Configurações do Protetor de Tela
+@@ -183,6 +183,7 @@
+ Keywords[nl]=screensavers,schermbeveiliging,prioriteit,schermvergrendeling
+ Keywords[nn]=skjermsparar,prioritet
+ Keywords[nso]=diboloki tsa pontsho,Kgethokgolo
++Keywords[pa]=screensavers,Priority,ਦਰਜਾ
+ Keywords[pl]=wygaszacze ekranu,priorytet
+ Keywords[pt]=protectores de ecrã,prioridade
+ Keywords[pt_BR]=protetores de tela,prioridade
+--- kcontrol/screensaver/configure.in.in	(.../tags/KDE/3.4.2/kdebase)	(revision 0)
++++ kcontrol/screensaver/configure.in.in	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -0,0 +1,8 @@
++AC_HAVE_GL(
++    [
++    AC_CHECK_LIB(GL,glXChooseVisual,
++        [
++        AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have glXChooseVisual()])
++        ])
++    ],[]
++    )
+--- kcontrol/screensaver/kssmonitor.h	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/screensaver/kssmonitor.h	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -1,13 +1,12 @@
+ #ifndef KSSMONITOR_H
+ #define KSSMONITOR_H
+ 
+-#include <qxembed.h>
++#include "kswidget.h"
+ 
+-class KSSMonitor : public QXEmbed
++class KSSMonitor : public KSWidget
+ {
+-    Q_OBJECT
+ public:
+-    KSSMonitor( QWidget *parent ) : QXEmbed( parent ) {}
++    KSSMonitor( QWidget *parent ) : KSWidget( parent ) {}
+ 
+     // we don't want no steenking palette change
+     virtual void setPalette( const QPalette & ) {}
+--- kcontrol/screensaver/kswidget.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 0)
++++ kcontrol/screensaver/kswidget.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -0,0 +1,40 @@
++#include <config.h>
++
++#include <kwin.h>
++#include "testwin.h"
++
++#ifdef HAVE_GLXCHOOSEVISUAL
++#include <GL/glx.h>
++#endif
++
++KSWidget::KSWidget( QWidget* parent, const char* name, int f )
++    : QXEmbed( parent, name, f )
++{
++// use visual with support for double-buffering, for opengl
++// this code is duplicated in kdebase/kdesktop/lock/
++#ifdef HAVE_GLXCHOOSEVISUAL
++    Visual* visual = CopyFromParent;
++    XSetWindowAttributes attrs;
++    int flags = 0;
++    if( true /*mOpenGLVisual*/ )
++    {
++        int attribs[] = { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, x11Depth(), None };
++        if( XVisualInfo* i = glXChooseVisual( x11Display(), x11Screen(), attribs ))
++        {
++            visual = i->visual;
++            static Colormap colormap = 0;
++            if( colormap != 0 )
++                XFreeColormap( x11Display(), colormap );
++            colormap = XCreateColormap( x11Display(), RootWindow( x11Display(), x11Screen()), visual, AllocNone );
++            attrs.colormap = colormap;
++            flags |= CWColormap;
++            XFree( i );
++        }
++    }
++    Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
++        x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs );
++    create( w );
++#endif
++}
++
++#include "kswidget.moc"
+--- kcontrol/screensaver/scrnsave.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/screensaver/scrnsave.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,10 +46,7 @@
+ 
+ #include "scrnsave.h"
+ 
+-// X11 headers
+-#undef Above
+-#undef Below
+-#undef None
++#include <fixx11h.h>
+ 
+ template class QPtrList<SaverConfig>;
+ 
+--- kcontrol/screensaver/kswidget.h	(.../tags/KDE/3.4.2/kdebase)	(revision 0)
++++ kcontrol/screensaver/kswidget.h	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -0,0 +1,13 @@
++#ifndef KSWIDGET_H
++#define KSWIDGET_H
++
++#include <qxembed.h>
++
++class KSWidget : public QXEmbed
++{
++    Q_OBJECT
++public:
++    KSWidget( QWidget *parent = NULL, const char* name = NULL, int flags = 0 );
++};
++
++#endif
+--- kcontrol/screensaver/Makefile.am	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/screensaver/Makefile.am	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -1,11 +1,12 @@
+ 
+-AM_CPPFLAGS = $(all_includes)
++AM_CPPFLAGS = $(GLINC) $(all_includes)
+ 
+ kde_module_LTLIBRARIES = kcm_screensaver.la
+ 
+-kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp 
++kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp \
++        saverconfig.cpp advanceddialog.cpp kswidget.cpp
+ kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+-kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB)
++kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(GLLIB)
+ METASOURCES = AUTO
+ 
+ noinst_HEADERS = scrnsave.h
+--- kcontrol/screensaver/testwin.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/screensaver/testwin.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -4,7 +4,7 @@
+ class QXEmbed;
+ 
+ TestWin::TestWin()
+-    : QXEmbed(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM )
++    : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM )
+ {
+     setFocusPolicy(StrongFocus);
+     KWin::setState( winId(), NET::StaysOnTop );
+--- kcontrol/kio/lanbrowser.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/lanbrowser.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -49,7 +49,7 @@
+ Name[nl]=Lokaal netwerk
+ Name[nn]=Lokalt nettverk
+ Name[nso]=Boinyakisi bja Kgokagano ya Selegae
+-Name[pa]=ਸਥਾਨਿਕ ਨੈੱਟਵਰਕ ਝਲਕਾਰਾ
++Name[pa]=ਲੋਕਲ ਨੈਟਵਰਕ ਝਲਕਾਰਾ
+ Name[pl]=PrzeglÄ…danie sieci lokalnej
+ Name[pt]=Navegação na Rede Local
+ Name[pt_BR]=Navegação em Rede Local
+@@ -173,6 +173,7 @@
+ Keywords[nds]=samba,smb,Windows,Nettwark
+ Keywords[nl]=samba,smb,windows,netwerk
+ Keywords[nn]=samba,smb,windows,nettverk
++Keywords[pa]=samba,smb,windows,ਨੈਟਵਰਕ
+ Keywords[pl]=samba,smb,windows,sieć
+ Keywords[pt]=samba,smb,windows,rede
+ Keywords[pt_BR]=samba,smb,windows,rede
+--- kcontrol/kio/proxy.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/proxy.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -40,7 +40,7 @@
+ Name[nb]=Mellomtjener
+ Name[nn]=Mellomtenar
+ Name[nso]=Moemalegato
+-Name[pa]=ਪਾਰਕਸੀ
++Name[pa]=ਪਰਾਕਸੀ
+ Name[pl]=Pośrednik (Proxy)
+ Name[ru]=Прокси
+ Name[sl]=Posrednik
+@@ -159,6 +159,7 @@
+ Keywords[nl]=proxy,proxy server,firewall,squid
+ Keywords[nn]=proxy,mellomtenar,brannmur,squid
+ Keywords[nso]=Moemalegato,Moabi wa moemalegato,Firewall,Squid,moemalegato
++Keywords[pa]=Proxy,Proxy server,Firewall,Squid,proxy,ਪਰਾਕਸੀ
+ Keywords[pl]=proxy,pośrednik,serwer pośredniczący,zapora ogniowa,Squid
+ Keywords[pt]=Proxy,Servidor proxy,Firewall,Squid,proxy
+ Keywords[pt_BR]=Proxy,Servidor Proxy,Firewall,Squid,proxy
+--- kcontrol/kio/useragent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/useragent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,7 +50,7 @@
+ Name[nl]=Browseridentificatie
+ Name[nn]=Nettlesaridentifikasjon
+ Name[nso]=Boitsibiso bja Seinyakisi
+-Name[pa]=ਝਲਕਾਰਾ ਪਸੰਦ
++Name[pa]=ਝਲਕਾਰਾ ਪਛਾਣ
+ Name[pl]=Identyfikacja przeglÄ…darki
+ Name[pt]=Identificação do Navegador
+ Name[pt_BR]=Identificação do Navegador
+--- kcontrol/kio/cache.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/cache.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -102,7 +102,7 @@
+ Comment[nl]=Hier kunt u de webcache instellen
+ Comment[nn]=Oppsett av vevmellomlager
+ Comment[nso]=Beakanya dipeakanyo tsa polokelo ya web
+-Comment[pa]=ਵੈੱਬ ਕੈਂਚੇ ਵਿਵਸਥਾ ਸੰਰਚਨਾ
++Comment[pa]=ਵੈੱਬ ਕੈਂਚੇ ਸੈਟਿੰਗ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja ustawień bufora (cache'a)
+ Comment[pt]=Configuração das opções da 'cache' da Web
+ Comment[pt_BR]=Configura as preferências de cache
+--- kcontrol/kio/uasproviders/mozoncurrent12.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/mozoncurrent12.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -33,7 +33,7 @@
+ Name[nds]=UA-Beschrieven (Mozilla 1.2.1 op dit Systeem)
+ Name[nl]=GA-beschrijving (Mozilla 1.2.1 op current)
+ Name[nn]=Brukaragent (Mozilla 1.2.1 på denne maskina)
+-Name[pa]=UAਵੇਰਵਾ (ਮੌਜੂਦਾ ਤੇ ਮੌਜੀਲਾ ੧.੨.੧)
++Name[pa]=UADescription (ਮੌਜੂਦਾ 'ਤੇ ਮੌਜੀਲਾ 1.2.1)
+ Name[pl]=Opis Programu Użytkownika (Mozilla 1.2.1 na aktualnym)
+ Name[pt]=UADescription (Mozilla 1.2.1 no sistema actual)
+ Name[pt_BR]=Descrição (Mozilla 1.2.1 no sistema atual)
+--- kcontrol/kio/uasproviders/ie45onwinnt5.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/ie45onwinnt5.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Name[nl]=GA-beschrijving (IE 4.5 op Win 2000)
+ Name[nn]=Brukaragent (IE 4.5 på Win 2000)
+ Name[nso]=UAThlaloso (IE 4.5 go Win 2000)
+-Name[pa]=UAਵੇਰਵਾ (ਵਿੰਡੋ ੨੦੦੦ ਤੇ IE 4.5)
++Name[pa]=UADescription (Win 2000 'ਤੇ IE 4.5)
+ Name[pl]=Opis Programu Użytkownika (IE 4.5 na Win 2000)
+ Name[pt]=UADescription (IE 4.5 no Win 2000)
+ Name[pt_BR]=Descrição (IE 4.5 no Win 2000)
+--- kcontrol/kio/uasproviders/ie55onwinnt5.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/ie55onwinnt5.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,7 +36,7 @@
+ Name[nl]=GA-beschrijving (IE 5.5 op Win 2000)
+ Name[nn]=Brukaragent (IE 5.5 på Win 2000)
+ Name[nso]=UAThlaloso (IE 5.5 go Win 2000)
+-Name[pa]=UAਵੇਰਵਾ (ਵਿੰਡੋ ੨੦੦੦ ਤੇ IE 5.5)
++Name[pa]=UADescription (Win 2000 'ਤੇ IE 5.5)
+ Name[pl]=Opis Programu Użytkownika (IE 5.5 na Win 2000)
+ Name[pt]=UADescription (IE 5.5 no Win 2000)
+ Name[pt_BR]=Descrição (IE 5.5 no Win 2000)
+--- kcontrol/kio/uasproviders/nn475oncurrent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/nn475oncurrent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,7 +35,7 @@
+ Name[nl]=GA-beschrijving (NN 4.76 op huidige)
+ Name[nn]=Brukaragent (NN 4.76 på denne)
+ Name[nso]=UAThlaloso (NN 4.76 go ya bjale)
+-Name[pa]=UAਵੇਰਵਾ (ਮੌਜੂਦਾ ਤੇ NN 4.76)
++Name[pa]=UADescription (ਮੌਜੂਦਾ 'ਤੇ NN 4.76)
+ Name[pl]=Opis Programu Użytkownika (NN 4.76 na bieżącym)
+ Name[pt]=UADescription (NN 4.76 no sistema actual)
+ Name[pt_BR]=Descrição (NN 4.76 no sistema atual)
+--- kcontrol/kio/uasproviders/mozoncurrent16.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/mozoncurrent16.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,7 +31,7 @@
+ Name[nds]=UA-Beschrieven (Mozilla 1.6 op dit Systeem)
+ Name[nl]=GA-beschrijving (Mozilla 1.6 op current)
+ Name[nn]=Brukaragent (Mozilla 1.6 på denne maskina)
+-Name[pa]=UAਵੇਰਵਾ (ਮੌਜੂਦਾ ਤੇ ਮੌਜੀਲਾ ੧.੬)
++Name[pa]=UADescription (ਮੌਜੂਦਾ 'ਤੇ ਮੌਜੀਲਾ 1.6)
+ Name[pl]=UADescription (Mozilla 1.6)
+ Name[pt]=UADescription (Mozilla 1.6 no sistem actual)
+ Name[pt_BR]=Descrição (Mozilla 1.6 no sistema atual)
+--- kcontrol/kio/uasproviders/nn476onppc.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/nn476onppc.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,7 +36,7 @@
+ Name[nl]=GA-beschrijving (NN op Mac PPC)
+ Name[nn]=Brukaragent (NN på Mac PPC)
+ Name[nso]=UAThlaloso (NN go Mac PPC)
+-Name[pa]=UAਵੇਰਵਾ (Mac PPCਾ ਤੇ N1)
++Name[pa]=UADescription (Mac PPC 'ਤੇ N1)
+ Name[pl]=Opis Programu Użytkownika (NN na Mac PPC)
+ Name[pt]=UADescription (NN no Mac PPC)
+ Name[pt_BR]=Descrição (NN no Mac PPC)
+--- kcontrol/kio/uasproviders/mozonwin2000.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/mozonwin2000.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -24,7 +24,7 @@
+ Name[nds]=User-Agent-Beschrieven (1.2.1 op Windows 2000)
+ Name[nl]=GA-beschrijving (1.2.1 op Windows 2000)
+ Name[nn]=Brukaragent (1.2.1 på Windows 2000)
+-Name[pa]=UADescription (Windows 2000 ਤੇ 1.2.1)
++Name[pa]=UADescription (Windows 2000 'ਤੇ 1.2.1)
+ Name[pl]=Opis Programu Użytkownika (1.2.1 na Windows 2000)
+ Name[pt]=UADescription (1.2.1 no Windows 2000)
+ Name[pt_BR]=Descrição (1.2.1 no Windows 2000)
+--- kcontrol/kio/uasproviders/ie401onwinnt4.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/ie401onwinnt4.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Name[nl]=GA-beschrijving (IE 4.01 op Win 2000)
+ Name[nn]=Brukaragent (IE 4.01 på Win 2000)
+ Name[nso]=UAThlaloso (IE 4.01 go Win 2000)
+-Name[pa]=UAਵੇਰਵਾ (ਵਿੰਡੋ ੨੦੦੦ ਤੇ IE 4.01 )
++Name[pa]=UADescription (Win 'ਤੇ IE 4.01 )
+ Name[pl]=Opis Programu Użytkownika (IE 4.01 na Win 2000)
+ Name[pt]=UADescription (IE 4.01 no Win 2000)
+ Name[pt_BR]=Descrição (IE 4.01 no Win 2000)
+--- kcontrol/kio/uasproviders/ie501onwinnt5.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/ie501onwinnt5.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,7 +36,7 @@
+ Name[nl]=GA-beschrijving (IE 5.01 op Win 2000)
+ Name[nn]=Brukaragent (IE 5.01 på Win 2000)
+ Name[nso]=UAThlaloso (IE 5.01 go Win 2000)
+-Name[pa]=UAਵੇਰਵਾ (ਵਿੰਡੋ ੨੦੦੦ ਤੇ IE 5.01)
++Name[pa]=UADescription (Win 2000 'ਤੇ IE 5.01)
+ Name[pl]=Opis Programu Użytkownika (IE 5.01 na Win 2000)
+ Name[pt]=UADescription (IE 5.01 no Win 2000)
+ Name[pt_BR]=Descrição (IE 5.01 no Win 2000)
+--- kcontrol/kio/uasproviders/ie60onwinnt51.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/ie60onwinnt51.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Name[nl]=GA-beschrijving (IE 6.0 op Win XP)
+ Name[nn]=Brukaragent (IE 6.0 på Win XP)
+ Name[nso]=UAThlaloso (IE 6.0 go Win XP)
+-Name[pa]=UAਵੇਰਵਾ (ਵਿੰਡੋ XP ਤੇ IE 6.0)
++Name[pa]=UADescription (Win XP 'ਤੇ IE 6.0)
+ Name[pl]=Opis Programu Użytkownika (IE 6.0 na Win XP)
+ Name[pt]=UADescription (IE 6.0 no Win XP)
+ Name[pt_BR]=Descrição (IE 6.0 no Win XP)
+--- kcontrol/kio/uasproviders/mozonwinxp.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/mozonwinxp.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -24,6 +24,7 @@
+ Name[nds]=User-Agent-Beschrieven (Mozilla 1.7 op Windows XP)
+ Name[nl]=GA-beschrijving (Mozilla 1.7 op Windows XP)
+ Name[nn]=Brukaragent (Mozilla 1.7 på Windows XP)
++Name[pa]=UADescription (Windows XP 'ਤੇ Mozilla 1.7)
+ Name[pl]=Opis Programu Użytkownika (Mozilla 1.7 na Windows XP)
+ Name[pt]=UADescription (Mozilla 1.7 no Windows XP)
+ Name[pt_BR]=Descrição (Mozilla 1.7 no Windows XP)
+--- kcontrol/kio/uasproviders/lynxoncurrent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/lynxoncurrent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -27,7 +27,7 @@
+ Name[nl]=GA-beschrijving (Lynx 2.8.3)
+ Name[nn]=Brukaragent (Lynx 2.8.3)
+ Name[nso]=UAThlaloso (Lynx 2.8.3)
+-Name[pa]=UAਵੇਰਵਾ (ਲੇਨਕਸ2.8.30)
++Name[pa]=UADescription (ਲੇਨਕਸ 2.8.3)
+ Name[pl]=Opis Programu Użytkownika (Lynx 2.8.3)
+ Name[pt_BR]=Descrição (Lynx 2.8.3)
+ Name[ro]=Descriere UA (Lynx 2.8.3)
+--- kcontrol/kio/uasproviders/nn301oncurrent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/nn301oncurrent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,7 +35,7 @@
+ Name[nl]=GA-beschrijving (NN 3.01 op huidige)
+ Name[nn]=Brukaragent (NN 3.01 på denne)
+ Name[nso]=UAThlaloso (NN 3.01 go ya bjale)
+-Name[pa]=UAਵੇਰਵਾ (ਮੌਜੂਦਾ ਤੇ NN 3.01)
++Name[pa]=UADescription (ਮੌਜੂਦਾ 'ਤੇ NN 3.01)
+ Name[pl]=Opis Programu Użytkownika (NN 3.01 na bieżącym)
+ Name[pt]=UADescription (NN 3.01 no sistema actual)
+ Name[pt_BR]=Descrição (NN 3.01 no sistema atual)
+--- kcontrol/kio/uasproviders/ie50onppc.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/ie50onppc.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,7 +36,7 @@
+ Name[nl]=GA-beschrijving (IE 5.0 op Mac PPC)
+ Name[nn]=Brukaragent (IE 5.0 på Mac PPC)
+ Name[nso]=UAThlaloso (IE 5.0 go Mac PPC)
+-Name[pa]=UAਵੇਰਵਾ (ਮੈਕ PPC ਤੇ IE 5.0)
++Name[pa]=UADescription (ਮੈਕ PPC 'ਤੇ IE 5.0)
+ Name[pl]=Opis Programu Użytkownika (IE 5.0 na Mac PPC)
+ Name[pt]=UADescription (IE 5.0 no Mac PPC)
+ Name[pt_BR]=Descrição (IE 5.0 no Mac PPC)
+--- kcontrol/kio/uasproviders/firefoxoncurrent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/firefoxoncurrent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -23,7 +23,7 @@
+ Name[nds]=User-Agent-Beschrieven (Firefox 1.0 op dit Systeem)
+ Name[nl]=GA-beschrijving (Firefox 1.0 op huidige)
+ Name[nn]=Brukaragent (Firefox 1.0 på denne)
+-Name[pa]=UADescription (ਮੌਜੂਦਾ Firefox 1.0)
++Name[pa]=UADescription (ਮੌਜੂਦਾ 'ਤੇ Firefox 1.0)
+ Name[pl]=Opis Programu Użytkownika (FireFox 1.0)
+ Name[pt]=UADescription (Firefox 1.0 no sistema actual)
+ Name[pt_BR]=Descrição (Firefox 3.01 no sistema atual)
+--- kcontrol/kio/uasproviders/ie60oncurrent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/ie60oncurrent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -22,7 +22,7 @@
+ Name[nds]=User-Agent-Beschrieven (IE 6.0 op dit Systeem)
+ Name[nl]=GA-beschrijving (IE 6.0 op huidige)
+ Name[nn]=Brukaragent (IE 6.0 på denne)
+-Name[pa]=UADescription (ਮੌਜੂਦਾ IE 6.0)
++Name[pa]=UADescription (ਮੌਜੂਦਾ 'ਤੇ IE 6.0)
+ Name[pl]=Opis Programu Użytkownika (IE 6.0)
+ Name[pt]=UADescription (IE 6.0 no sistema actual)
+ Name[pt_BR]=Descrição (IE 6.0 no sistema atual)
+--- kcontrol/kio/uasproviders/ie55onwin98.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/ie55onwin98.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,7 +36,7 @@
+ Name[nl]=GA-beschrijving (IE 5.5 op Win 98)
+ Name[nn]=Brukaragent (IE 5.5 på Win 98)
+ Name[nso]=UAThlaloso (IE 5.5 go Win 98)
+-Name[pa]=UAਵੇਰਵਾ (ਵਿੰਡੋ ੯੮ ਤੇ IE 5.5)
++Name[pa]=UADescription (Win 98 'ਤੇ IE 5.5)
+ Name[pl]=Opis Programu Użytkownika (IE 5.5 na Win 98)
+ Name[pt]=UADescription (IE 5.5 no Win 95)
+ Name[pt_BR]=Descrição (IE 5.5 no Win 98)
+--- kcontrol/kio/uasproviders/nn475onwin95.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/nn475onwin95.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,7 +36,7 @@
+ Name[nl]=GA-beschrijving (NN 4.76 op Windows 95)
+ Name[nn]=Brukaragent (NN 4.7 på Windows 95)
+ Name[nso]=UAThlaloso (NN4.7 go Windows 95)
+-Name[pa]=UAਵੇਰਵਾ (ਵਿੰਡੋ ੯੫ ਤੇ ਤੇ4.73.01)
++Name[pa]=UADescription (Windows 95 'ਤੇ NN4.73.01)
+ Name[pl]=Opis Programu Użytkownika (NN 4.7 na Windows 95)
+ Name[pt]=UADescription (NN 4.7 no Windows 95)
+ Name[pt_BR]=Descrição (NN 4.7 no Windows 95)
+--- kcontrol/kio/uasproviders/mozoncurrent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/mozoncurrent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -23,7 +23,7 @@
+ Name[nds]=User-Agent-Beschrieven (Mozilla 1.7 op dit Systeem)
+ Name[nl]=GA-beschrijving (Mozilla 1.7 op current)
+ Name[nn]=Brukaragent (Mozilla 1.7 på denne)
+-Name[pa]=UADescription (ਮੌਜੂਦਾ Mozilla 1.7)
++Name[pa]=UADescription (ਮੌਜੂਦਾ 'ਤੇ Mozilla 1.7)
+ Name[pl]=Opis Programu Użytkownika (Mozilla 1.7)
+ Name[pt]=UADescription (Mozilla 1.7 no sistema actual)
+ Name[pt_BR]=Descrição (Mozilla 1.7 no sistema atual)
+--- kcontrol/kio/uasproviders/safari.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/safari.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -24,7 +24,7 @@
+ Name[nds]=User-Agent-Beschrieven (Safari 1.2 op MacOS X)
+ Name[nl]=GA-beschrijving (Safari 1.2 op MacOS X)
+ Name[nn]=Brukaragent (Safari 1.2 på MacOS X)
+-Name[pa]=UAਵੇਰਵਾ (MacOS X ਤੇ Safari 1.2)
++Name[pa]=UADescription (MacOS X ਤੇ Safari 1.2)
+ Name[pl]=UADescription (Safari 1.2 na MacOS X)
+ Name[pt]=UADescription (Safari 1.2 no MacOS X)
+ Name[pt_BR]=Descrição (Safari 1.2 no MacOS X)
+--- kcontrol/kio/uasproviders/op403onwinnt4.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/op403onwinnt4.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Name[nl]=GA-beschrijving (Opera 4.03 op NT)
+ Name[nn]=Brukaragent (Opera 4.03 på NT)
+ Name[nso]=UAThlaloso (Opera 4.03 go NT)
+-Name[pa]=UAਵੇਰਵਾ (NT ਤੇ ਓਪਰਾ 4.03N)
++Name[pa]=UADescription (NT ਤੇ ਓਪਰਾ 4.03N)
+ Name[pl]=Opis Programu Użytkownika (Opera 4.03 na NT)
+ Name[pt]=UADescription (Opera 4.03 em NT)
+ Name[pt_BR]=Descrição (Opera 4.03 no NT)
+--- kcontrol/kio/uasproviders/w3moncurrent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/w3moncurrent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -27,7 +27,6 @@
+ Name[nl]=GA-beschrijving (w3m 0.1.9)
+ Name[nn]=Brukaragent (w3m 0.1.9)
+ Name[nso]=UAThlaloso (w3m 0.1.9)
+-Name[pa]=UAਵੇਰਵਾ (w3m 0.1.9)
+ Name[pl]=Opis Programu Użytkownika (w3m 0.1.9)
+ Name[pt_BR]=Descrição (w3m 0.1.9)
+ Name[ro]=Descriere UA (w3m 0.1.9)
+--- kcontrol/kio/uasproviders/wgetoncurrent.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasproviders/wgetoncurrent.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -27,7 +27,6 @@
+ Name[nl]=GA-beschrijving (Wget 1.5.3)
+ Name[nn]=Brukaragent (Wget 1.5.3)
+ Name[nso]=UAThlaloso (Wget 1.5.3)
+-Name[pa]=UAਵੇਰਵਾ (Wget 1.5.3)
+ Name[pl]=Opis Programu Użytkownika (Wget 1.5.3)
+ Name[pt_BR]=Descrição (Wget 1.5.3)
+ Name[ro]=Descriere UA (Wget 1.5.3)
+--- kcontrol/kio/smb.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/smb.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -180,6 +180,7 @@
+ Keywords[nl]=SMB,SAMBA,SMB-client,Windows-netwerk,LAN,netwerk,omgeving,neighborhood,server,broadcast,WINS,share,inloggen,login,aanmelden,wachtwoorden,netwerk
+ Keywords[nn]=SMB,SAMBA,SMB-klient,Windows-nettverk,LAN,nettverk,nabolag,grannelag,tenar,kringkasting,WINS,deling,innlogging,passord,ressurs
+ Keywords[nso]=SMB,SAMBA,Moreki wa SMB,Kgokagano ya di-Window,LAN,Kgokagano,boagisane,Moabi,Kgaso,WINS,Kabagano,Tseno,Mantsuphetiso
++Keywords[pa]=SMB,SAMBA,SMB ਕਲਾਂਇਟ,Windows ਨੈਟਵਰਕ,LAN,ਆਂਢ-ਗੁਆਂਢ,ਸਰਵਰ,Broadcast,WINS,Share,Login,Passwords
+ Keywords[pl]=SMB,SAMBA,klient SMB,sieć Windows,LAN,sieć lokalna,otoczenie sieciowe,serwer,rozgłoszenie,WINS,zasób,logowanie,hasła
+ Keywords[pt]=SMB,SAMBA,cliente SMB,rede Windows,Windows,LAN,rede,vizinhança de rede,servidor,difusão,WINS,partilha,login,senhas
+ Keywords[pt_BR]=SMB,SAMBA,cliente SMB,rede Windows,LAN,rede,vizinhança,ambiente de rede,servidor,difusão,WINS,Volume,compartilhamento,login,senhas
+--- kcontrol/kio/netpref.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/netpref.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,7 +41,7 @@
+ Comment[nl]=Instellen van algemene netwerkvoorkeuren, zoals tijdslimietwaarden
+ Comment[nn]=Oppsett av generelle nettverksinnstillingar, som til dømes tidsgrenser
+ Comment[nso]=Beakanya dikganyogo tsa kgokagano ya kakaretso, goswana le maboleng a phelelo ya nako
+-Comment[pa]=ਨੈੱਟਵਰਕ ਪਸੰਦ ਸੰਰਚਨਾ, ਜਿਵੇਂ ਸਮਾਂ-ਸੀਮਾ
++Comment[pa]=ਨੈਟਵਰਕ ਪਸੰਦ ਸੰਰਚਨਾ, ਜਿਵੇਂ ਸਮਾਂ-ਸੀਮਾ
+ Comment[pl]=Konfiguracja niskopoziomowych ustawień sieciowych np. limitu czasu
+ Comment[pt]=Configuração das opções gerais da rede, p.ex. tempos-limite
+ Comment[pt_BR]=Configurar preferências genéricas para rede tais como valores de tempo limite
+--- kcontrol/kio/uasprovider.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kio/uasprovider.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,7 +43,7 @@
+ Comment[nl]=regels voor Gebruikersagent
+ Comment[nn]=Brukaragentstrengar
+ Comment[nso]=Methalofoko ya Mothusi wa Modirisi
+-Comment[pa]=ਉਪਭੋਗਤਾ-ਏਜੰਟ ਸਤਰਾਂ
++Comment[pa]=ਉਪਭੋਗੀ-ਏਜੰਟ ਸਤਰਾਂ
+ Comment[pl]=Nazwy "Programu Użytkownika"
+ Comment[pt]=Mensagens do agente do utilizador
+ Comment[pt_BR]=Strings de Agente de Usuários
+--- kcontrol/samba/smbstatus.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/samba/smbstatus.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -55,7 +55,7 @@
+ Name[nn]=Samba-status
+ Name[nso]=Boemo bja Samba
+ Name[oc]=Estat de Samba
+-Name[pa]=ਸਾਂਬਾ ਸਥਿਤੀ
++Name[pa]=ਸਾਂਬਾ ਹਾਲਤ
+ Name[pt]=Samba
+ Name[pt_BR]=Estado do Samba
+ Name[ro]=Stare Samba
+@@ -124,7 +124,7 @@
+ Comment[nn]=Overvaking av Samba-status
+ Comment[nso]=Mohlokomedi wa boemo bja Samba
+ Comment[oc]=Monitor de l'estat de Samba
+-Comment[pa]=ਸਾਂਬਾ ਸਥਿਤੀ ਜਾਂਚਕਾਰ
++Comment[pa]=ਸਾਂਬਾ ਹਾਲਤ ਨਿਗਰਾਨ
+ Comment[pl]=Monitor stanu Samby
+ Comment[pt]=Monitor do estado do Samba
+ Comment[pt_BR]=Monitor de estado do Samba
+--- kcontrol/view1394/kcmview1394.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/view1394/kcmview1394.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -160,6 +160,7 @@
+ Keywords[nds]=1394,Firewire,Reedschapen, Kieker Kuntrull
+ Keywords[nl]=1394,IEEE 1394,firewire,devices,viewer,control,weergaveprogramma,apparaten,randapparatuur
+ Keywords[nn]=1394,Firewire,einingar,framvisar,kontroll
++Keywords[pa]=1394,Firewire,ਜੰਤਰ,ਦਰਸ਼ਕ,ਕੰਟਰੋਲ
+ Keywords[pl]=1394,Firewire,urzÄ…dzenia,przeglÄ…danie,kontrola
+ Keywords[pt]=1394,Firewire,dispositivos,visualizador,controlo
+ Keywords[pt_BR]=1394,Firewire,dispositivos,visualizador,controle
+--- kcontrol/konqhtml/khtml_java_js.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/konqhtml/khtml_java_js.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -42,7 +42,7 @@
+ Name[nl]=Java en JavaScript
+ Name[nn]=Java og JavaScript
+ Name[nso]=Java & Setlankana sa Java
+-Name[pa]=Java ਤੇ ਜਾਵਾ ਸਕ੍ਰਿਪਟ
++Name[pa]=Java ਅਤੇ ਜਾਵਾ ਸਕ੍ਰਿਪਟ
+ Name[pl]=Java i JavaScript
+ Name[pt]=Java e JavaScript
+ Name[ro]=Java ÅŸi JavaScript
+@@ -99,7 +99,7 @@
+ Comment[nl]=Hier kunt u het gedrag van Java en JavaScript instellen
+ Comment[nn]=Innstillingar for Java og JavaScript
+ Comment[nso]=Beakanya maitshwaro a Java le setlankana sa Java
+-Comment[pa]=Java ਤੇ ਜਾਵਾ-ਸਕ੍ਰਿਪਟ ਦੇ ਵਿਵਹਾਰ ਦੀ ਸੰਰਚਨਾ
++Comment[pa]=Java ਅਤੇ ਜਾਵਾ-ਸਕ੍ਰਿਪਟ ਦੇ ਵਿਵਹਾਰ ਦੀ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja działania Javy i JavaScriptu
+ Comment[pt]=Configurar o comportamento do Java e do JavaScript
+ Comment[pt_BR]=Configura o comportamento do Java e JavaScript
+--- kcontrol/konqhtml/khtml_fonts.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/konqhtml/khtml_fonts.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -116,7 +116,7 @@
+ Comment[nl]=Hier kunt u de lettertypen die op webpagina's gebruikt worden instellen
+ Comment[nn]=Oppsett av skrifter for nettsider
+ Comment[nso]=Beakanya difonto tseo di somiswago go matlakala a web
+-Comment[pa]=ਵੈੱਬ ਸਫੇ ਤੇ ਫੋਂਟ ਸੰਰਚਨਾ
++Comment[pa]=ਵੈੱਬ ਸਫੇ 'ਤੇ ਫੋਂਟ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja czcionek na stronach internetowych
+ Comment[pt]=Configurar os tipos de letra usados nas páginas Web
+ Comment[pt_BR]=Configura as fontes usadas em páginas da web
+--- kcontrol/performance/kcmperformance.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/performance/kcmperformance.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -47,7 +47,7 @@
+ Name[nds]=KDE-Leisten
+ Name[nl]=KDE-prestaties
+ Name[nn]=KDE-yting
+-Name[pa]=KDE ਕਾਰਜਕੁਸ਼ਤਾ
++Name[pa]=KDE ਸਮਰੱਥਾ
+ Name[pl]=Wydajność KDE
+ Name[pt]=Performance do KDE
+ Name[pt_BR]=Performance do KDE
+@@ -106,7 +106,7 @@
+ Comment[nds]=Mit disse Instellen kannst Du de Leisten vun KDE verbetern
+ Comment[nl]=Hier kunt u instellingen kiezen die de prestaties van KDE kunnen verbeteren
+ Comment[nn]=Innstillingar som kan forbetra ytinga til KDE
+-Comment[pa]=ਵਿਵਸਥਾ ਦੀ ਸੰਰਚਨਾ, ਜੋ ਕਿ KDE ਦੀ ਕਾਰਜਕੁਸ਼ਤਾ ਨੂੰ ਵਧਾ ਸਕਦੀ ਹੈ
++Comment[pa]=ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ, ਜੋ ਕਿ KDE ਦੀ ਕਾਰਜਕੁਸ਼ਤਾ ਨੂੰ ਵਧਾ ਸਕਦੀ ਹੈ
+ Comment[pl]=Konfiguracja ustawień, które mogą mieć wpływ na wydajność KDE
+ Comment[pt]=Configura as opções que podem aumentar a performance do KDE
+ Comment[pt_BR]=Configurações que podem aumentar a performance do KDE
+@@ -158,6 +158,7 @@
+ Keywords[nds]=performance,Snelligkeit,Spieker,verbetern
+ Keywords[nl]=snelheid,prestaties,geheugen,verbeteren
+ Keywords[nn]=yting,fart,minne,forbetra
++Keywords[pa]=performance,speed,memory,improve,ਗਤੀ,ਮੈਮੋਰੀ
+ Keywords[pl]=wydajność,szybkość,pamięć,polepszenie
+ Keywords[pt]=performance,velocidade,memória,melhorar
+ Keywords[pt_BR]=performance,velocidade,memória,aumento
+--- kcontrol/performance/kcmkonqyperformance.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/performance/kcmkonqyperformance.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -104,7 +104,7 @@
+ Comment[nds]=Mit disse Instellen kannst Du de Leisten vun Konqueror verbetern
+ Comment[nl]=Hier kunt u instellingen kiezen die de prestaties van Konqueror verbeteren
+ Comment[nn]=Innstillingar som kan forbetra ytinga til Konqueror
+-Comment[pa]=ਵਿਵਸਥਾ ਦੀ ਸੰਰਚਨਾ ਕਰੋ, ਜੋ ਕਿ ਕੋਨਕਿਉਰੋਰ ਦਾ ਕਾਰਜਕੁਸ਼ਤਾ ਵਧਾ ਸਕਦੀ ਹੈ।
++Comment[pa]=ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਕਰੋ, ਜੋ ਕਿ ਕੋਨਕਿਉਰੋਰ ਦਾ ਕਾਰਜਕੁਸ਼ਤਾ ਵਧਾ ਸਕਦੀ ਹੈ।
+ Comment[pl]=Konfiguracja ustawień Konquerora mających wpływ na wydajność
+ Comment[pt]=Configuração das opções que podem aumentar a performance do Konqueror
+ Comment[pt_BR]=Configurações que podem aumentar a performance do Konqueror
+--- kcontrol/xinerama/xinerama.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/xinerama/xinerama.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -149,6 +149,7 @@
+ Keywords[nb]=Xinerama,to skjermer,flere skjermer,skjerm,monitor
+ Keywords[nl]=Xinerama,dual head,multihead,monitor,beeldscherm
+ Keywords[nn]=Xinerama,to skjermar,fleire skjermar,skjerm,monitor
++Keywords[pa]=Xinerama,dual head,multihead,ਮਾਨੀਟਰ
+ Keywords[pl]=Xinerama,dwa monitory,wiele monitorów,monitor
+ Keywords[pt]=xinerama,vários monitores,multihead,monitor
+ Keywords[pt_BR]=Xinerama,monitores,multihead,monitor
+--- kcontrol/randr/krandrtray.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/randr/krandrtray.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -29,7 +29,7 @@
+ GenericName[nb]=Endre skjermstørrelsen og rotere
+ GenericName[nl]=Scherm roteren en grootte wijzigen
+ GenericName[nn]=Endra skjermstorleik og roter skjermen
+-GenericName[pa]=ਪਰਦਾ ਮੁੜ ਆਕਾਰ ਤੇ ਘੁੰਮਾਓ
++GenericName[pa]=ਪਰਦਾ ਮੁੜ ਆਕਾਰ ਅਤੇ ਘੁੰਮਾਓ
+ GenericName[pl]=Obrót i zmiana rozmiaru ekranu
+ GenericName[pt]=Mudar o Tamanho e Rodar o Ecrã
+ GenericName[pt_BR]=Redimensionar Tela & Rotacionar
+@@ -79,7 +79,7 @@
+ Comment[nds]=En Lüttprogramm för dat Paneel, dat de Grött un de Utrichten vun den X-Schirm ännern kann.
+ Comment[nl]=Een paneelapplet waarmee u de resolutie en beeldrichting van uw bureaublad kunt wijzigen.
+ Comment[nn]=Ein panelapplet for endring av skjermstorleiken og rotering av skjermen
+-Comment[pa]=ਇੱਕ ਪੈਨਲ ਐਪਲਿਟ, ਜੋ ਕਿ X ਪਰਦੇ ਨੂੰ ਮੁੜ ਆਕਾਰ ਤੇ ਘੁੰਮਾ ਸਕਦਾ ਹੈ
++Comment[pa]=ਇੱਕ ਪੈਨਲ ਐਪਲਿਟ, ਜੋ ਕਿ X ਪਰਦੇ ਨੂੰ ਮੁੜ ਆਕਾਰ ਅਤੇ ਘੁੰਮਾ ਸਕਦਾ ਹੈ
+ Comment[pl]=Panel apletu do zmiany rozmiaru i orientacji ekranów serwera X.
+ Comment[pt]=Uma 'applet' do painel para redimensionar e reorientar os ecrãs de X.
+ Comment[pt_BR]=Mini-aplicativo de painel para redimensionamento e reorientação de telas do X.
+--- kcontrol/konsole/kcmkonsole.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/konsole/kcmkonsole.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,7 +31,7 @@
+ Name[mn]=Консол
+ Name[nb]=Konsoll
+ Name[nn]=Konsoll
+-Name[pa]=ਕੇਸੋਲ
++Name[pa]=ਕੰਸੋਲ
+ Name[pl]=Konsola
+ Name[ro]=Consolă
+ Name[ru]=Консоль
+--- kcontrol/keys/unix3.kksrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/keys/unix3.kksrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -24,6 +24,7 @@
+ Name[nl]=UNIX-schema
+ Name[nn]=UNIX-oppsett
+ Name[nso]=Leano la UNIX
++Name[pa]=UNIX ਸਕੀਮ
+ Name[pl]=Motyw Uniksa
+ Name[pt]=Esquema do UNIX
+ Name[pt_BR]=Esquema do UNIX
+@@ -38,6 +39,7 @@
+ Name[ven]=Tshikimu tsha UNIX
+ Name[vi]=Phối hợp của Unix
+ Name[xh]=Udweliso lwe UNIX
++Name[zh_CN]=Unix 方案
+ Name[zh_TW]=UNIX 按鍵配置
+ Name[zu]=iplani le-UNIX
+ Uses Win Modifier=false
+--- kcontrol/keys/wm3.kksrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/keys/wm3.kksrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -17,6 +17,7 @@
+ Name[nb]=WindowMaker (3 modifikatortaster)
+ Name[nl]=WindowMaker (3 modificatietoetsen)
+ Name[nn]=WindowMaker (tre modifikatortastar)
++Name[pa]=WindowMaker (3 ਸੋਧਕ ਸਵਿੱਚਾਂ ਨਾਲ)
+ Name[pl]=WindowMaker (3 klawisze modyfikatorów)
+ Name[pt]=WindowMaker (3 Teclas Modificadoras)
+ Name[pt_BR]=WindowMaker (3 teclas modificadoras)
+@@ -28,6 +29,7 @@
+ Name[sr at Latn]=WindowMaker (3 modifikatorska tastera)
+ Name[sv]=Windowmaker (3 väljartangenter)
+ Name[uk]=WindowMaker (3 модифікатори)
++Name[zh_CN]=WindowMaker (三个修饰键)
+ 
+ [Global Shortcuts]
+ Desktop Screenshot=Ctrl+Print
+--- kcontrol/keys/win3.kksrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/keys/win3.kksrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -23,6 +23,7 @@
+ Name[nl]=Windows-schema (zonder Win-toets)
+ Name[nn]=Windows-oppsett (utan Windows-tast)
+ Name[nso]=Leano la Window (Kantle le Senotlelo sa Phenyo)
++Name[pa]=Windows ਸਕੀਮ (ਬਿਨਾਂ Win ਸਵਿੱਚ)
+ Name[pl]=Motyw Windows (bez klawisza Win)
+ Name[pt]=Esquema do Windows (Sem Tecla Win)
+ Name[pt_BR]=Esquema Windows (sem a tecla Win)
+@@ -37,6 +38,7 @@
+ Name[ven]=Tshikimu tsha dziWindo (isina Meta/Win-Key)
+ Name[vi]=Phối hợp của Windows (không có phím Win)
+ Name[xh]=Window Yodweliso (Ngaphandle kwe Win key)
++Name[zh_CN]=Windows 方案(无 Win 键)
+ Name[zh_TW]=Windows 按鍵配置 (無 Win 鍵)
+ Name[zu]=Iplani lama-Window (Ngaphandle kukakhiye we-Win)
+ Uses Win Modifier=false
+--- kcontrol/keys/win4.kksrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/keys/win4.kksrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -23,6 +23,7 @@
+ Name[nl]=Windows-schema (met Win-toets)
+ Name[nn]=Windows-oppsett (med Windows-tast)
+ Name[nso]=Leano la Window (Le Senotlelo sa Phenyo)
++Name[pa]=Windows ਸਕੀਮ (Win ਸਵਿੱਚ ਨਾਲ)
+ Name[pl]=Motyw Windows (z klawiszem Win)
+ Name[pt]=Esquema do Windows (Sem Tecla Win)
+ Name[pt_BR]=Esquema Windows (com a tecla Win)
+@@ -37,6 +38,7 @@
+ Name[ven]=TShikimu tsha dziwindo (irena Meta/Win-Key)
+ Name[vi]=Phối hợp của Windows (có phím Win)
+ Name[xh]=Windows Ezingagqibekanga (Nge Win-key)
++Name[zh_CN]=Windows 方案(有 Win 键)
+ Name[zh_TW]=Windows 按鍵配置 (有 Win 鍵)
+ Name[zu]=Iplani lama-Window (Kukhona ukhiye we-Win)
+ Uses Win Modifier=true
+--- kcontrol/keys/mac4.kksrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/keys/mac4.kksrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -25,6 +25,7 @@
+ Name[nl]=Mac-schema
+ Name[nn]=Mac-oppsett
+ Name[nso]=Leano la Mac
++Name[pa]=Mac ਸਕੀਮ
+ Name[pl]=Motyw Mac-a
+ Name[pt]=Esquema do Mac
+ Name[pt_BR]=Esquema do Mac
+@@ -39,6 +40,7 @@
+ Name[ven]=Tshikimu tsha Mac
+ Name[vi]=Phối hợp của Mac
+ Name[xh]=Udweliso lwe Mac
++Name[zh_CN]=Mac 方案
+ Name[zh_TW]=Mac 按鍵配置
+ Name[zu]=Iplani le-Mac
+ Uses Win Modifier=true
+--- kcontrol/keys/kde3.kksrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/keys/kde3.kksrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -20,6 +20,7 @@
+ Name[nl]=KDE-standaard voor 3 modificatietoetsen
+ Name[nn]=KDE-standard med tre modifikatortastar
+ Name[nso]=Thuso ya Tshoganetso ya KDE ya Dinotlelo tse 3 tsa Kaonafatso
++Name[pa]=3 ਸੋਧਕ ਸਵਿੱਚਾਂ ਲਈ KDE ਮੂਲ
+ Name[pl]=Ustawienia domyślne KDE dla 3 klawiszy modyfikatorów
+ Name[pt]=Predefinição do KDE para 3 Teclas Modificadoras
+ Name[pt_BR]=Padrão do KDE para 3 Teclas Modificadoras
+--- kcontrol/keys/kde4.kksrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/keys/kde4.kksrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -20,6 +20,7 @@
+ Name[nl]=KDE-standaard voor 4 modificatietoetsen
+ Name[nn]=KDE-standard med fire modifikatortastar
+ Name[nso]=Thuso ya Tshoganetso ya KDE ya Dinotlelo tse 4 tsa Kaonafatso
++Name[pa]=4 ਸੋਧਕ ਸਵਿੱਚਾਂ ਲਈ KDE ਮੂਲ
+ Name[pl]=Ustawienia domyślne KDE dla 4 klawiszy modyfikatorów
+ Name[pt]=Predefinição do KDE para 4 Teclas Modificadoras
+ Name[pt_BR]=Padrão do KDE para 4 Teclas Modificadoras
+--- kcontrol/kdm/kdm.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kcontrol/kdm/kdm.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -57,7 +57,7 @@
+ Name[nn]=Innloggingshandsamar
+ Name[nso]=Molaodi wa Tseno
+ Name[oc]=Gestionari de connexion
+-Name[pa]=ਲਾਗ ਪ੍ਰਬੰਧਕ
++Name[pa]=ਲਾਗਿੰਨ ਮੈਨੇਜਰ
+ Name[pl]=Menedżer logowania
+ Name[pt]=Gestor de Autenticação
+ Name[pt_BR]=Gerenciador de Login
+@@ -123,7 +123,7 @@
+ Comment[nl]=Hier kunt u het aanmeldscherm (KDM) instellen
+ Comment[nn]=Set opp innloggingshandsamaren (KDM)
+ Comment[nso]=Beakanya molaodoi wa tseno (KDM)
+-Comment[pa]=ਲਾਗਆਨ ਪ੍ਰਬੰਧਕ ਸੰਰਚਨਾ(KDM)
++Comment[pa]=ਲਾਗਿੰਨ ਮੈਨੇਜਰ ਸੰਰਚਨਾ(KDM)
+ Comment[pl]=Konfiguracja menedżera logowania (KDM)
+ Comment[pt]=Configuração do gestor de autenticação (KDM)
+ Comment[pt_BR]=Configura o gerenciador de login (KDM)
+@@ -185,6 +185,7 @@
+ Keywords[nl]=kdm,display manager,xdm,users,login,begroeting,inloggen,gebruikers,loginbeheerder,logo,stijlen,taal,language,country,land,fonts,lettertypen,achtergrond,wallpapers,behang,sessies,shutdown,restart,afsluiten,herstarten,aanmelden,opstarten
+ Keywords[nn]=kdm,xdm,brukarar,innlogging,helsing,logo,stil,språk,land,skrifttypar,bakgrunn,bakgrunnsbilete,økt,avslutt,slå av,omstart
+ Keywords[nso]=kdm,molaodi wa pontsho,xdm,badirisi,tseno,madume,Logo,mekgwa,leleme,naga,difonto,bokamorago,di-wallpaper,ditiragalo,timo,thomaleswa
++Keywords[pa]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,ਮੁੜ-ਚਾਲੂ, ਭਾਸ਼ਾ,ਦੇਸ਼,ਫੋਂਟ,ਲਾਗਿੰਨ,ਉਪਭੋਗੀ,ਮੈਨੇਜਰ,ਸ਼ੈਲੀ
+ Keywords[pl]=kdm,menedżer ekranu,xdm,użytkownicy,logowanie,powitanie,Logo,style,jezyk,kraj,czcionki,tło,tapety,sesje,zamknięcie systemu,restart,rozpoczęcie pracy
+ Keywords[pt]=kdm,gestor de 'logins',xdm,utilizadores,saudação,logotipo,estilos,língua,país,tipos de letra,fundo,papéis de parede,sessões,terminar,reiniciar
+ Keywords[pt_BR]=kdm,gerenciador de tela, xdm,usuários,login,saudação,Logo,estilos,linguagem,país,fontes, papéis de parede,sessões,desligar,reiniciar
+--- pics/wallpapers/kde_passion.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/kde_passion.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,5 +37,6 @@
+ Name[tg]=Ниҳоии KDE
+ Name[tr]=KDE Tutkusu
+ Name[uk]=Бажання KDE
++Name[zh_CN]=KDE è¿·å¹»
+ ImageType=pixmap
+ Author=Benjamin Keating
+--- pics/wallpapers/Planning-And-Probing-1.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/Planning-And-Probing-1.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,5 +37,6 @@
+ Name[tg]=Банақшагирӣ ва истифодабарӣ
+ Name[tr]=Planlanama Ve Araştırma
+ Name[uk]=Планування та дослідження
++Name[zh_CN]=寻迹
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+--- pics/wallpapers/Marble01.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/Marble01.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -49,6 +49,7 @@
+ Name[uk]=Мармур
+ Name[ven]=Mavhula
+ Name[xh]=Ibhastile
++Name[zh_CN]=大理石
+ ImageType=pixmap
+ 
+ 
+--- pics/wallpapers/gear-flowers.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/gear-flowers.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -33,6 +33,6 @@
+ Name[ta]=கியர் பூக்கள்
+ Name[tg]=Ранги шашак
+ Name[uk]=Квіти-шестерні
+-Name[zh_CN]=齿轮花
++Name[zh_CN]=齿轮花(SVG)
+ Author=Alex Rostovtsev
+ ImageType=scalable
+--- pics/wallpapers/kde_box.png.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/kde_box.png.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -42,5 +42,6 @@
+ Name[tg]=Қуттии KDE
+ Name[tr]=KDE Kutusu
+ Name[uk]=Скринька KDE
++Name[zh_CN]=KDE 之盒
+ ImageType=pixmap
+ Author=Francesco Hermanitosverdes
+--- pics/wallpapers/triplegears.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/triplegears.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,5 +41,6 @@
+ Name[tg]=Шашаки сегона
+ Name[tr]=Üçlü Çarklar
+ Name[uk]=Потрийні шестерні
++Name[zh_CN]=三向齿轮
+ ImageType=pixmap
+ Author=Jörg Gastner
+--- pics/wallpapers/Foggy1.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/Foggy1.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -39,6 +39,7 @@
+ Name[tg]=Дуди сафед
+ Name[tr]=Sisli
+ Name[uk]=Туман
++Name[zh_CN]=雾蒙蒙
+ ImageType=pixmap
+ 
+ 
+--- pics/wallpapers/fulmine.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/fulmine.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -25,5 +25,6 @@
+ Name[tg]=Раъд
+ Name[tr]=Yıldırım
+ Name[uk]=Блискавка
++Name[zh_CN]=电闪
+ ImageType=pixmap
+ Author=Andrea Rizzi
+--- pics/wallpapers/globe.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/globe.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,5 +31,6 @@
+ Name[sv]=Klot med kuggar
+ Name[tg]=Замин дар шашак
+ Name[uk]=Земна куля в шестерні
++Name[zh_CN]=全球动力(SVG)
+ Author=Jakob Kohl
+ ImageType=scalable
+--- pics/wallpapers/aurora.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/aurora.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -17,5 +17,6 @@
+ Name[ta]=அரோரா
+ Name[tg]=Аврора
+ Name[uk]=Аврора
++Name[zh_CN]=夜思(SVG)
+ Author=Raoul Duke
+ ImageType=scalable
+--- pics/wallpapers/No-Ones-Laughing-3.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/No-Ones-Laughing-3.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -39,5 +39,6 @@
+ Name[tg]=Ягон нахандида истодааст
+ Name[tr]=Kimse Gülmüyor
+ Name[uk]=Ніхто не сміється
++Name[zh_CN]=丝滑
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+--- pics/wallpapers/Won-Ton-Soup-3.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/Won-Ton-Soup-3.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -38,5 +38,6 @@
+ Name[tg]=Вон-Тон-Суп
+ Name[tr]=Won Ton Çorbası
+ Name[uk]=Он той суп
++Name[zh_CN]=曼舞
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+--- pics/wallpapers/Chicken-Songs-2.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/Chicken-Songs-2.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,6 +37,7 @@
+ Name[tg]=Садои чӯҹаҳо
+ Name[tr]=Tavuk Şarkısı
+ Name[uk]=Співи курчат
++Name[zh_CN]=水渍
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+ 
+--- pics/wallpapers/blue-bend.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/blue-bend.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -42,5 +42,6 @@
+ Name[tg]=Омезиши кабуд
+ Name[tr]=Mavi Harman
+ Name[uk]=Синя суміш
++Name[zh_CN]=蓝蓝的梦
+ ImageType=pixmap
+ Author=Everaldo Coelho
+--- pics/wallpapers/andes-venezolanos.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/andes-venezolanos.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -20,5 +20,6 @@
+ Name[sr at Latn]=Andos Venecolanos
+ Name[sv]=Anderna i Venezuela
+ Name[uk]=Анди Венесуели
++Name[zh_CN]=飘逸(SVG)
+ Author=Xavier Araque Arguello
+ ImageType=scalable
+--- pics/wallpapers/lineart.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/lineart.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,6 +31,6 @@
+ Name[sv]=Logotyp med streckteckning
+ Name[tg]=Логотипи графикӣ
+ Name[uk]=Графічний логотип
+-Name[zh_CN]=线条族
++Name[zh_CN]=线条族(SVG)
+ Author=Jan-Victor Krille
+ ImageType=scalable
+--- pics/wallpapers/Island-of-Elba.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/Island-of-Elba.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,6 +43,7 @@
+ Name[tg]=Ҹазираи Элба
+ Name[tr]=Elba Adası
+ Name[uk]=Остров Ельба
++Name[zh_CN]=夕阳西下
+ ImageType=pixmap
+ Author=Andrea Rizzi
+ 
+--- pics/wallpapers/moon.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/moon.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,6 +41,6 @@
+ Name[ta]=நிலா
+ Name[tg]=Моҳ
+ Name[uk]=Місяць
+-Name[zh_CN]=月亮
++Name[zh_CN]=月亮(SVG)
+ Author=Chris Tooley
+ ImageType=scalable
+--- pics/wallpapers/Blkmarble.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/Blkmarble.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -40,5 +40,6 @@
+ Name[tg]=Сафоли сиёҳ
+ Name[tr]=Siyah Misket
+ Name[uk]=Чорний мармур
++Name[zh_CN]=黑色大理石
+ ImageType=pixmap
+ 
+--- pics/wallpapers/Circuit.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/Circuit.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -33,6 +33,7 @@
+ Name[ta]=வட்டம்
+ Name[tr]=Çember
+ Name[uk]=Електричне коло
++Name[zh_CN]=电路图
+ ImageType=pixmap
+ 
+ 
+--- pics/wallpapers/seaofconero.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/seaofconero.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,5 +43,6 @@
+ Name[tg]=Баҳри Конеро
+ Name[tr]=Conero Denizi
+ Name[uk]=Море поблизу Конеро
++Name[zh_CN]=海天一线
+ ImageType=pixmap
+ Author=Andrea Rizzi
+--- pics/wallpapers/here-gear.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/here-gear.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -29,5 +29,6 @@
+ Name[sr]=Ми смо зупчаник
+ Name[sr at Latn]=Mi smo zupčanik
+ Name[sv]=Vi är kuggar
++Name[zh_CN]=齿轮在此(SVG)
+ Author=Tony
+ ImageType=scalable
+--- pics/wallpapers/celtic.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/celtic.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -32,5 +32,6 @@
+ Name[sv]=Keltiskt
+ Name[tg]=Келтӣ
+ Name[uk]=Кельтський
++Name[zh_CN]=静谧(SVG)
+ Author=Mark Ger
+ ImageType=scalable
+--- pics/wallpapers/All-Good-People-1.jpg.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/All-Good-People-1.jpg.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,5 +37,6 @@
+ Name[tg]=Ҳамаи одамони хуб
+ Name[tr]=Tüm İyi İnsanlar
+ Name[uk]=Всі люди браття
++Name[zh_CN]=烟锁重楼
+ ImageType=pixmap
+ 
+--- pics/wallpapers/konqui.svgz.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ pics/wallpapers/konqui.svgz.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -10,5 +10,6 @@
+ Name[sr at Latn]=Konki
+ Name[tg]=Конкви
+ Name[uk]=Конкві
++Name[zh_CN]=Konqui(SVG)
+ Author=Pedro Carbajal
+ ImageType=scalable
+--- khelpcenter/plugins/konqplugins.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/konqplugins.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -40,7 +40,7 @@
+ Name[nl]=Konqueror-plugins
+ Name[nn]=Konqueror-programtillegg
+ Name[nso]=Ditsenyo tsa Konqueror
+-Name[pa]=ਕੋਨਕਿਉਰੋਰ ਪਲੱਗਇਨ
++Name[pa]=ਕੋਨਕਿਉਰੋਰ ਪਲੱਗਿੰਨ
+ Name[pl]=Wtyczki Konquerora
+ Name[pt]='Plugins' do Konqueror
+ Name[pt_BR]=Plug-Ins do Konqueror
+--- khelpcenter/plugins/links.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/links.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,7 +35,7 @@
+ Name[nds]=KDE in't Nett
+ Name[nl]=KDE op het internet
+ Name[nn]=KDE på verdsveven
+-Name[pa]=ਵੈੱਬ ਤੇ KDE
++Name[pa]=ਵੈਬ 'ਤੇ KDE
+ Name[pl]=KDE w sieci
+ Name[pt]=O KDE na Web
+ Name[pt_BR]=KDE na Web
+--- khelpcenter/plugins/Manpages/man1.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man1.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -33,7 +33,7 @@
+ Name[nds]=(1) Brukerbefehlen
+ Name[nl]=(1) Gebruikercommando's
+ Name[nn]=(1) Brukarkommandoar
+-Name[pa]=(੧) ਉਪਭੋਗਤਾ ਕਮਾਂਡ
++Name[pa]=(1) ਉਪਭੋਗੀ ਕਮਾਂਡ
+ Name[pl]=(1) Polecenia użytkownika
+ Name[pt]=(1) Comandos do Utilizador
+ Name[pt_BR]=(1) Comandos do Usuário
+--- khelpcenter/plugins/Manpages/man2.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man2.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -33,7 +33,7 @@
+ Name[nds]=(2) Systeemoprööp
+ Name[nl]=(2) Systeemaanroepen
+ Name[nn]=(2) Systemkall
+-Name[pa]=(੨) ਸਿਸਟਮ ਕਾਲਾਂ
++Name[pa]=(2) ਸਿਸਟਮ ਕਾਲਾਂ
+ Name[pl]=(2) Funkcje systemowe
+ Name[pt]=(2) Chamadas do Sistema
+ Name[pt_BR]=(2) Chamadas de Sistema 
+--- khelpcenter/plugins/Manpages/man3.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man3.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Name[nds]=(3) Subroutinen
+ Name[nn]=(3) Subrutinar
+ Name[nso]=(3) Ditsejana
+-Name[pa]=(੩) ਸਬ-ਰੂਟੀਨ
++Name[pa]=(3) ਸਬ-ਰੂਟੀਨ
+ Name[pl]=(3) Podprogramy
+ Name[pt]=(3) Sub-rotinas
+ Name[pt_BR]=(3) Subrotinas
+--- khelpcenter/plugins/Manpages/man4.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man4.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -40,7 +40,7 @@
+ Name[nl]=(4) Apparaten
+ Name[nn]=(4) Einingar
+ Name[nso]=(4) Maano
+-Name[pa]=(੪) ਜੰਤਰ
++Name[pa]=(4) ਜੰਤਰ
+ Name[pl]=(4) UrzÄ…dzenia
+ Name[pt]=(4) Dispositivos
+ Name[pt_BR]=(4) Dispositivos
+--- khelpcenter/plugins/Manpages/man5.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man5.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -40,7 +40,7 @@
+ Name[nl]=(5) Bestandsformaten
+ Name[nn]=(5) Filformat
+ Name[nso]=(5) Dithlolego tsa Faele
+-Name[pa]=(੫) ਫਾਇਲ ਫਾਰਮਿਟ
++Name[pa]=(5) ਫਾਇਲ ਫਾਰਮਿਟ
+ Name[pl]=(5) Formaty plików
+ Name[pt]=(5) Formatos de Ficheiros
+ Name[pt_BR]=(5) Formatos de Arquivo
+--- khelpcenter/plugins/Manpages/man6.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man6.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,7 +41,7 @@
+ Name[nl]=(6) Spelletjes
+ Name[nn]=(6) Spel
+ Name[nso]=(6) Dipapadi
+-Name[pa]=(੬) ਖੇਡਾਂ
++Name[pa]=(6) ਖੇਡਾਂ
+ Name[pl]=(6) Gry
+ Name[pt]=(6) Jogos
+ Name[pt_BR]=(6) Jogos
+--- khelpcenter/plugins/Manpages/man7.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man7.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -39,7 +39,7 @@
+ Name[nl]=(7) Diversen
+ Name[nn]=(7) Ymse
+ Name[nso]=(7) Hlakahlakanego
+-Name[pa]=(੭) ਫੁੱਟਕਲ
++Name[pa]=(7) ਫੁਟਕਲ
+ Name[pl]=(7) Różne
+ Name[pt]=(7) Diversos
+ Name[pt_BR]=(7) Outros
+--- khelpcenter/plugins/Manpages/man8.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man8.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -39,7 +39,7 @@
+ Name[nl]=(8) Systeembeheer
+ Name[nn]=(8) Systemadministrasjon
+ Name[nso]=(8) Bongwaledi bja System
+-Name[pa]=(੮) ਸਿਸਟਮ ਪ੍ਰਬੰਧਨ
++Name[pa]=(8) ਸਿਸਟਮ ਪ੍ਰਬੰਧਨ
+ Name[pl]=(8) Administracja systemu
+ Name[pt]=(8) Administração do Sistema
+ Name[pt_BR]=(8) Administração do Sistema
+--- khelpcenter/plugins/Manpages/man9.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/Manpages/man9.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -29,7 +29,7 @@
+ Name[nb]=(9) Kjerne
+ Name[nds]=(9) Kernel (Karn vun't Bedriefsysteem)
+ Name[nn]=(9) Kjerne
+-Name[pa]=(੯) ਕਰਨਲ
++Name[pa]=(9) ਕਰਨਲ
+ Name[pl]=(9) JÄ…dro systemu
+ Name[pt]=(9) 'Kernel'
+ Name[ru]=(9) Ядро
+--- khelpcenter/plugins/welcome.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/welcome.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -42,7 +42,7 @@
+ Name[nl]=Welkom bij KDE
+ Name[nn]=Velkomen til KDE
+ Name[nso]=O Amogetswe go KDE
+-Name[pa]=KDE ਤੇ ਸਵਾਗਤ ਹੈ
++Name[pa]=KDE ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ
+ Name[pl]=Witamy w KDE
+ Name[pt]=Bem-vindo ao KDE
+ Name[pt_BR]=Bem-vindo ao KDE
+--- khelpcenter/plugins/userguide.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khelpcenter/plugins/userguide.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -34,7 +34,7 @@
+ Name[nds]=KDE Brukerhandbook
+ Name[nl]=KDE's handleiding
+ Name[nn]=Brukarhandbok for KDE
+-Name[pa]=KDE ਉਪਭੋਗਤਾ ਦਸਤਾਵੇਜ਼
++Name[pa]=KDE ਉਪਭੋਗੀ ਦਸਤਾਵੇਜ਼
+ Name[pl]=Podręcznik użytkownika KDE
+ Name[pt]=Manual do Utilizador do KDE
+ Name[pt_BR]=Manual do Usuário do KDE
+--- klipper/klipperrc.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ klipper/klipperrc.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -115,7 +115,7 @@
+ Description[nl]=K&View opstarten
+ Description[nn]=Start K&View
+ Description[nso]=Ngwadisaleswa K&Pono
+-Description[pa]=ਕੇ-ਦਰਿਸ਼ ਜਾਰੀ(&V)
++Description[pa]=ਕੇ-ਦਰਿਸ਼ ਚਾਲੂ(&V)
+ Description[pl]=Uruchom &Przeglądarkę obrazów
+ Description[pt]=Lançar o K&View
+ Description[pt_BR]=Lançar K&View
+@@ -173,7 +173,7 @@
+ Description[nl]=Web-URL-adres
+ Description[nn]=Internettadresse
+ Description[nso]=URL ya Web
+-Description[pa]=ਵੈੱਬ-URL
++Description[pa]=ਵੈਬ-URL
+ Description[pl]=Adres WWW
+ Description[pt]=URL da Web
+ Description[pt_BR]=URL
+@@ -595,7 +595,7 @@
+ Description[nl]=&Kmail opstarten
+ Description[nn]=Start &KMail
+ Description[nso]=Ngwadisaleswa &Kposo
+-Description[pa]=ਕੇਪੱਤਰ ਜਾਰੀ(&K)
++Description[pa]=ਕੇ-ਮੇਲ ਸ਼ੁਰੂ(&K)
+ Description[pl]=Uruchom KM&ail
+ Description[pt]=Lançar o &Kmail
+ Description[pt_BR]=Abrir &Kmail
+@@ -812,7 +812,7 @@
+ Description[nl]=K&Edit opstarten
+ Description[nn]=Start K&Edit
+ Description[nso]=Ngwadisaleswa K&Phetoso
+-Description[pa]=ਕੇਸੰਪਦਾਕ ਜਾਰੀ(&E)
++Description[pa]=ਕੇਸੰਪਾਦਕ ਸ਼ੁਰੂ(&E)
+ Description[pl]=Uruchom &Edytor
+ Description[pt]=Lançar o K&Edit
+ Description[pt_BR]=Abrir &Kedit
+@@ -883,7 +883,7 @@
+ Description[nl]=K&Write opstarten
+ Description[nn]=Start K&Write
+ Description[nso]=Ngwadisaleswa K&Ngwala
+-Description[pa]=ਕੇਲੇਖਕ ਜਾਰੀ(&W)
++Description[pa]=ਕੇਲੇਖਕ ਸ਼ੁਰੂ(&W)
+ Description[pl]=Uruchom &Zaawansowany edytor
+ Description[pt]=Lançar o K&Write
+ Description[pt_BR]=Abrir KW&rite
+@@ -952,7 +952,7 @@
+ Description[nl]=Lokaal bestands-URL-adres
+ Description[nn]=Lokal filadresse
+ Description[nso]=URL ya Faele ya Selegae
+-Description[pa]=ਸਥਾਨਿਕ ਫਾਇਲ URL
++Description[pa]=ਲੋਕਲਫਾਇਲ URL
+ Description[pl]=Adres lokalnego pliku
+ Description[pt]=URL de ficheiro local
+ Description[pt_BR]=URL de arquivo local
+@@ -1488,7 +1488,7 @@
+ Description[nl]=Openen met &Netscape
+ Description[nn]=Opna med &Netscape
+ Description[nso]=Bula ka &Netscape
+-Description[pa]=ਨੈੱਟਸਕੇਪ ਨਾਲ ਖੋਲੋ(&N)
++Description[pa]=ਨੈਟਸਕੇਪ ਨਾਲ ਖੋਲੋ(&N)
+ Description[pl]=Otwórz w &Netscape
+ Description[pt]=Abrir com o &Netscape
+ Description[pt_BR]=Abrir com o &Netscape
+--- kicker/menuext/find/websearch.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/menuext/find/websearch.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -45,7 +45,7 @@
+ Name[nds]=In't Web söken
+ Name[nl]=Web-zoekopdracht
+ Name[nn]=Søk på nettstader
+-Name[pa]=ਵੈੱਬ ਖੋਜ
++Name[pa]=ਵੈਬ ਖੋਜ
+ Name[pl]=Wyszukiwanie w sieci WWW
+ Name[pt]=Pesquisa na Web
+ Name[pt_BR]=Busca na Web
+--- kicker/menuext/konsole/konsolemenu.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/menuext/konsole/konsolemenu.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -42,7 +42,7 @@
+ Name[nl]=Terminal-sessies
+ Name[nn]=Terminaløkter
+ Name[nso]=Ditiragalo tsa Terminal
+-Name[pa]=ਟਰਮੀਨਲ ਅਜਲਾਸ
++Name[pa]=ਟਰਮੀਨਲ ਸ਼ੈਸ਼ਨ
+ Name[pl]=Sesje terminala
+ Name[pt]=Sessões de Terminal
+ Name[pt_BR]=Sessões de Terminal
+--- kicker/menuext/remote/remotemenu.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/menuext/remote/remotemenu.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -29,7 +29,7 @@
+ Name[nds]=Nettwarkorner
+ Name[nl]=Netwerkmappen
+ Name[nn]=Nettverksmapper
+-Name[pa]=ਨੈੱਟਵਰਕ ਫੋਲਡਰ
++Name[pa]=ਨੈਟਵਰਕ ਫੋਲਡਰ
+ Name[pl]=Foldery sieciowe
+ Name[pt]=Pastas de Rede
+ Name[pt_BR]=Pastas de Rede
+@@ -72,7 +72,7 @@
+ Comment[nds]=Eenfacher op Nettwarkorner togriepen
+ Comment[nl]=Eenvoudige toegang tot netwerkmappen
+ Comment[nn]=Enkel tilgang til nettverksmapper
+-Comment[pa]=ਨੈੱਟਵਰਕ ਫੋਲਡਰ ਵਰਤਣ ਅਸਾਨ
++Comment[pa]=ਨੈਟਵਰਕ ਫੋਲਡਰ ਵਰਤਣ ਅਸਾਨ
+ Comment[pl]=Szybki dostęp do folderów sieciowych
+ Comment[pt]=Acesso fácil às pastas de rede
+ Comment[pt_BR]=Acesso fácil às pastas de rede
+--- kicker/extensions/sidebar/sidebarextension.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/extensions/sidebar/sidebarextension.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -105,6 +105,7 @@
+ Comment[tr]=Konqueror'un yönlendirme paneli çevresindeki satır atlatıcı
+ Comment[uk]=Обгортка навколо навігаційної панелі Konqueror
+ Comment[vi]=Bộ bọc xung quanh bảng duyệt
++Comment[zh_CN]=Konqueror 导航面板的转换器
+ 
+ Icon=view_sidetree
+ 
+--- kicker/applets/naughty/naughtyapplet.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/applets/naughty/naughtyapplet.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -60,6 +60,7 @@
+ Name[uk]=Захоплювач процесів-дезертирів
+ Name[ven]=TShitenwa tsha Catcher
+ Name[vi]=Bắt tiến trình runaway 
++Name[zh_CN]=落跑进程捕捉器
+ Name[zh_TW]=失控程式捕捉器
+ Name[zu]=Umbambi wenqubo ebalekayo
+ Comment=Runaway process catcher for the KDE panel
+@@ -102,7 +103,7 @@
+ Comment[nl]=Een applet waarmee u processorintensieve processen kunt opsporen
+ Comment[nn]=Applet som fangar løpske prosessar
+ Comment[nso]=Moswari wa Tiragalo yeo e Tshabago wa panel ya KDE
+-Comment[pa]=ਕੇਡੀਈ ਪੈਨਲ ਲਈ ਬੇਕਾਬੂ ਕਾਰਜ ਸ਼ਿਕਾਰੀ
++Comment[pa]=KDE ਪੈਨਲ ਲਈ ਬੇਕਾਬੂ ਕਾਰਜ ਸ਼ਿਕਾਰੀ
+ Comment[pl]=Programik unieszkodliwiający procesy, które wymknęły się spod kontroli
+ Comment[pt]=Colector de processos em fuga para o painel do KDE
+ Comment[pt_BR]=Captura de processos fora de controle para o Painel do KDE
+@@ -121,6 +122,7 @@
+ Comment[ven]=Tshitenwa tsha catcher kha phanele ya KDE
+ Comment[vi]=Trình giám sát các tiến trình bị mất cho KDE panel
+ Comment[xh]=Runaway process catcher ye windowe eneenkcukacha ye KDE
++Comment[zh_CN]=KDE 面板的落跑进程捕捉器
+ Comment[zh_TW]=KDE 捕捉失控程式的面板程式
+ Comment[zu]=Umbambi wenqubo ebalekayo yewindi lemininingwane we-KDE
+ X-KDE-Library=naughty_panelapplet
+--- kicker/applets/trash/trashapplet.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/applets/trash/trashapplet.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,7 +31,7 @@
+ Comment[nds]=En Lüttprogramm för't Paneel, dat den Affallammer wiest
+ Comment[nl]=Een paneelapplet dat de prullenbak toont
+ Comment[nn]=Eit panelprogram som viser papirkorga
+-Comment[pa]=ਇੱਕ ਪੈਨਲ ਐਪਲਿਟ ਜੋ ਕਿ ਰੱਦੀ ਵੇਖਾਉਦਾ ਹੈ
++Comment[pa]=ਇੱਕ ਪੈਨਲ ਐਪਲਿਟ, ਜੋ ਕਿ ਰੱਦੀ ਵੇਖਾਉਦਾ ਹੈ
+ Comment[pl]=Aplet panelu wyświetlający kosz
+ Comment[pt]=Uma 'applet' do painel que mostra o lixo
+ Comment[pt_BR]=Um mini-aplicativo de painel que exibe sua lixeira
+@@ -47,6 +47,7 @@
+ Comment[tg]=Аплети панел, ки сабадро тасвир мекунад
+ Comment[tr]=Çöp kutusunun görüntülendiği bir panel programcığı
+ Comment[uk]=Аплет панелі, що відображує смітник
++Comment[zh_CN]=显示回收站的面板小程序
+ Name=Trash
+ Name[af]=Gemors
+ Name[ar]=سلة النفايات
+--- kicker/applets/menu/menuapplet.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/applets/menu/menuapplet.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -84,7 +84,7 @@
+ Comment[nds]=Lüttprogramm för't Inbetten vun enkelte Warktüüchbalken
+ Comment[nl]=Een applet die losstaande menubalken insluit
+ Comment[nn]=Eit panelprogram som kan innehalda frittståande menylinjer
+-Comment[pa]=ਇੱਕਲੀ ਮੇਨੂਪੱਟੀ ਐਪਲਿਟ
++Comment[pa]=ਇੱਕਲੀ ਮੇਨੂ-ਪੱਟੀ ਐਪਲਿਟ
+ Comment[pl]=Aplet zbierajÄ…cy uwolnione paski menu
+ Comment[pt]=Uma 'applet' que incorpora barras de menu autónomas
+ Comment[pt_BR]=Mini-aplicativo para embutir barras de menu ao painel
+--- kicker/applets/taskbar/taskbarapplet.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/applets/taskbar/taskbarapplet.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,7 +43,7 @@
+ Name[nn]=Oppgåvelinje
+ Name[nso]=Bar ya Mosongwana
+ Name[oc]=Barra de tasques
+-Name[pa]=ਸੰਦਪੱਟੀ
++Name[pa]=ਕੰਮ-ਪੱਟੀ
+ Name[pl]=Pasek zadań
+ Name[pt]=Barra de Tarefas
+ Name[pt_BR]=Barra de tarefas
+--- kicker/applets/minipager/minipagerapplet.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kicker/applets/minipager/minipagerapplet.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -25,6 +25,7 @@
+ Name[nds]=Schriefdisch-Ãœmschalter
+ Name[nl]=Bureaubladvoorbeeld en pager
+ Name[nn]=Førehandsvising og byte av skrivebord
++Name[pa]=ਵਿਹੜਾ ਝਲਕਾਰਾ ਅਤੇ ਪੇਜ਼ਰ
+ Name[pl]=Przełącznik i przeglądarka pulpitów
+ Name[pt]=Paginador do Ecrã
+ Name[pt_BR]=Pager e Pré-visualizador de Área de Trabalho
+--- kioslave/media/services/media_safelyremove.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/media/services/media_safelyremove.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,5 +43,6 @@
+ Name[ta]=பாதுகாப்பாக நீக்கு
+ Name[tg]=Баровардани бехатарӣ
+ Name[uk]=Безпечно вилучити
++Name[zh_CN]=安全删除
+ Exec=kio_media_mounthelper -s %u
+ 
+--- kioslave/media/mimetypes/blankdvd.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/media/mimetypes/blankdvd.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,6 +31,7 @@
+ Comment[nds]=Leddige DVD
+ Comment[nl]=Blanko dvd
+ Comment[nn]=Tom DVD
++Comment[pa]=ਖਾਲੀ DVD
+ Comment[pl]=Pusta płyta DVD
+ Comment[pt]=DVD vazio
+ Comment[pt_BR]=DVD virgem
+--- kioslave/media/mimetypes/blankcd.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/media/mimetypes/blankcd.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,7 +31,7 @@
+ Comment[nds]=Leddige CD
+ Comment[nl]=Blanko cd
+ Comment[nn]=Tom CD
+-Comment[pa]=ਖਾਲੀ ਸੀਡੀ
++Comment[pa]=ਖਾਲੀ CD
+ Comment[pl]=Pusta płyta CD
+ Comment[pt]=CD vazio
+ Comment[pt_BR]=CD virgem
+--- kioslave/media/mimetypes/dvdvideo.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/media/mimetypes/dvdvideo.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,6 +31,7 @@
+ Comment[nds]=DVD-Videodisk
+ Comment[nl]=DVD Videodisk
+ Comment[nn]=DVD-videoplate
++Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ
+ Comment[pl]=PÅ‚yta DVD Video
+ Comment[pt]=Disco DVD Vídeo
+ Comment[pt_BR]=DVD de vídeo
+--- kioslave/media/kdedmodule/mediamanager.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/media/kdedmodule/mediamanager.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -91,6 +91,7 @@
+ Comment[tg]=Фаъолияти дастгоҳро расад мекунад ва иҹоза медиҳад, ки онро танзим кунед (media:/)
+ Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/)
+ Comment[uk]=Спостерігає за змінами серед носіїв інформації та дозволяє (роз)монтування (media:/)
++Comment[zh_CN]=跟踪介质活动并允许挂载或卸载(media:/)
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+ X-KDE-Library=mediamanager
+--- kioslave/thumbnail/htmlthumbnail.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/thumbnail/htmlthumbnail.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,7 +46,7 @@
+ Name[nl]=HTML-bestanden
+ Name[nn]=HTML-filer
+ Name[nso]=Difaele tsa HTML
+-Name[pa]=HTML ਫਾਇਲ਼ਾਂਂ
++Name[pa]=HTML ਫਾਇਲਾਂ
+ Name[pl]=Strony HTML
+ Name[pt]=Ficheiros HTML
+ Name[pt_BR]=Arquivos HTML
+--- kioslave/system/mimetypes/system_directory.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/system/mimetypes/system_directory.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -45,6 +45,7 @@
+ Comment[ta]=அமைப்பு அடைவு
+ Comment[tg]=Папкаи системавӣ
+ Comment[uk]=Системна тека
++Comment[zh_CN]=系统文件夹
+ Patterns=
+ 
+ X-KDE-AutoEmbed=true
+--- kioslave/fish/fish.protocol	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/fish/fish.protocol	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,7 +36,7 @@
+ Description[nds]=En In-/Utgaavdeenst för dat FISH-Protokull
+ Description[nl]=Een kioslave voor het protocol FISH
+ Description[nn]=Ein IU-slave for FISH-protokollen
+-Description[pa]=FISH ਪ੍ਰੋਟੋਕਾਲ ਲਈ kioslave
++Description[pa]=FISH ਪਰੋਟੋਕਾਲ ਲਈ kioslave
+ Description[pl]=Wtyczka protokołu FISH
+ Description[pt]=Um 'kioslave' para protocolo FISH
+ Description[pt_BR]=Uma implementação para o protocolo FISH
+@@ -52,4 +52,5 @@
+ Description[tg]=Модули файлии система барои протоколи FISH
+ Description[tr]=FISH protokolü için kioslave
+ Description[uk]=Підлеглий B/В для протоколу FISH
++Description[zh_CN]=FISH 协议的 KIO 仆人
+ DocPath=kioslave/fish.html
+--- kioslave/mac/mac.protocol	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/mac/mac.protocol	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -47,5 +47,6 @@
+ Description[tg]=Модули вориду хориҹ барои системаи файлии MacOS HFS+
+ Description[tr]=MacOS HFS+ bölümleri için kioslave
+ Description[uk]=Підлеглий B/В для розділів MacOS HFS+
++Description[zh_CN]=MacOS HFS+ 分区的 KIO 仆人
+ Icon=mac
+ DocPath=kioslave/mac.html
+--- kioslave/cgi/kcmcgi/kcmcgi.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/cgi/kcmcgi/kcmcgi.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -171,6 +171,7 @@
+ Keywords[nl]=cgi,kio,slave,paths,paden
+ Keywords[nn]=CGI,KIO,slave,stiar
+ Keywords[nso]=CGI,KIO,Lekgoba,Ditsejana
++Keywords[pa]=CGI,KIO,Slave,ਮਾਰਗ
+ Keywords[pl]=CGI,KIO,procedury we/wy,ścieżki
+ Keywords[pt]=CGI,KIO,Slave,Localizações
+ Keywords[pt_BR]=CGI,KIO,Escravo,Caminhos
+--- kioslave/man/kmanpart.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/man/kmanpart.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -61,6 +61,7 @@
+ Comment[vi]=Trình xem Troff nhúng được
+ Comment[wa]=Ravalåve håyneu di fitchîs Troff
+ Comment[xh]=Umboniseli we Troff Elungiselekayo
++Comment[zh_CN]=嵌入的 Troff 查看器
+ Comment[zh_TW]=可嵌入的 Troff 檢視元件
+ Comment[zu]=Umbukisi we-Troff Oshuthekiwe
+ MimeType=application/x-troff
+--- kioslave/sftp/sftp.protocol	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kioslave/sftp/sftp.protocol	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -10,6 +10,7 @@
+ writing=true
+ makedir=true
+ deleting=true
++moving=true
+ Icon=ftp
+ Description=A kioslave for sftp
+ Description[af]='n Kioslave vir sftp
+--- kdeprint/kdeprintfax/kdeprintfax.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdeprint/kdeprintfax/kdeprintfax.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,7 +52,7 @@
+ GenericName[nl]=Faxprogramma
+ GenericName[nn]=Faksverktøy
+ GenericName[nso]=Sebereka sa Fax
+-GenericName[pa]=ਫੈਕਸ ਉਪਭੋਗਤਾ
++GenericName[pa]=ਫੈਕਸ ਸਹੂਲਤ
+ GenericName[pl]=Faks
+ GenericName[pt]=Utilitário de Fax
+ GenericName[pt_BR]=Utilitário de Fax
+--- kdeprint/printmgr/printmgr.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdeprint/printmgr/printmgr.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -190,7 +190,7 @@
+ Keywords[nl]=print,printer,printing management,afdrukbeheer,afdrukken
+ Keywords[nn]=utskrift,skrivar,utskriftshandsaming
+ Keywords[nso]=taolo ya kgatiso,segatisi,kgatiso
+-Keywords[pa]=ਛਾਪਣ, ਛਾਪਕ, ਪ੍ਰਿੰਟ, ਪ੍ਰਿੰਟ ਪ੍ਰਬੰਧਕ
++Keywords[pa]=ਛਾਪਣ,ਛਾਪਕ,ਪ੍ਰਿੰਟ,ਪ੍ਰਿੰਟ ਪ੍ਰਬੰਧਕ
+ Keywords[pl]=drukuj,drukarka,zarzÄ…dzanie drukowaniem
+ Keywords[pt]=imprimir,impressora,gestão de impressão
+ Keywords[pt_BR]=imprimir,impressora,gerenciamento de impressão
+--- kdeprint/printmgr/printers.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdeprint/printmgr/printers.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -184,7 +184,7 @@
+ Keywords[nl]=print,printer,printing management,afdrukbeheer,afdrukken
+ Keywords[nn]=utskrift,skrivar,utskriftshandsaming
+ Keywords[nso]=taolo ya kgatiso,segatisi,kgatiso
+-Keywords[pa]=ਛਾਪਣ, ਛਾਪਕ, ਪ੍ਰਿੰਟ, ਪ੍ਰਿੰਟ ਪ੍ਰਬੰਧਕ
++Keywords[pa]=ਛਾਪਣ,ਛਾਪਕ,ਪ੍ਰਿੰਟ,ਪ੍ਰਿੰਟ ਪ੍ਰਬੰਧਕ
+ Keywords[pl]=drukuj,drukarka,zarzÄ…dzanie drukowaniem
+ Keywords[pt]=imprimir,impressora,gestão de impressão
+ Keywords[pt_BR]=imprimir,impressora,gerenciamento de impressão
+--- kdeprint/kdeprint_part/kdeprint_part.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdeprint/kdeprint_part/kdeprint_part.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,7 +46,7 @@
+ Name[nl]=Hulpprogramma voor printerbeheer
+ Name[nn]=Utskriftshandsaming
+ Name[nso]=Sebereka sa Taolo ya Kgatiso
+-Name[pa]=ਛਾਪਣ(ਪ੍ਰਿੰਟ) ਪ੍ਰਬੰਧਨ ਸੰਦ
++Name[pa]=ਛਾਪਣ (ਪ੍ਰਿੰਟ) ਪ੍ਰਬੰਧਨ ਸੰਦ
+ Name[pl]=ZarzÄ…dzanie wydrukiem
+ Name[pt]=Ferramenta de Gestão de Impressões
+ Name[pt_BR]=Ferramenta para Gerenciamento de Impressão
+--- kdeprint/slave/mimetypes/folder.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdeprint/slave/mimetypes/folder.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -44,6 +44,7 @@
+ Comment[ta]=அச்சிடும் அடைவு
+ Comment[tg]=Папкаи чоп
+ Comment[uk]=Тека друку
++Comment[zh_CN]=打印文件夹
+ Icon=folder_print
+ Type=MimeType
+ MimeType=print/folder
+--- kdeprint/kprinter/kprinter.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdeprint/kprinter/kprinter.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -69,7 +69,7 @@
+ GenericName[nl]=Afdrukprogramma
+ GenericName[nn]=Utskriftsverktøy
+ GenericName[nso]=Sebereka sa Kgatiso
+-GenericName[pa]=ਛਾਪਣ(ਪ੍ਰਿੰਟਿੰਗ) ਸੰਦ
++GenericName[pa]=ਛਪਾਈ ਸੰਦ
+ GenericName[pl]=Narzędzie do zarządzania wydrukiem
+ GenericName[pt]=Ferramenta de Impressão
+ GenericName[pt_BR]=Ferramenta de Impressão
+--- nsplugins/khtml_plugins.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ nsplugins/khtml_plugins.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,7 +50,7 @@
+ Name[nb]=Programtillegg
+ Name[nn]=Programtillegg
+ Name[nso]=Ditsenyo
+-Name[pa]=ਪਲੱਗਇਨ
++Name[pa]=ਪਲੱਗਿੰਨ
+ Name[pl]=Wtyczki
+ Name[pt]='Plugins'
+ Name[pt_BR]=Plug-ins
+@@ -117,7 +117,7 @@
+ Comment[nl]=Hier kunt u de browser-plugins instellen
+ Comment[nn]=Set opp programtillegg for nettlesaren
+ Comment[nso]=Beakanya ditsenyo tsa seinyakisi
+-Comment[pa]=ਝਲਕਾਰਾ ਪਲੱਗਇਨ ਸੰਰਚਨਾ
++Comment[pa]=ਝਲਕਾਰਾ ਪਲੱਗਿੰਨ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja wtyczek przeglÄ…darki
+ Comment[pt]=Configurar os 'plugins' do navegador
+ Comment[pt_BR]=Configura os plug-ins do navegador
+--- kappfinder/apps/Internet/mozilla.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/mozilla.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -81,7 +81,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ MimeType=text/html
+--- kappfinder/apps/Internet/xftp.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/xftp.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -58,6 +58,7 @@
+ GenericName[ta]=எஃப்டிபி உலாவி
+ GenericName[tg]=Тафсиргари FTP
+ GenericName[uk]=Навігатор FTP
++GenericName[zh_CN]=FTP 浏览器
+ Exec=xftp
+ Icon=xapp
+ Path=
+--- kappfinder/apps/Internet/arena.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/arena.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -85,6 +85,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+--- kappfinder/apps/Internet/licq.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/licq.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -48,6 +48,7 @@
+ GenericName[ta]=ICQ செய்தியாளர்
+ GenericName[tg]=ICQ Мессенҷер
+ GenericName[uk]=Кур'єр (messenger) ICQ
++GenericName[zh_CN]=ICQ 信使
+ Path=
+ Terminal=false
+ Type=Application
+--- kappfinder/apps/Internet/netscape6.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/netscape6.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -93,7 +93,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ MimeType=text/html
+--- kappfinder/apps/Internet/Dpsftp.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/Dpsftp.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -48,6 +48,7 @@
+ GenericName[ta]=எஃப்டிபி உலாவி
+ GenericName[tg]=Тафсиргари FTP
+ GenericName[uk]=Навігатор FTP
++GenericName[zh_CN]=FTP 浏览器
+ Exec=dpsftp
+ Terminal=false
+ Icon=dpsftp.xpm
+--- kappfinder/apps/Internet/gtelnet.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/gtelnet.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -70,6 +70,7 @@
+ GenericName[ta]=தொலைதூர அணுகல்
+ GenericName[tg]=Дастраси шабақаи дарунӣ
+ GenericName[uk]=Віддалений доступ
++GenericName[zh_CN]=远程访问
+ Exec=gnome-telnet
+ Terminal=false
+ Icon=gnome-telnet.xpm
+--- kappfinder/apps/Internet/Galeon.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/Galeon.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -77,7 +77,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ Exec=galeon
+--- kappfinder/apps/Internet/GnomeICU.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/GnomeICU.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -51,6 +51,7 @@
+ GenericName[ta]=ICQ செய்தியாளர்
+ GenericName[tg]=ICQ Мессенҷер
+ GenericName[uk]=Кур'єр (messenger) ICQ
++GenericName[zh_CN]=ICQ 信使
+ Exec=gnomeicu -a
+ Terminal=false
+ Icon=gnomeicu.xpm
+--- kappfinder/apps/Internet/opera.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/opera.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -77,7 +77,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ Exec=opera %u
+--- kappfinder/apps/Internet/mozilla-firefox.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/mozilla-firefox.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -75,7 +75,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ MimeType=text/html
+--- kappfinder/apps/Internet/xchat.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/xchat.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -23,6 +23,7 @@
+ GenericName[af]=IRC Praat
+ GenericName[bg]=Клиент за IRC
+ GenericName[bn]=আই-আর-সি আড্ডা
++GenericName[br]=Flapañ IRC
+ GenericName[bs]=IRC chat
+ GenericName[ca]=Xat IRC
+ GenericName[cs]=IRC chat
+@@ -58,4 +59,5 @@
+ GenericName[sv]=IRC-chatt
+ GenericName[ta]=IRC அரட்டை
+ GenericName[uk]=Балачка IRC
++GenericName[zh_CN]=IRC 聊天
+ 
+--- kappfinder/apps/Internet/epiphany.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/epiphany.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -76,7 +76,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ Exec=epiphany
+--- kappfinder/apps/Internet/DrakSync.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/DrakSync.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -51,6 +51,7 @@
+ GenericName[ta]=அடைவு ஒருங்கிணைப்பு
+ GenericName[tg]=Обзори яксонсозии феҳрист
+ GenericName[uk]=Синхронізація тек
++GenericName[zh_CN]=文件夹同步
+ Exec=draksync
+ Terminal=false
+ Icon=draksync.xpm
+--- kappfinder/apps/Internet/ickle.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/ickle.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -51,5 +51,6 @@
+ GenericName[ta]=ICQ2000 அரட்டை
+ GenericName[tg]=ICQ2000 Чат
+ GenericName[uk]=Балачка ICQ2000
++GenericName[zh_CN]=ICQ2000 聊天
+ Terminal=false
+ Type=Application
+--- kappfinder/apps/Internet/mozilla-firebird.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/mozilla-firebird.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -79,7 +79,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ MimeType=text/html
+--- kappfinder/apps/Internet/gFTP.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/gFTP.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -49,6 +49,7 @@
+ GenericName[ta]=எஃப்டிபி உலாவி
+ GenericName[tg]=Тафсиргари FTP
+ GenericName[uk]=Навігатор FTP
++GenericName[zh_CN]=FTP 浏览器
+ Exec=gftp
+ Terminal=false
+ Icon=gftp.xpm
+--- kappfinder/apps/Internet/netscape.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/netscape.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -81,7 +81,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ MimeType=text/html
+--- kappfinder/apps/Internet/Terminal/Lynx.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/Terminal/Lynx.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -71,7 +71,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ Exec=lynx
+--- kappfinder/apps/Internet/Terminal/Links.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/Terminal/Links.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -82,7 +82,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ Exec=links
+--- kappfinder/apps/Internet/Terminal/w3m.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kappfinder/apps/Internet/Terminal/w3m.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -72,7 +72,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ Exec=w3m www.kde.org
+--- kdesktop/lock/Makefile.am	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/lock/Makefile.am	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -1,8 +1,8 @@
+ ## Makefile.am of kdebase/kdesktop/lock
+ 
+-INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(all_includes)
++INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
+ kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
+-kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC)
++kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
+ 
+ ####### Files
+ 
+--- kdesktop/lock/configure.in.in	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/lock/configure.in.in	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -26,3 +26,12 @@
+ fi
+ 
+ LDFLAGS="$xss_save_ldflags"
++
++AC_HAVE_GL(
++    [
++    AC_CHECK_LIB(GL,glXChooseVisual,
++        [
++        AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have glXChooseVisual()])
++        ])
++    ],[]
++    )
+--- kdesktop/lock/lockprocess.cc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/lock/lockprocess.cc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -80,6 +80,10 @@
+ #include <X11/extensions/xf86misc.h>
+ #endif
+ 
++#ifdef HAVE_GLXCHOOSEVISUAL
++#include <GL/glx.h>
++#endif
++
+ #define LOCK_GRACE_DEFAULT          5000
+ #define AUTOLOGOUT_DEFAULT          600
+ 
+@@ -95,6 +99,7 @@
+ //
+ LockProcess::LockProcess(bool child, bool useBlankOnly)
+     : QWidget(0L, "saver window", WX11BypassWM),
++      mOpenGLVisual(0),
+       child_saver(child),
+       mParent(0),
+       mUseBlankOnly(useBlankOnly),
+@@ -138,10 +143,6 @@
+     gXA_VROOT = XInternAtom (qt_xdisplay(), "__SWM_VROOT", False);
+     gXA_SCREENSAVER_VERSION = XInternAtom (qt_xdisplay(), "_SCREENSAVER_VERSION", False);
+ 
+-    XWindowAttributes attrs;
+-    XGetWindowAttributes(qt_xdisplay(), winId(), &attrs);
+-    mColorMap = attrs.colormap;
+-
+     connect(&mHackProc, SIGNAL(processExited(KProcess *)),
+                         SLOT(hackExited(KProcess *)));
+ 
+@@ -371,6 +372,10 @@
+ 				kdDebug(1204) << "Screensaver is type OpenGL and OpenGL is forbidden" << endl;
+ 				mForbidden = true;
+ 			}
++			if (saverTypes[i] == "OpenGL")
++			{
++				mOpenGLVisual = true;
++			}
+ 		}
+ 	}
+ 
+@@ -390,8 +395,29 @@
+ //
+ void LockProcess::createSaverWindow()
+ {
+-    // We only create the window once, but we reset its attributes every
+-    // time.
++    Visual* visual = CopyFromParent;
++    XSetWindowAttributes attrs;
++    int flags = 0;
++#ifdef HAVE_GLXCHOOSEVISUAL
++    if( mOpenGLVisual )
++    {
++        int attribs[] = { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, x11Depth(), None };
++        if( XVisualInfo* i = glXChooseVisual( x11Display(), x11Screen(), attribs ))
++        {
++            visual = i->visual;
++            static Colormap colormap = 0;
++            if( colormap != 0 )
++                XFreeColormap( x11Display(), colormap );
++            colormap = XCreateColormap( x11Display(), RootWindow( x11Display(), x11Screen()), visual, AllocNone );
++            attrs.colormap = colormap;
++            flags |= CWColormap;
++            XFree( i );
++        }
++    }
++#endif
++    Window w = XCreateWindow( x11Display(), RootWindow( x11Display(), x11Screen()),
++        x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs );
++    create( w );
+ 
+     // Some xscreensaver hacks check for this property
+     const char *version = "KDE 2.0";
+@@ -400,19 +426,10 @@
+                      (unsigned char *) version, strlen(version));
+ 
+     XSetWindowAttributes attr;
+-    if (mColorMap != None)
+-    {
+-        attr.colormap = mColorMap;
+-    }
+-    else
+-    {
+-        attr.colormap = DefaultColormapOfScreen(
+-                                ScreenOfDisplay(qt_xdisplay(), qt_xscreen()));
+-    }
+     attr.event_mask = KeyPressMask | ButtonPressMask | PointerMotionMask |
+                         VisibilityChangeMask | ExposureMask;
+     XChangeWindowAttributes(qt_xdisplay(), winId(),
+-                            CWEventMask | CWColormap, &attr);
++                            CWEventMask, &attr);
+ 
+     // erase();
+ 
+--- kdesktop/lock/lockprocess.h	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/lock/lockprocess.h	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -100,12 +100,12 @@
+     int         mLockGrace;
+     int         mPriority;
+     bool        mBusy;
+-    Colormap    mColorMap;
+     KProcess    mHackProc;
+     int         mRootWidth;
+     int         mRootHeight;
+     QString     mSaverExec;
+     QString     mSaver;
++    bool        mOpenGLVisual;
+     bool        child_saver;
+     QValueList<int> child_sockets;
+     int         mParent;
+--- kdesktop/kdesktop.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/kdesktop.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,7 +46,7 @@
+ Name[nl]=KDE Bureaublad
+ Name[nn]=KDE-skrivebord
+ Name[nso]=Desktop ya KDE
+-Name[pa]=KDE ਵਿਹੜਾਵਿਹੜਾ
++Name[pa]=KDE ਵਿਹੜਾ
+ Name[pl]=Pulpit KDE
+ Name[pt]=Ambiente de Trabalho do KDE
+ Name[pt_BR]=Área de Trabalho KDE
+--- kdesktop/init/Home.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/init/Home.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -116,7 +116,7 @@
+ GenericName[nn]=Personlege filer
+ GenericName[nso]=Difaele tsa Botho
+ GenericName[oc]=FiquièRs personals
+-GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲ਼ਾਂ
++GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲਾਂ
+ GenericName[pl]=Pliki osobiste
+ GenericName[pt]=Ficheiros Pessoais
+ GenericName[pt_BR]=Arquivos Pessoais
+--- kdesktop/init/System.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/init/System.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -97,7 +97,7 @@
+ GenericName[nds]=Systeemsteden
+ GenericName[nl]=Systeemlocaties
+ GenericName[nn]=Systemplassar
+-GenericName[pa]=ਸਿਸਟਮ ਸਥਿਤੀਆਂ
++GenericName[pa]=ਸਿਸਟਮ ਟਿਕਾਣੇ
+ GenericName[pl]=Lokalizacje systemowe
+ GenericName[pt]=Localizações do Sistema
+ GenericName[pt_BR]=Localizações no Sistema
+--- kdesktop/init/Templates/linkURL.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/init/Templates/linkURL.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -38,7 +38,7 @@
+ Name[nds]=Link to'n Oort (URL)...
+ Name[nl]=Koppeling naar locatie (URL-adres)...
+ Name[nn]=Lenkje til nettadresse (URL) ...
+-Name[pa]=ਸਥਿਤੀ (URL) ਨਾਲ ਸੰਬੰਧ...
++Name[pa]=ਟਿਕਾਣਾ (URL) ਨਾਲ ਸਬੰਧ...
+ Name[pl]=Skrót do adresu (URL)...
+ Name[pt]=Atalho para Localização (URL)...
+ Name[pt_BR]=Link para Localização (URL)...
+@@ -99,7 +99,7 @@
+ Comment[nl]=Koppeling naar locatie invoeren (URL-adres):
+ Comment[nn]=Ny lenkje til Internettadresse:
+ Comment[nso]=Tsenya sekgokaganyi go tulo (URL):
+-Comment[pa]=ਸਥਿਤੀ (URL) ਨਾਲ ਸੰਬੰਧ ਦਿਓ:
++Comment[pa]=ਟਿਕਾਣਾ (URL) ਨਾਲ ਸਬੰਧ ਦਿਓ:
+ Comment[pl]=Nowy skrót do adresu internetowego (URL):
+ Comment[pt]=Indique o atalho para a localização (URL):
+ Comment[pt_BR]=Digite o link para a localização (URL):
+--- kdesktop/init/Templates/linkProgram.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/init/Templates/linkProgram.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -39,7 +39,7 @@
+ Name[nds]=Link to'n Programm...
+ Name[nl]=Koppeling naar toepassing...
+ Name[nn]=Lenkje til program ...
+-Name[pa]=ਕਾਰਜ ਨਾਲ ਸੰਬੰਧ...
++Name[pa]=ਕਾਰਜ ਨਾਲ ਸਬੰਧ...
+ Name[pl]=Skrót do programu...
+ Name[pt]=Atalho para Aplicação...
+ Name[pt_BR]=Link para Aplicativo...
+@@ -102,7 +102,7 @@
+ Comment[nl]=Nieuwe koppeling naar toepassing
+ Comment[nn]=Ny lenkje til program
+ Comment[nso]=Kgokaganyo ye Ntshwa go Tshomiso
+-Comment[pa]=ਕਾਰਜ ਨਾਲ ਨਵਾਂ ਸੰਬੰਧ
++Comment[pa]=ਕਾਰਜ ਨਾਲ ਨਵਾਂ ਸਬੰਧ
+ Comment[pl]=Nowy skrót do programu
+ Comment[pt]=Novo Atalho para Aplicação
+ Comment[pt_BR]=Novo link para Aplicativo
+--- kdesktop/init/Templates/linkNFS.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdesktop/init/Templates/linkNFS.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,7 +50,7 @@
+ Comment[nds]=Niegen NFS Link
+ Comment[nl]=Nieuwe NFS-koppeling
+ Comment[nn]=Ny NFS-lenkje
+-Comment[pa]=ਨਵਾਂ NFS ਸੰਬੰਧ
++Comment[pa]=ਨਵਾਂ NFS ਸਬੰਧ
+ Comment[pl]=Nowy skrót do NFS...
+ Comment[pt]=Nova ligação NFS
+ Comment[pt_BR]=Novo Link NFS
+--- applnk/kde-internet.directory	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ applnk/kde-internet.directory	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -34,6 +34,5 @@
+ Name[uk]=Інтернет
+ Name[uz]=Интернет
+ Name[wa]=Daegntoele
+-Name[zh_CN]=互连网
+ Icon=package_network
+ 
+--- applnk/hidden.directory	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ applnk/hidden.directory	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -27,6 +27,7 @@
+ Name[nds]=Interne Deensten
+ Name[nl]=Interne diensten
+ Name[nn]=Interne tenester
++Name[pa]=ਇੰਟਰਨੈੱਟ ਸੇਵਾਵਾਂ
+ Name[pl]=Usługi wewnętrzne
+ Name[pt]=Serviços internos
+ Name[pt_BR]=Serviços Internos
+@@ -39,4 +40,5 @@
+ Name[sv]=Interna tjänster
+ Name[tg]=Хизматҳои дохилӣ
+ Name[uk]=Внутрішні служби
++Name[zh_CN]=内部服务
+ NoDisplay=true
+--- applnk/compat/email.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ applnk/compat/email.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,7 +50,7 @@
+ Name[nl]=E-mail
+ Name[nn]=E-post
+ Name[nso]=E-poso
+-Name[pa]=ਈ-ਪੱਤਰ
++Name[pa]=ਈ-ਮੇਲ
+ Name[pl]=E-mail
+ Name[pt]=Correio Electrónico
+ Name[pt_BR]=E-Mail
+@@ -120,7 +120,7 @@
+ Comment[nl]=Voer uw identiteit, e-mailadressen, e-mailservers, enz. in
+ Comment[nn]=Set opp identiteten din, e-postadressa di, e-posttenarar osv.
+ Comment[nso]=Beakanya boitsibiso bja gago, diaterese tsa e-poso, baabi ba poso, le tsedingwe.
+-Comment[pa]=ਆਪਣੀ ਪਛਾਣ, ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ, ਮੇਲ ਸਰਵਰ ਦੀ ਸੰਰਚਨਾ ਦਿਉ।
++Comment[pa]=ਆਪਣੀ ਪਛਾਣ, ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ, ਮੇਲ ਸਰਵਰ ਦੀ ਸੰਰਚਨਾ ਦਿਉ।
+ Comment[pl]=Konfiguracja danych osobowych, adresu pocztowego, serwera poczty, itd.
+ Comment[pt]=Configuração da sua identidade, endereços de correio electrónico, servidores, etc.
+ Comment[pt_BR]=Configure sua identidade, endereços de e-mail, servidores de e-mail, etc.
+--- konqueror/profile_webbrowsing.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/profile_webbrowsing.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -42,7 +42,7 @@
+ Name[nn]=Vevsurfing
+ Name[nso]=Boinyakisi bja Web
+ Name[oc]=Navigacion Oeb
+-Name[pa]=ਵੈੱਬ ਝਲਕੀ
++Name[pa]=ਵੈਬ ਝਲਕੀ
+ Name[pl]=PrzeglÄ…danie sieci
+ Name[pt]=Navegação
+ Name[pt_BR]=Navegação Web
+--- konqueror/iconview/konq_iconview.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/iconview/konq_iconview.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,7 +46,7 @@
+ Name[nl]=Pictogramweergave
+ Name[nn]=Ikon-vising
+ Name[nso]=Pono ya Seemedi
+-Name[pa]=ਆਈਕਾਨ ਦਰਿਸ਼
++Name[pa]=ਆਈਕਾਨ ਝਾਤੀ
+ Name[pl]=Widok ikon
+ Name[pt]=Vista por Ícones
+ Name[pt_BR]=Visão em Ícones
+--- konqueror/iconview/konq_multicolumnview.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/iconview/konq_multicolumnview.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -45,7 +45,7 @@
+ Name[nl]=Multikolomweergave
+ Name[nn]=Multikolonne-vising
+ Name[nso]=Pono ya Kholomo ya Bontshi
+-Name[pa]=ਬਹੁ-ਕਾਲਮ ਦਰਿਸ਼
++Name[pa]=ਬਹੁ-ਕਾਲਮ ਝਾਤੀ
+ Name[pl]=Widok wielokolumnowy
+ Name[pt]=Vista por Multi-colunas
+ Name[pt_BR]=Visão Multicolunas
+--- konqueror/konqbrowser.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/konqbrowser.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -83,7 +83,7 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[zh_CN]=网页浏览器
++GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+ Categories=Qt;KDE;Network;
+--- konqueror/kttsplugin/khtmlkttsd.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/kttsplugin/khtmlkttsd.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -48,5 +48,6 @@
+ Name[ta]=உரையில் இருந்து பேச்சு சொருகுப்பொருள்
+ Name[tg]=Модули гуфтори матн
+ Name[uk]=Втулок синтезу мовлення з тексту
++Name[zh_CN]=文本到语音插件
+ Icon=kttsd
+ 
+--- konqueror/konquerorsu.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/konquerorsu.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -48,7 +48,7 @@
+ Name[nl]=Bestandsbeheerder (in systeembeheermodus)
+ Name[nn]=Filhandsamar – Superbrukarmodus
+ Name[nso]=Molaodi wa Faele - Seripa sa Modirisi yo Maatla
+-Name[pa]=ਫਾਇਲ ਪ੍ਰਬੰਧਕ - ਸੁਪਰ ਉਪਭੋਗਤਾ(ਪ੍ਰਬੰਧਕੀ) ਢੰਗ
++Name[pa]=ਫਾਇਲ ਪ੍ਰਬੰਧਕ - ਸੁਪਰ ਉਪਭੋਗੀ(ਪ੍ਰਬੰਧਕੀ) ਢੰਗ
+ Name[pl]=Menedżer plików - tryb administratora
+ Name[pt]=Gestor de Ficheiros - Modo de Super Utilizador
+ Name[pt_BR]=Gerenciador de Arquivos (Modo Super-Usuário)
+--- konqueror/listview/konq_textview.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/listview/konq_textview.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -45,7 +45,7 @@
+ Name[nl]=Tekstweergave
+ Name[nn]=Tekstvising
+ Name[nso]=Pono ya Sengwalwana
+-Name[pa]=ਪਾਠ ਦਰਿਸ਼
++Name[pa]=ਪਾਠ ਝਾਤੀ
+ Name[pl]=Widok tekstowy
+ Name[pt]=Vista em Texto
+ Name[pt_BR]=Visão Texto
+--- konqueror/listview/konq_infolistview.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/listview/konq_infolistview.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,7 +41,7 @@
+ Name[nl]=Infolijstweergave
+ Name[nn]=Infolistevising
+ Name[nso]=Pono ya Palo ya Tshedimoso
+-Name[pa]=ਜਾਣਕਾਰੀ ਸੂਚੀ ਦਰਿਸ਼
++Name[pa]=ਜਾਣਕਾਰੀ ਸੂਚੀ ਝਾਤੀ
+ Name[pl]=Widok listy informacyjnej
+ Name[pt]=Vista em Lista com Informações
+ Name[pt_BR]=Visão de Lista de Informações
+--- konqueror/listview/konq_treeview.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/listview/konq_treeview.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,7 +46,7 @@
+ Name[nl]=Boomstructuurweergave
+ Name[nn]=Trevising
+ Name[nso]=Pono ya Mohlare
+-Name[pa]=ਲੜੀ ਦਰਿਸ਼
++Name[pa]=ਲੜੀ ਝਾਤੀ
+ Name[pl]=Widok drzewa
+ Name[pt]=Vista em Árvore
+ Name[pt_BR]=Visão em Árvore
+--- konqueror/listview/konq_detailedlistview.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/listview/konq_detailedlistview.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -44,7 +44,7 @@
+ Name[nl]=Gedetailleerde weergave
+ Name[nn]=Detaljert listevising
+ Name[nso]=Pono yeo e Tseneletsego ya Palo
+-Name[pa]=ਵੇਰਵਾ ਸੂਚੀ ਦਰਿਸ਼
++Name[pa]=ਵੇਰਵਾ ਸੂਚੀ ਝਾਤੀ
+ Name[pl]=Widok ze szczegółową listą
+ Name[pt]=Vista em Lista Detalhada
+ Name[pt_BR]=Visão de Lista Detalhada
+--- konqueror/profile_filepreview.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/profile_filepreview.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,7 +50,7 @@
+ Name[nl]=Bestandsvoorbeeld
+ Name[nn]=Filvising
+ Name[nso]=Ponelopele ya Faele
+-Name[pa]=ਫਾਇਲ਼ ਨਮੂਨਾ
++Name[pa]=ਫਾਇਲ ਝਲਕ
+ Name[pl]=Podgląd plików
+ Name[pt]=Previsão de Ficheiros
+ Name[pt_BR]=Pré-visualização de arquivo
+--- konqueror/sidebar/web_module/websidebar.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/sidebar/web_module/websidebar.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,7 +41,7 @@
+ Name[nds]=Sietbalken för de Nettnavigatschoon
+ Name[nl]=Webzijbalkmodule
+ Name[nn]=Modul for nett-sidestolpe
+-Name[pa]=ਵੈੱਬ ਬਾਹੀ ਮੈਡੀਊਲ
++Name[pa]=ਵੈਬ ਬਾਹੀ ਮੈਡੀਊਲ
+ Name[pl]=Moduł paska bocznego WWW
+ Name[pt]=Módulo Barra Lateral Web
+ Name[pt_BR]=Módulo da Barra Lateral Web
+--- konqueror/sidebar/web_module/webmodule_add.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/sidebar/web_module/webmodule_add.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,7 +41,7 @@
+ Name[nds]=Sietbalken för de Nettnavigatschoon
+ Name[nl]=Webzijbalkmodule
+ Name[nn]=Modul for nett-sidestolpe
+-Name[pa]=ਵੈੱਬ ਬਾਹੀ ਮੈਡੀਊਲ
++Name[pa]=ਵੈਬ ਬਾਹੀ ਮੈਡੀਊਲ
+ Name[pl]=Moduł paska bocznego WWW
+ Name[pt]=Módulo Barra Lateral Web
+ Name[pt_BR]=Módulo da Barra Lateral Web
+--- konqueror/sidebar/trees/init/remote.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/sidebar/trees/init/remote.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,7 +46,7 @@
+ Name[nn]=Nettverk
+ Name[nso]=Kgokagano
+ Name[oc]=Resèu
+-Name[pa]=ਨੈੱਟਵਰਕ
++Name[pa]=ਨੈਟਵਰਕ
+ Name[pl]=Sieć
+ Name[pt]=Rede
+ Name[pt_BR]=Rede
+--- konqueror/sidebar/trees/init/history.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/sidebar/trees/init/history.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -132,6 +132,7 @@
+ Comment[ven]=Heyi ndi divhazwakale ya URL no i dalelaho zwazwino. Ni nga i lugisa nga ndila dzo fhambananho.
+ Comment[vi]=Đây là danh sách các URL bạn đã xem gần đâỵ Bọn có thể sắp xếp lại chúng theo vài cách khác nhau
+ Comment[xh]=Le yimbali yee URL obusandukuzindwendwela. Ungazibeka ngendlela ezininzi.
++Comment[zh_CN]=这是您曾经浏览过的 URL 历史。您可以以多种方式对其排序。
+ Comment[zh_TW]=這是您最近訪問的 URL 的歷史紀錄。您可以將它們以多種方式排序。
+ Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi.
+ Open=false
+--- konqueror/sidebar/trees/init/history_module.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/sidebar/trees/init/history_module.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -132,6 +132,7 @@
+ Comment[ven]=Heyi ndi divhazwakale ya URL no i dalelaho zwazwino. Ni nga i lugisa nga ndila dzo fhambananho.
+ Comment[vi]=Đây là danh sách các URL bạn đã xem gần đâỵ Bọn có thể sắp xếp lại chúng theo vài cách khác nhau
+ Comment[xh]=Le yimbali yee URL obusandukuzindwendwela. Ungazibeka ngendlela ezininzi.
++Comment[zh_CN]=这是您曾经浏览过的 URL 历史。您可以以多种方式对其排序。
+ Comment[zh_TW]=這是您最近訪問的 URL 的歷史紀錄。您可以將它們以多種方式排序。
+ Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi.
+ Open=false
+--- konqueror/sidebar/trees/history_module/kcmhistory.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/sidebar/trees/history_module/kcmhistory.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -173,7 +173,7 @@
+ Keywords[nl]=geschiedenis,verloop
+ Keywords[nn]=historie,utgår
+ Keywords[nso]=histori,felelwa ke nako
+-Keywords[pa]=history,expire, ਅਤੀਤ
++Keywords[pa]=history,expire,ਅਤੀਤ
+ Keywords[pl]=historia,wygasanie
+ Keywords[pt]=histórico,expirar
+ Keywords[pt_BR]=histórico,expirar
+--- konqueror/konqueror.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/konqueror.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -60,7 +60,7 @@
+ Comment[nn]=Filhandsamar og nettlesar for KDE
+ Comment[nso]=Seinyakisi sa Web & Molaodi wa Faele ya KDE
+ Comment[oc]=Lo gestionari de fiquièrs e navigador Web KDE
+-Comment[pa]=KDE ਫਾਇਲ ਪ੍ਰਬੰਧਕ ਤੇ ਵੈੱਬ ਝਲਕਾਰਾ
++Comment[pa]=KDE ਫਾਇਲ ਪ੍ਰਬੰਧਕ ਅਤੇ ਵੈੱਬ ਝਲਕਾਰਾ
+ Comment[pl]=KDE Menedżer plików i przeglądarka WWW
+ Comment[pt]=Gestor de ficheiros e navegador na WWW
+ Comment[pt_BR]=Gerenciador de Arquivos & Navegador Web do KDE
+--- konqueror/Home.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/Home.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -122,7 +122,7 @@
+ GenericName[nn]=Personlege filer
+ GenericName[nso]=Difaele tsa Botho
+ GenericName[oc]=FiquièRs personals
+-GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲ਼ਾਂ
++GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲਾਂ
+ GenericName[pl]=Pliki osobiste
+ GenericName[pt]=Ficheiros Pessoais
+ GenericName[pt_BR]=Arquivos Pessoais
+--- konqueror/profile_kde_devel.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konqueror/profile_kde_devel.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,7 +35,7 @@
+ Name[nds]=KDE-Entwickeln
+ Name[nl]=KDE-ontwikkeling
+ Name[nn]=KDE-utvikling
+-Name[pa]=KDE ਵਿਕਾਸਵਾਦੀ
++Name[pa]=KDE ਵਿਕਾਸ
+ Name[pl]=Rozwijanie KDE
+ Name[pt]=Desenvolvimento KDE
+ Name[pt_BR]=Desenvolvimento do KDE
+--- knetattach/knetattach.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ knetattach/knetattach.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,7 +31,7 @@
+ GenericName[nds]=Hölper för Nettwarkorner
+ GenericName[nl]=Netwerkmap-assistent
+ GenericName[nn]=Vegvisar for nettverksmappe
+-GenericName[pa]=ਨੈੱਟਵਰਕ ਫੋਲਡਰ ਸਹਾਇਕ
++GenericName[pa]=ਨੈਟਵਰਕ ਫੋਲਡਰ ਸਹਾਇਕ
+ GenericName[pl]=Asystent folderów sieciowych
+ GenericName[pt]=Assistente de Pastas de Rede
+ GenericName[pt_BR]=Assistente de Pastas de Rede
+--- kscreensaver/KRandom.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kscreensaver/KRandom.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -122,7 +122,7 @@
+ Name[nn]=Oppsett ...
+ Name[nso]=Beakanya...
+ Name[oc]=Configuracion...
+-Name[pa]=ਸੈੱਟਅੱਪ...
++Name[pa]=ਸੈਟਅੱਪ...
+ Name[pl]=Ustawienia...
+ Name[pt]=Configurar...
+ Name[pt_BR]=Configurar...
+@@ -187,7 +187,7 @@
+ Name[nds]=In't utsöchte Finster wiesen
+ Name[nl]=In een gedefinieerd venster weergeven
+ Name[nn]=Vis i vald vindauge
+-Name[pa]=ਨਿਰਧਾਰਿਤ ਝਰੋਖਾ ਵਿੱਚ ਵੇਖਾਓ
++Name[pa]=ਦਿੱਤੇ ਝਰੋਖਾ ਵਿੱਚ ਵੇਖਾਓ
+ Name[pl]=Wyświetl w podanym oknie
+ Name[pt]=Mostrar na Janela Indicada
+ Name[pt_BR]=Mostrar em janela especificada
+--- kscreensaver/KBlankscreen.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kscreensaver/KBlankscreen.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -122,7 +122,7 @@
+ Name[nn]=Oppsett ...
+ Name[nso]=Beakanya...
+ Name[oc]=Configuracion...
+-Name[pa]=ਸੈੱਟਅੱਪ...
++Name[pa]=ਸੈਟਅੱਪ...
+ Name[pl]=Ustawienia...
+ Name[pt]=Configurar...
+ Name[pt_BR]=Configurar...
+@@ -187,7 +187,7 @@
+ Name[nds]=In't utsöchte Finster wiesen
+ Name[nl]=In een gedefinieerd venster weergeven
+ Name[nn]=Vis i vald vindauge
+-Name[pa]=ਨਿਰਧਾਰਿਤ ਝਰੋਖਾ ਵਿੱਚ ਵੇਖਾਓ
++Name[pa]=ਦਿੱਤੇ ਝਰੋਖਾ ਵਿੱਚ ਵੇਖਾਓ
+ Name[pl]=Wyświetl w podanym oknie
+ Name[pt]=Mostrar na Janela Indicada
+ Name[pt_BR]=Mostrar em janela especificada
+--- ksplashml/themeengine/standard/ksplashstandard.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ ksplashml/themeengine/standard/ksplashstandard.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Comment[nb]=KSplash programtillegg
+ Comment[nl]=KSplash-plugin
+ Comment[nn]=KSplash-programtillegg
+-Comment[pa]=ਕੇਸਪਲੇਸ ਪਲੱਗਇਨ
++Comment[pa]=ਕੇਸਪਲੇਸ ਪਲੱਗਿੰਨ
+ Comment[pl]=Wtyczka KSplash
+ Comment[pt]='Plugin' do KSplash
+ Comment[pt_BR]=Plug-in do KSplash
+--- ksplashml/themeengine/default/ksplashdefault.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ ksplashml/themeengine/default/ksplashdefault.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Comment[nb]=KSplash programtillegg
+ Comment[nl]=KSplash-plugin
+ Comment[nn]=KSplash-programtillegg
+-Comment[pa]=ਕੇਸਪਲੇਸ ਪਲੱਗਇਨ
++Comment[pa]=ਕੇਸਪਲੇਸ ਪਲੱਗਿੰਨ
+ Comment[pl]=Wtyczka KSplash
+ Comment[pt]='Plugin' do KSplash
+ Comment[pt_BR]=Plug-in do KSplash
+--- ksplashml/themeengine/redmond/ksplashredmond.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ ksplashml/themeengine/redmond/ksplashredmond.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Comment[nb]=KSplash programtillegg
+ Comment[nl]=KSplash-plugin
+ Comment[nn]=KSplash-programtillegg
+-Comment[pa]=ਕੇਸਪਲੇਸ ਪਲੱਗਇਨ
++Comment[pa]=ਕੇਸਪਲੇਸ ਪਲੱਗਿੰਨ
+ Comment[pl]=Wtyczka KSplash
+ Comment[pt]='Plugin' do KSplash
+ Comment[pt_BR]=Plug-in do KSplash
+--- kxkb/keyboard_layout.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kxkb/keyboard_layout.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -56,7 +56,7 @@
+ Name[nn]=Tasteoppsett
+ Name[nso]=Peakanyo ya Keyboard
+ Name[oc]=Disposicion del clavièr
+-Name[pa]=ਕੀ-ਬੋਰਡ ਖਾਕ
++Name[pa]=ਕੀ-ਬੋਰਡ ਖਾਕਾ
+ Name[pl]=Układ klawiatury
+ Name[pt]=Disposição do Teclado
+ Name[pt_BR]=Layout do teclado
+--- kxkb/keyboard.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kxkb/keyboard.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -128,7 +128,7 @@
+ Comment[nn]=Tastaturinnstillingar
+ Comment[nso]=Dipeakanyo tsa Keyboard
+ Comment[oc]=Arranjament dèu teclat
+-Comment[pa]=ਕੀਬੋਰਡ ਵਿਵਸਥਾ
++Comment[pa]=ਕੀਬੋਰਡ ਸੈਟਿੰਗ
+ Comment[pl]=Ustawienia klawiatury
+ Comment[pt]=Configuração do teclado
+ Comment[pt_BR]=Configurações de teclado
+--- libkonq/directory_bookmarkbar.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ libkonq/directory_bookmarkbar.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -49,7 +49,7 @@
+ Name[nn]=Bokmerke-verktøylinje
+ Name[nso]=Bar ya Sebereka sa Tshwao ya Buka
+ Name[oc]=Otilh de puents
+-Name[pa]=ਬੁੱਕਮਾਰਕ ਸੰਦਪੱਟੀ
++Name[pa]=ਬੁੱਕਮਾਰਕ ਸੰਦ-ਪੱਟੀ
+ Name[pl]=Pasek zakładek
+ Name[pt]=Barra de Favoritos
+ Name[pt_BR]=Barra de Ferramenta de Favoritos
+--- libkonq/konqpopupmenuplugin.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ libkonq/konqpopupmenuplugin.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -44,7 +44,7 @@
+ Comment[nl]=Plugin voor Konqueror's contextmenu
+ Comment[nn]=Tillegg til oppsprettmenyen i Konqueror
+ Comment[nso]=Plugin ya Menu wa Thlarogo ya Konqueror
+-Comment[pa]=ਕੋਨਕਿਉਰੋਰ ਪਾਪਅੱਪ ਮੇਨੂ ਲਈ ਪਲੱਗਇਨ
++Comment[pa]=ਕੋਨਕਿਉਰੋਰ ਪਾਪਅੱਪ ਮੇਨੂ ਲਈ ਪਲੱਗਿੰਨ
+ Comment[pl]=Wtyczka do menu (otwieranego przyciskiem myszy) Konquerora
+ Comment[pt]='Plugin' para o Menu do Konqueror
+ Comment[pt_BR]=Plug-in do Konqueror para Menus Flutuantes
+--- khotkeys/kcontrol/khotkeys.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ khotkeys/kcontrol/khotkeys.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -68,7 +68,7 @@
+ Comment[nds]=Tastkombinatschonen instellen
+ Comment[nl]=Sneltoetsen instellen
+ Comment[nn]=Set opp snøggtastar
+-Comment[pa]=ਹਾਟਕੀ ਵਿਵਸਥਾ ਸੰਰਚਨਾ
++Comment[pa]=ਹਾਟਕੀ ਸੈਟਿੰਗ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja skrótów klawiszowych
+ Comment[pt]=Configurar as opções de teclas
+ Comment[pt_BR]=Configura definições de teclas de atalho
+--- kwin/clients/web/web.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/clients/web/web.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -19,7 +19,7 @@
+ Name[mn]=Веб
+ Name[nb]=Nett
+ Name[nn]=Vev
+-Name[pa]=ਵੈੱਬ
++Name[pa]=ਵੈਬ
+ Name[pl]=Sieć
+ Name[se]=Fierpmádat
+ Name[sl]=Splet
+--- kwin/kcmkwin/kwindecoration/kwindecoration.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/kcmkwin/kwindecoration/kwindecoration.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -194,6 +194,7 @@
+ Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza
+ Keywords[vi]=kwin,window,quản lý,biên,kiểu,theme,look,feel,layout,nút,điều khiển,cạnh,kwm,trang trí
+ Keywords[xh]=kwin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso
++Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰
+ Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾
+ Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
+--- kwin/kcmkwin/kwinrules/kwinrules.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/kcmkwin/kwinrules/kwinrules.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,7 +37,7 @@
+ Name[nb]=Innstillinger for vinduer
+ Name[nds]=Instellen för enkelte Finstern
+ Name[nn]=Instillingar for vindauge
+-Name[pa]=ਝਰੋਖਾ-ਖਾਸ ਵਿਵਸਥਾ
++Name[pa]=ਝਰੋਖਾ-ਖਾਸ ਸੈਟਿੰਗ
+ Name[pl]=Ustawienia danego okna
+ Name[pt]=Opções Específicas a Janela
+ Name[pt_BR]=Configurações Específicas da Janela
+@@ -52,6 +52,7 @@
+ Name[ta]=சாளர-குறிப்பிடும் அமைப்புகள்
+ Name[tg]=Параметрҳои махсуси равзана
+ Name[uk]=Параметри для окремих вікон
++Name[zh_CN]=特定窗口的设置
+ 
+ Comment=Configure settings specifically for a window
+ Comment[af]=Stel spesifieke venster waardes op
+@@ -85,7 +86,7 @@
+ Comment[nds]=Instellen för enkelte Finstern
+ Comment[nl]=Hier kunt u instellingen kiezen specifiek voor één venster
+ Comment[nn]=Innstillingar som er knytte til eitt særskilt vindauge
+-Comment[pa]=ਇੱਕ ਝਰੋਖੇ ਲਈ ਖਾਸ ਵਿਵਸਥਾ ਸੰਰਚਨਾ
++Comment[pa]=ਇੱਕ ਝਰੋਖੇ ਲਈ ਖਾਸ ਸੈਟਿੰਗ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja ustawień wybranego okna
+ Comment[pt]=Configura as opções especificamente para uma janela
+ Comment[pt_BR]=Configurações específicas para uma janela
+--- kwin/kcmkwin/kwinoptions/kwinmoving.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/kcmkwin/kwinoptions/kwinmoving.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -189,5 +189,6 @@
+ Keywords[ven]=tshimbila,zwavhudi,cascade,engedza,engedza,fhethu ha snap,snap,mukano+-
+ Keywords[vi]=di chuyển,thông minh,tầng,phóng to,phóng to,vùng thả,thả,biên
+ Keywords[xh]=iyashukuma,iyabukeka,cascade,yenza nkulu,yenza nkulu,yandisa,snap zone,snap,umda
++Keywords[zh_CN]=moving,smart,cascade,maximize,maximise,snap zone,snap,border,移动,智能,层叠,最大化,最小化,吸附区域,边框
+ Keywords[zh_TW]=moving,smart,cascade,maximize,maximise,snap zone,snap,border,移動,聰明,最大化,邊框
+ Keywords[zu]=iyanyakaza,okukhaliphile,landelanisa,khulisa,khulisa,indawo yokunamathisela,namathisela,umngcele
+--- kwin/kcmkwin/kwinoptions/kwinactions.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/kcmkwin/kwinoptions/kwinactions.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -118,7 +118,7 @@
+ Comment[nl]=Hier kunt u de instellingen van toetsenbord en muis instellen
+ Comment[nn]=Innstillingar for tastatur og mus
+ Comment[nso]=Beakanya dipeakanyo tsa legotlo le keyboard
+-Comment[pa]=ਕੀਬੋਰਡ ਤੇ ਮਾਊਸ ਵਿਵਸਥਾ ਦੀ ਸੰਰਚਨਾ
++Comment[pa]=ਕੀਬੋਰਡ ਅਤੇ ਮਾਊਸ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ
+ Comment[pl]=Konfiguracja ustawień klawiatury i myszy
+ Comment[pt]=Configuração das opções do teclado e do rato
+ Comment[pt_BR]=Configura as preferências de teclado e mouse
+@@ -194,5 +194,6 @@
+ Keywords[ven]=kovhekana,engedza,engedza,fhungudza,fhungudza,fhasi,mashumele a menu, bara ya thoho,uitulula saizi
+ Keywords[vi]=mờ,phóng to,phóng to,thu nhỏ,thu nhỏ,hạ thấp,các thao tác trên thực đơn,tên thanh,thay đổi cỡ
+ Keywords[xh]=umthunzi,yandisa,yandisa,ncipisa nciphisa,yehlisa,menu zemisebenzi,iba yewonga,yenza ubungakanani kwakhona
++Keywords[zh_CN]=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize,卷起,最大化,最小化,降低,操作菜单,标题栏,缩放
+ Keywords[zh_TW]=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize,收起,最大化,最小化,降下,操作選單,標題列,重設大小
+ Keywords[zu]=umthunzi,khulisa,khulisa,nciphisa,nciphisa,okungezansi, imenu yemisebenzi,ibha yesihloko,shintsha usayizi
+--- kwin/kcmkwin/kwinoptions/kwintranslucency.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/kcmkwin/kwinoptions/kwintranslucency.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,6 +50,7 @@
+ Name[ta]=ஒளிகசிவு
+ Name[tg]=Нимшаффоф
+ Name[uk]=Прозорість
++Name[zh_CN]=透明度
+ 
+ Comment=Configure window translucency and shadow management
+ Comment[af]=Stel venster deurskynheid en skaduwees op
+@@ -89,6 +90,7 @@
+ Comment[ta]=சாளர ஒளிகசிவு மற்றும் நிழல் மேலாண்மையை வடிவமை
+ Comment[tg]=Танзимоти нимшаффофӣ ва сояҳои равзана
+ Comment[uk]=Налаштування прозорості вікон та керування затіненням
++Comment[zh_CN]=配置窗口透明度和阴影管理
+ 
+ Keywords=translucency,transparence,shadows
+ Keywords[bg]=полупрозрачност, прозрачност, сянка, сенки, translucency, transparence, shadows
+--- kwin/kcmkwin/kwinoptions/kwinoptions.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/kcmkwin/kwinoptions/kwinoptions.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -183,4 +183,5 @@
+ Keywords[tr]=odak,odak davranış biçimi,pencere yerleşimi,pencere davranışı,Yerleşim davranış biçimi,animasyon,kaldır,otomatik kaldır,çerçeve,çift tıkla
+ Keywords[uk]=фокус,розташовування,поведінка вікна,анімація,підняти,піднімати автоматично,вікна,рамка,заголовок,подвійне клацання
+ Keywords[uz]=фокуслаш,жойлашиш,ойнанинг хусусиятлари,анимация,олдинга,авто-олдинга,ойналар,фрейм,сарлавҳа,икки марта босиш
++Keywords[zh_CN]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick,焦点,放置,窗口行为,动画,升起,自动升起,窗口,框架,标题栏,双击
+ Categories=Qt;KDE;X-KDE-settings-desktop;
+--- kwin/client.h	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/client.h	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -96,10 +96,10 @@
+             SizemodeAny,
+             SizemodeFixedW, // try not to affect width
+             SizemodeFixedH, // try not to affect height
+-            SizemodeMax, // try not to make it larger in either direction
+-            SizemodeShaded // shaded - height == 0
++            SizemodeMax // try not to make it larger in either direction
+             };
+         QSize adjustedSize( const QSize&, Sizemode mode = SizemodeAny ) const;
++        QSize adjustedSize() const;
+ 
+         QPixmap icon() const;
+         QPixmap miniIcon() const;
+@@ -380,6 +380,7 @@
+         NETExtendedStrut strut() const;
+         bool hasStrut() const;
+         int checkShadeGeometry( int w, int h );
++        void postponeGeometryUpdates( bool postpone );
+ 
+         bool startMoveResize();
+         void finishMoveResize( bool cancel );
+@@ -515,7 +516,8 @@
+         unsigned long allowed_actions;
+         QRect frame_geometry;
+         QSize client_size;
+-        int block_geometry; // >0 - new geometry is remembered, but not actually set
++        int postpone_geometry_updates; // >0 - new geometry is remembered, but not actually set
++        bool pending_geometry_update;
+         bool shade_geometry_change;
+         int border_left, border_right, border_top, border_bottom;
+         QRegion _mask;
+@@ -524,6 +526,7 @@
+         friend struct FetchNameInternalPredicate;
+         friend struct CheckIgnoreFocusStealingProcedure;
+         friend struct ResetupRulesProcedure;
++        friend class GeometryUpdatesPostponer;
+         void show() { assert( false ); } // SELI remove after Client is no longer QWidget
+         void hide() { assert( false ); }
+         uint opacity_;
+@@ -536,6 +539,19 @@
+         
+     };
+ 
++// helper for Client::postponeGeometryUpdates() being called in pairs (true/false)
++class GeometryUpdatesPostponer
++    {
++    public:
++        GeometryUpdatesPostponer( Client* c )
++            : cl( c ) { cl->postponeGeometryUpdates( true ); }
++        ~GeometryUpdatesPostponer()
++            { cl->postponeGeometryUpdates( false ); }
++    private:
++        Client* cl;
++    };
++
++
+ // NET WM Protocol handler class
+ class WinInfo : public NETWinInfo
+     {
+--- kwin/manage.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/manage.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,7 +43,8 @@
+     grabXServer();
+ 
+     // from this place on, manage() mustn't return false
+-    block_geometry = 1;
++    postpone_geometry_updates = 1;
++    pending_geometry_update = true; // force update when finishing with geometry changes
+ 
+     embedClient( w, attr );
+ 
+--- kwin/rules.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/rules.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -758,8 +758,9 @@
+         { // apply force rules
+         // Placement - does need explicit update, just like some others below
+         // Geometry : setGeometry() doesn't check rules
+-        QRect geom = client_rules.checkGeometry( geometry());
+-        if( geom != geometry())
++    QRect orig_geom = QRect( pos(), sizeForClientSize( clientSize())); // handle shading
++    QRect geom = client_rules.checkGeometry( orig_geom );
++    if( geom != orig_geom )
+             setGeometry( geom );
+         // MinSize, MaxSize handled by Geometry
+         // IgnorePosition
+@@ -785,7 +786,7 @@
+             workspace()->activateNextClient( this );
+         // MoveResizeMode
+         // Closeable
+-        QSize s = adjustedSize( size());
++    QSize s = adjustedSize();
+         if( s != size())
+             resizeWithChecks( s );
+         setShortcut( rules()->checkShortcut( shortcut().toString()));
+--- kwin/layers.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/layers.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -723,8 +723,8 @@
+     const Client* ac = workspace()->mostRecentlyActivatedClient(); // instead of activeClient() - avoids flicker
+     const Client* top = workspace()->topClientOnDesktop( desktop(), true );
+     if( isFullScreen() && ac != NULL && top != NULL
+-        && ( ac == this || this->hasTransient( ac, true ))
+-        && ( top == this || this->hasTransient( top, true )))
++          && ( ac == this || this->group() == ac->group())
++          && ( top == this || this->group() == top->group()))
+         return ActiveLayer;
+     if( keepAbove())
+         return AboveLayer;
+--- kwin/eventsrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/eventsrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -1897,7 +1897,7 @@
+ Name[nds]=Finster minimeert
+ Name[nl]=Venster minimaliseren
+ Name[nn]=Minimer vindauge
+-Name[pa]=ਝਰੋਖਾ ਨਿਊਨਤਮ
++Name[pa]=ਝਰੋਖਾ ਘੱਟੋ-ਘੱਟ
+ Name[pl]=Minimalizacja okna
+ Name[pt]=Minimizar Janela
+ Name[pt_BR]=Minimizar Janela
+@@ -1954,7 +1954,7 @@
+ Comment[nds]=En Finster warrt minimeert
+ Comment[nl]=Een venster is geminimaliseerd
+ Comment[nn]=Eit vindauge vert minimert
+-Comment[pa]=ਇੱਕ ਝਰੋਖਾ ਨਿਊਨਤਮ
++Comment[pa]=ਇੱਕ ਝਰੋਖਾ ਘੱਟੋ-ਘੱਟ
+ Comment[pl]=Okno jest minimalizowane
+ Comment[pt]=Uma janela é minimizada
+ Comment[pt_BR]=Uma janela é minimizada
+@@ -2014,7 +2014,7 @@
+ Name[nds]=Finster wedder wiesen
+ Name[nl]=Minimalisatie van venster ongedaan maken
+ Name[nn]=Gjenopprett vindauge
+-Name[pa]=ਝਰੋਖਾ ਨਾ-ਨਿਊਨਤਮ
++Name[pa]=ਝਰੋਖਾ ਨਾ-ਘੱਟੋ-ਘੱਟ
+ Name[pl]=Powrót ze stanu minimalizacji okna
+ Name[pt]=Desminimizar Janela
+ Name[pt_BR]=Desminimizar Janela
+@@ -2136,7 +2136,7 @@
+ Name[nn]=Maksimer vindauge
+ Name[nso]=Koketso ya Window
+ Name[oc]=Maximitza finestra
+-Name[pa]=ਝਰੋਖਾ ਅਧਿਕਤਮ
++Name[pa]=ਝਰੋਖਾ ਵੱਧੋ-ਵੱਧ
+ Name[pl]=Maksymalizacja okna
+ Name[pt]=Maximizar Janela
+ Name[pt_BR]=Maximizar Janela
+@@ -2197,7 +2197,7 @@
+ Comment[nds]=En Finster warrt maximeert
+ Comment[nl]=Een venster is gemaximaliseerd
+ Comment[nn]=Eit vindauge vert maksimert
+-Comment[pa]=ਇੱਕ ਝਰੋਖਾ ਅਧਿਕਤਮ
++Comment[pa]=ਇੱਕ ਝਰੋਖਾ ਵੱਧੋ-ਵੱਧ
+ Comment[pl]=Okno jest maksymalizowane
+ Comment[pt]=Uma janela é maximizada
+ Comment[pt_BR]=Uma janela é maximizada
+@@ -2265,7 +2265,7 @@
+ Name[nn]=Gjenopprett vindauge
+ Name[nso]=Phokotso ya Window
+ Name[oc]=Demaximitza finestra
+-Name[pa]=ਝਰੋਖਾ ਨਾ-ਅਧਿਕਤਮ
++Name[pa]=ਝਰੋਖਾ ਨਾ-ਵੱਧੋ-ਵੱਧ
+ Name[pl]=Powrót ze stanu maksymalizacji okna
+ Name[pt]=Reduzir Janela
+ Name[pt_BR]=Desmaximizar Janela
+@@ -2323,7 +2323,7 @@
+ Comment[nds]=En Finster is nich mehr maximeert
+ Comment[nl]=Een venster verliest maximalisatie
+ Comment[nn]=Eit vindauge mister maksimering
+-Comment[pa]=ਇੱਕ ਝਰੋਖਾ ਢਿੱਲਾ ਅਧਿਕਤਮ
++Comment[pa]=ਇੱਕ ਝਰੋਖਾ ਢਿੱਲਾ ਵੱਧੋ-ਵੱਧ
+ Comment[pl]=Okno przestaje być zmaksymalizowane
+ Comment[pt]=Uma janela deixa de estar maximizada
+ Comment[pt_BR]=Uma janela perde a maximização
+@@ -2381,7 +2381,7 @@
+ Name[nds]=Finster op all Schriefdischen
+ Name[nl]=Venster op alle bureaubladen
+ Name[nn]=Vindauge på alle skrivebord
+-Name[pa]=ਝਰੋਖਾ ਸਾਰੇ ਵਿਹੜਿਆਂ ਤੇ
++Name[pa]=ਝਰੋਖਾ ਸਭ ਵਿਹੜਿਆਂ 'ਤੇ
+ Name[pl]=Pokazywanie okna na wszystkich pulpitach
+ Name[pt]=Janela em Todos os Ecrãs
+ Name[pt_BR]=Janela em Todas as Áreas de Trabalho
+@@ -2614,7 +2614,7 @@
+ Name[nl]=Nieuw dialoog
+ Name[nn]=Ny dialogboks
+ Name[nso]=Poledisano ye Ntshwa
+-Name[pa]=ਨਵੀਂ ਤਖਤੀ
++Name[pa]=ਨਵਾਂ ਵਾਰਤਾਲਾਪ
+ Name[pl]=Nowe okno dialogowe
+ Name[pt]=Nova Janela
+ Name[pt_BR]=Novo Diálogo
+@@ -2672,7 +2672,7 @@
+ Comment[nds]=En kortwielig Finster (Dialoog) dukt op
+ Comment[nl]=Een dialoog verschijnt
+ Comment[nn]=Mellombels vindauge (ein dialog) vert opna
+-Comment[pa]=ਗੱਲਬਾਤ ਝਰੋਖਾ(ਤਖਤੀ) ਉਪਲੱਬਧ
++Comment[pa]=ਗੱਲਬਾਤ ਝਰੋਖਾ (ਇੱਕ ਵਾਰਤਾਲਾਪ) ਉਪਲੱਬਧ
+ Comment[pl]=Pojawia siÄ™ tymczaowe okno dialogowe
+ Comment[pt]=Uma janela transitória (uma janela de diálogo) aparece
+ Comment[pt_BR]=Aparece uma janela transiente (um diálogo)
+@@ -2738,7 +2738,7 @@
+ Name[nl]=Dialoog verwijderen
+ Name[nn]=Fjern dialogboks
+ Name[nso]=Tlosa Poledisano
+-Name[pa]=ਤਖਤੀ ਹਟਾਓ
++Name[pa]=ਵਾਰਤਾਲਾਪ ਹਟਾਓ
+ Name[pl]=Usunięcie okna dialogowego
+ Name[pt]=Apagar Janela
+ Name[pt_BR]=Remover Diálogo
+@@ -2796,7 +2796,7 @@
+ Comment[nds]=En kortwielig Finster (Dialoog) verswinnt
+ Comment[nl]=Een dialoog is gesloten
+ Comment[nn]=Mellombels vindauge (ein dialog) vert lukka
+-Comment[pa]=ਗੱਲਬਾਤ ਝਰੋਖਾ(ਤਖਤੀ) ਹਟੀਂ
++Comment[pa]=ਗੱਲਬਾਤ ਝਰੋਖਾ (ਇੱਕ ਵਾਰਤਾਲਾਪ) ਹਟੀਂ
+ Comment[pl]=Znika tymczasowe okno dialogowe
+ Comment[pt]=Uma janela transitória (uma janela de diálogo) desaparece
+ Comment[pt_BR]=Uma janela transiente (um diálogo) é removida
+@@ -3179,6 +3179,7 @@
+ Comment[uk]=Початок зміни розміру вікна
+ Comment[uz]=Ойнанинг ўлчами ўзгариб бошлади
+ Comment[wa]=On purnea a cmincî a candjî s' grandeu
++Comment[zh_CN]=窗口开始缩放
+ default_presentation=0
+ 
+ [resizeend]
+@@ -3300,4 +3301,5 @@
+ Comment[uk]=Завершення зміни розміру вікна
+ Comment[uz]=Ойнанинг ўлчами ўзгариб бўлди
+ Comment[wa]=On purnea a fini d' candjî s' grandeu
++Comment[zh_CN]=窗口完成缩放
+ default_presentation=0
+--- kwin/client.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/client.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -86,7 +86,8 @@
+         process_killer( NULL ),
+         user_time( CurrentTime ), // not known yet
+         allowed_actions( 0 ),
+-        block_geometry( 0 ),
++        postpone_geometry_updates( 0 ),
++        pending_geometry_update( false ),
+         shade_geometry_change( false ),
+         border_left( 0 ),
+         border_right( 0 ),
+@@ -159,7 +160,7 @@
+     assert( client == None );
+     assert( frame == None && wrapper == None );
+     assert( decoration == NULL );
+-    assert( block_geometry == 0 );
++    assert( postpone_geometry_updates == 0 );
+     assert( !check_active_modal );
+     delete info;
+     delete bridge;
+@@ -181,7 +182,8 @@
+     if (moveResizeMode)
+        leaveMoveResize();
+     finishWindowRules();
+-    ++block_geometry;
++    ++postpone_geometry_updates;
++    setMappingState( WithdrawnState );
+     setModal( false ); // otherwise its mainwindow wouldn't get focus
+     hidden = true; // so that it's not considered visible anymore (can't use hideClient(), it would set flags)
+     if( !on_shutdown )
+@@ -214,13 +216,12 @@
+         // may do map+unmap before we initially map the window by calling rawShow() from manage().
+         XUnmapWindow( qt_xdisplay(), client ); 
+         }
+-    setMappingState( WithdrawnState ); // after all is done, tell the app
+     client = None;
+     XDestroyWindow( qt_xdisplay(), wrapper );
+     wrapper = None;
+     XDestroyWindow( qt_xdisplay(), frame );
+     frame = None;
+-    --block_geometry;
++    --postpone_geometry_updates; // don't use GeometryUpdatesBlocker, it would now set the geometry
+     deleteClient( this, Allowed );
+     }
+ 
+@@ -232,7 +233,7 @@
+     if (moveResizeMode)
+        leaveMoveResize();
+     finishWindowRules();
+-    ++block_geometry;
++    ++postpone_geometry_updates;
+     setModal( false );
+     hidden = true; // so that it's not considered visible anymore
+     workspace()->clientHidden( this );
+@@ -244,7 +245,7 @@
+     wrapper = None;
+     XDestroyWindow( qt_xdisplay(), frame );
+     frame = None;
+-    --block_geometry;
++    --postpone_geometry_updates; // don't use GeometryUpdatesBlocker, it would now set the geometry
+     deleteClient( this, Allowed );
+     }
+ 
+@@ -254,7 +255,7 @@
+                     || ( decoration != NULL && !noBorder())))
+         return;
+     bool do_show = false;
+-    ++block_geometry;
++    postponeGeometryUpdates( true );
+     if( force )
+         destroyDecoration();
+     if( !noBorder())
+@@ -270,10 +271,7 @@
+         int save_workarea_diff_x = workarea_diff_x;
+         int save_workarea_diff_y = workarea_diff_y;
+         move( calculateGravitation( false ));
+-        if( !isShade())
+-            plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
+-        else
+-            plainResize( sizeForClientSize( QSize( clientSize().width(), 0 ), SizemodeShaded ), ForceGeometrySet );
++        plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
+         workarea_diff_x = save_workarea_diff_x;
+         workarea_diff_y = save_workarea_diff_y;
+         do_show = true;
+@@ -282,8 +280,7 @@
+         destroyDecoration();
+     if( check_workspace_pos )
+         checkWorkspacePosition();
+-    --block_geometry;
+-    setGeometry( geometry(), ForceGeometrySet );
++    postponeGeometryUpdates( false );
+     if( do_show )
+         decoration->widget()->show();
+     updateFrameStrut();
+@@ -300,10 +297,7 @@
+         setMask( QRegion()); // reset shape mask
+         int save_workarea_diff_x = workarea_diff_x;
+         int save_workarea_diff_y = workarea_diff_y;
+-        if( !isShade())
+-            plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
+-        else
+-            plainResize( sizeForClientSize( QSize( clientSize().width(), 0 ), SizemodeShaded ), ForceGeometrySet );
++        plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
+         move( grav );
+         workarea_diff_x = save_workarea_diff_x;
+         workarea_diff_y = save_workarea_diff_y;
+@@ -319,7 +313,7 @@
+     if( new_left == border_left && new_right == border_right
+         && new_top == border_top && new_bottom == border_bottom )
+         return;
+-    ++block_geometry;
++    GeometryUpdatesPostponer blocker( this );
+     move( calculateGravitation( true ));
+     border_left = new_left;
+     border_right = new_right;
+@@ -330,8 +324,6 @@
+     move( calculateGravitation( false ));
+     plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
+     checkWorkspacePosition();
+-    --block_geometry;
+-    setGeometry( geometry(), ForceGeometrySet );
+     }
+ 
+ void Client::detectNoBorder()
+@@ -739,7 +731,7 @@
+         }
+ 
+     assert( decoration != NULL ); // noborder windows can't be shaded
+-    ++block_geometry;
++    GeometryUpdatesPostponer blocker( this );
+     // decorations may turn off some borders when shaded
+     decoration->borders( border_left, border_right, border_top, border_bottom );
+ 
+@@ -753,7 +745,8 @@
+         // shade
+         int h = height();
+         shade_geometry_change = true;
+-        QSize s( sizeForClientSize( QSize( clientSize().width(), 0), SizemodeShaded ) );
++        QSize s( sizeForClientSize( QSize( clientSize())));
++        s.setHeight( border_top + border_bottom );
+         XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify
+         XUnmapWindow( qt_xdisplay(), wrapper );
+         XUnmapWindow( qt_xdisplay(), client );
+@@ -773,8 +766,8 @@
+             } while ( h > s.height() + step );
+ //        if ( !wasStaticContents )
+ //            clearWFlags( WStaticContents );
+-        shade_geometry_change = false;
+         plainResize( s );
++        shade_geometry_change = false;
+         if( isActive())
+             {
+             if( was_shade_mode == ShadeHover )
+@@ -790,7 +783,7 @@
+         {
+         int h = height();
+         shade_geometry_change = true;
+-        QSize s( sizeForClientSize( clientSize(), SizemodeShaded ));
++        QSize s( sizeForClientSize( clientSize()));
+ // FRAME       bool wasStaticContents = testWFlags( WStaticContents );
+ //        setWFlags( WStaticContents );
+         int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
+@@ -817,8 +810,6 @@
+             workspace()->requestFocus( this );
+         }
+     checkMaximizeGeometry();
+-    --block_geometry;
+-    setGeometry( geometry(), ForceGeometrySet );
+     info->setState( isShade() ? NET::Shaded : 0, NET::Shaded );
+     info->setState( isShown( false ) ? 0 : NET::Hidden, NET::Hidden );
+     setMappingState( isShown( false ) && isOnCurrentDesktop() ? NormalState : IconicState );
+@@ -884,12 +875,8 @@
+     XChangeProperty(qt_xdisplay(), window(), qt_wm_state, qt_wm_state, 32,
+         PropModeReplace, (unsigned char *)data, 2);
+ 
+-    if( was_unmanaged ) // force setting the geometry, manage() did block_geometry = 1
+-        {
+-        assert( block_geometry == 1 );
+-        --block_geometry;
+-        setGeometry( frame_geometry, ForceGeometrySet );
+-        }
++    if( was_unmanaged ) // manage() did postpone_geometry_updates = 1, now it's ok to finally set the geometry
++        postponeGeometryUpdates( false );
+     }
+ 
+ /*!
+--- kwin/geometry.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kwin/geometry.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -1011,6 +1011,13 @@
+     return sizeForClientSize( wsize, mode, false );
+     }
+ 
++// this helper returns proper size even if the window is shaded
++// see also the comment in Client::setGeometry()
++QSize Client::adjustedSize() const
++    {
++    return sizeForClientSize( clientSize());
++    }
++
+ /*!
+   Calculate the appropriate frame size for the given client size \a
+   wsize.
+@@ -1023,6 +1030,11 @@
+     {
+     int w = wsize.width();
+     int h = wsize.height();
++    if( w < 1 || h < 1 )
++        {
++        kdWarning() << "sizeForClientSize() with empty size!" << endl;
++        kdWarning() << kdBacktrace() << endl;
++        }
+     if (w<1) w = 1;
+     if (h<1) h = 1;
+ 
+@@ -1165,8 +1177,6 @@
+                 ASPECT_CHECK_GROW_H
+                 break;
+                 }
+-            case SizemodeShaded:
+-                break;
+             }
+ #undef ASPECT_CHECK_SHRINK_H_GROW_W
+ #undef ASPECT_CHECK_SHRINK_W_GROW_H
+@@ -1189,10 +1199,7 @@
+         w += border_left + border_right;
+         h += border_top + border_bottom;
+         }
+-    QSize ret = rules()->checkSize( QSize( w, h ));
+-    if ( mode == SizemodeShaded && wsize.height() == 0 )
+-        ret.setHeight( noframe ? 0 : border_top + border_bottom );
+-    return ret;
++    return rules()->checkSize( QSize( w, h ));
+     }
+ 
+ /*!
+@@ -1253,7 +1260,7 @@
+         xSizeHint.win_gravity = NorthWestGravity;
+     if( isManaged())
+         { // update to match restrictions
+-        QSize new_size = adjustedSize( size());
++        QSize new_size = adjustedSize();
+         if( new_size != size() && !isFullScreen())
+             resizeWithChecks( new_size );
+         }
+@@ -1395,7 +1402,7 @@
+             || ns != size())
+             {
+             QRect orig_geometry = geometry();
+-            ++block_geometry;
++            GeometryUpdatesPostponer blocker( this );
+             move( new_pos );
+             plainResize( ns );
+             setGeometry( QRect( calculateGravitation( false, gravity ), size()));
+@@ -1404,8 +1411,6 @@
+             if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen()
+                 && area.contains( orig_geometry ))
+                 keepInArea( area );
+-            --block_geometry;
+-            setGeometry( geometry(), ForceGeometrySet );
+ 
+             // this is part of the kicker-xinerama-hack... it should be
+             // safe to remove when kicker gets proper ExtendedStrut support;
+@@ -1430,7 +1435,7 @@
+         if( ns != size())  // don't restore if some app sets its own size again
+             {
+             QRect orig_geometry = geometry();
+-            ++block_geometry;
++            GeometryUpdatesPostponer blocker( this );
+             int save_gravity = xSizeHint.win_gravity;
+             xSizeHint.win_gravity = gravity;
+             resizeWithChecks( ns );
+@@ -1440,8 +1445,6 @@
+             if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen()
+                 && area.contains( orig_geometry ))
+                 keepInArea( area );
+-            --block_geometry;
+-            setGeometry( geometry(), ForceGeometrySet );
+             }
+         }
+     // No need to send synthetic configure notify event here, either it's sent together
+@@ -1451,6 +1454,16 @@
+ 
+ void Client::resizeWithChecks( int w, int h, ForceGeometry_t force )
+     {
++    if( shade_geometry_change )
++        assert( false );
++    else if( isShade())
++        {
++        if( h == border_top + border_bottom )
++            {
++            kdWarning() << "Shaded geometry passed for size:" << endl;
++            kdWarning() << kdBacktrace() << endl;
++            }
++        }
+     int newx = x();
+     int newy = y();
+     QRect area = workspace()->clientArea( WorkArea, this );
+@@ -1605,39 +1618,85 @@
+  */
+ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force )
+     {
++    // this code is also duplicated in Client::plainResize()
++    // Ok, the shading geometry stuff. Generally, code doesn't care about shaded geometry,
++    // simply because there are too many places dealing with geometry. Those places
++    // ignore shaded state and use normal geometry, which they usually should get
++    // from adjustedSize(). Such geometry comes here, and if the window is shaded,
++    // the geometry is used only for client_size, since that one is not used when
++    // shading. Then the frame geometry is adjusted for the shaded geometry.
++    // This gets more complicated in the case the code does only something like
++    // setGeometry( geometry()) - geometry() will return the shaded frame geometry.
++    // Such code is wrong and should be changed to handle the case when the window is shaded,
++    // for example using Client::clientSize().
++    if( shade_geometry_change )
++        ; // nothing
++    else if( isShade())
++        {
++        if( h == border_top + border_bottom )
++            {
++            kdDebug() << "Shaded geometry passed for size:" << endl;
++            kdDebug() << kdBacktrace() << endl;
++            }
++        else
++            {
++            client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
++            h = border_top + border_bottom;
++            }
++        }
++    else
++        {
++        client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
++        }
+     if( force == NormalGeometrySet && frame_geometry == QRect( x, y, w, h ))
+         return;
+-    h = checkShadeGeometry( w, h );
+     frame_geometry = QRect( x, y, w, h );
+-    if( !isShade())
+-        client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
+-    else
+-        client_size = QSize( w - border_left - border_right, client_size.height());
+     updateWorkareaDiffs();
+-    if( block_geometry == 0 )
++    if( postpone_geometry_updates != 0 )
+         {
+-        XMoveResizeWindow( qt_xdisplay(), frameId(), x, y, w, h );
+-        resizeDecoration( QSize( w, h ));
+-        if( !isShade())
+-            {
+-            QSize cs = clientSize();
+-            XMoveResizeWindow( qt_xdisplay(), wrapperId(), clientPos().x(), clientPos().y(),
+-                cs.width(), cs.height());
+-    	    // FRAME tady poradi tak, at neni flicker
+-            XMoveResizeWindow( qt_xdisplay(), window(), 0, 0, cs.width(), cs.height());
+-            }
+-        if( shape())
+-            updateShape();
+-        // SELI TODO won't this be too expensive?
+-        updateWorkareaDiffs();
+-        sendSyntheticConfigureNotify();
+-        updateWindowRules();
+-        checkMaximizeGeometry();
++        pending_geometry_update = true;
++        return;
+         }
++    XMoveResizeWindow( qt_xdisplay(), frameId(), x, y, w, h );
++    resizeDecoration( QSize( w, h ));
++    if( !isShade())
++        {
++        QSize cs = clientSize();
++        XMoveResizeWindow( qt_xdisplay(), wrapperId(), clientPos().x(), clientPos().y(),
++            cs.width(), cs.height());
++        XMoveResizeWindow( qt_xdisplay(), window(), 0, 0, cs.width(), cs.height());
++        }
++    if( shape())
++        updateShape();
++    // SELI TODO won't this be too expensive?
++    updateWorkareaDiffs();
++    sendSyntheticConfigureNotify();
++    updateWindowRules();
++    checkMaximizeGeometry();
+     }
+ 
+ void Client::plainResize( int w, int h, ForceGeometry_t force )
+     {
++    // this code is also duplicated in Client::setGeometry(), and it's also commented there
++    if( shade_geometry_change )
++        ; // nothing
++    else if( isShade())
++        {
++        if( h == border_top + border_bottom )
++            {
++            kdDebug() << "Shaded geometry passed for size:" << endl;
++            kdDebug() << kdBacktrace() << endl;
++            }
++        else
++            {
++            client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
++            h = border_top + border_bottom;
++            }
++        }
++    else
++        {
++        client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
++        }
+     if( QSize( w, h ) != rules()->checkSize( QSize( w, h )))
+         {
+         kdDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h )) << endl;
+@@ -1645,49 +1704,28 @@
+         }
+     if( force == NormalGeometrySet && frame_geometry.size() == QSize( w, h ))
+         return;
+-    h = checkShadeGeometry( w, h );
+     frame_geometry.setSize( QSize( w, h ));
+-    if( !isShade())
+-        client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
+-    else
+-        client_size = QSize( w - border_left - border_right, client_size.height());
+     updateWorkareaDiffs();
+-    if( block_geometry == 0 )
++    if( postpone_geometry_updates != 0 )
+         {
+-        XResizeWindow( qt_xdisplay(), frameId(), w, h );
+-        resizeDecoration( QSize( w, h ));
+-        if( !isShade())
+-            {
+-            QSize cs = clientSize();
+-            XMoveResizeWindow( qt_xdisplay(), wrapperId(), clientPos().x(), clientPos().y(),
+-                cs.width(), cs.height());
+-            XMoveResizeWindow( qt_xdisplay(), window(), 0, 0, cs.width(), cs.height());
+-            }
+-        if( shape())
+-            updateShape();
+-        updateWorkareaDiffs();
+-        sendSyntheticConfigureNotify();
+-        updateWindowRules();
+-        checkMaximizeGeometry();
++        pending_geometry_update = true;
++        return;
+         }
+-    }
+-
+-// There may be cases when an application requests resizing while shaded,
+-// and even KWin itself may do so somewhere (too many places to check :-/ ).
+-// If the requested geometry doesn't fit shaded geometry, adjust the height
+-// of the requested geometry and return it.
+-int Client::checkShadeGeometry( int w, int h )
+-    {
+-    // check that the frame is not resized to full size when it should be shaded
+-    if( isShade() && !shade_geometry_change && h != border_top + border_bottom )
++    XResizeWindow( qt_xdisplay(), frameId(), w, h );
++    resizeDecoration( QSize( w, h ));
++    if( !isShade())
+         {
+-        kdDebug() << "Fixing shaded geometry:" << this << endl;
+-        // adjust the client size to match the newly requested geometry
+-        client_size = adjustedSize( QSize( w, h ));
+-//        checkMaximizeGeometry(); // doesn't work, actual setting of geometry changes this again
+-        h = border_top + border_bottom;
++        QSize cs = clientSize();
++        XMoveResizeWindow( qt_xdisplay(), wrapperId(), clientPos().x(), clientPos().y(),
++            cs.width(), cs.height());
++        XMoveResizeWindow( qt_xdisplay(), window(), 0, 0, cs.width(), cs.height());
+         }
+-    return h;
++    if( shape())
++        updateShape();
++    updateWorkareaDiffs();
++    sendSyntheticConfigureNotify();
++    updateWindowRules();
++    checkMaximizeGeometry();
+     }
+ 
+ /*!
+@@ -1699,16 +1737,42 @@
+         return;
+     frame_geometry.moveTopLeft( QPoint( x, y ));
+     updateWorkareaDiffs();
+-    if( block_geometry == 0 )
++    if( postpone_geometry_updates != 0 )
+         {
+-        XMoveWindow( qt_xdisplay(), frameId(), x, y );
+-        sendSyntheticConfigureNotify();
+-        updateWindowRules();
+-        checkMaximizeGeometry();
++        pending_geometry_update = true;
++        return;
+         }
++    XMoveWindow( qt_xdisplay(), frameId(), x, y );
++    sendSyntheticConfigureNotify();
++    updateWindowRules();
++    checkMaximizeGeometry();
+     }
+ 
+ 
++void Client::postponeGeometryUpdates( bool postpone )
++    {
++    if( postpone )
++        {
++        if( postpone_geometry_updates == 0 )
++            pending_geometry_update = false;
++        ++postpone_geometry_updates;
++        }
++    else
++        {
++        if( --postpone_geometry_updates == 0 )
++            {
++            if( pending_geometry_update )
++                {
++                if( isShade())
++                    setGeometry( QRect( pos(), adjustedSize()), ForceGeometrySet );
++                else
++                    setGeometry( geometry(), ForceGeometrySet );
++                pending_geometry_update = false;
++                }
++            }
++        }
++    }
++
+ void Client::maximize( MaximizeMode m )
+     {
+     setMaximize( m & MaximizeVertical, m & MaximizeHorizontal );
+@@ -1744,7 +1808,7 @@
+     if( !adjust && max_mode == old_mode )
+         return;
+ 
+-    ++block_geometry; // TODO GeometryBlocker class?
++    GeometryUpdatesPostponer blocker( this );
+ 
+     // maximing one way and unmaximizing the other way shouldn't happen
+     Q_ASSERT( !( vertical && horizontal )
+@@ -1865,9 +1929,6 @@
+             break;
+         }
+ 
+-    --block_geometry;
+-    setGeometry( geometry(), ForceGeometrySet );
+-
+     updateAllowedActions();
+     if( decoration != NULL )
+         decoration->maximizeChange();
+@@ -1884,7 +1945,10 @@
+     updateAllowedActions();
+     if( decoration != NULL )
+         decoration->borders( border_left, border_right, border_top, border_bottom );
+-    setGeometry( geometry(), ForceGeometrySet );
++    if( isShade())
++        setGeometry( QRect( pos(), sizeForClientSize( clientSize())), ForceGeometrySet );
++    else
++        setGeometry( geometry(), ForceGeometrySet );
+     if( decoration != NULL )
+         decoration->maximizeChange();
+     }
+@@ -1973,8 +2037,8 @@
+     fullscreen_mode = set ? FullScreenNormal : FullScreenNone;
+     if( was_fs == isFullScreen())
+         return;
+-    StackingUpdatesBlocker blocker( workspace());
+-    ++block_geometry;
++    StackingUpdatesBlocker blocker1( workspace());
++    GeometryUpdatesPostponer blocker2( this );
+     workspace()->updateClientLayer( this ); // active fullscreens get different layer
+     info->setState( isFullScreen() ? NET::FullScreen : 0, NET::FullScreen );
+     updateDecoration( false, false );
+@@ -1992,8 +2056,6 @@
+             setGeometry( workspace()->clientArea( MaximizeArea, this ));
+             }
+         }
+-    --block_geometry;
+-    setGeometry( geometry(), ForceGeometrySet );
+     updateWindowRules();
+     }
+ 
+--- konsole/kwrited.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konsole/kwrited.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -89,7 +89,7 @@
+ Comment[nds]=Kiekt na Narichten vun lokale Brukers, sendt mit write(1) oder wall(1)
+ Comment[nl]=Observeer berichten van lokale gebruikers verzonden met write(1) of wall(1)
+ Comment[nn]=Sjå etter meldingar frå lokale brukarar sende med write(1) eller wall(1)
+-Comment[pa]=ਸਥਾਨਿਕ ਉਪਭੋਗਤਾ ਦੁਆਰਾ write(1) or wall(1) ਨਾਲ ਭੇਜੇ ਸੁਨੇਹੇ ਵੇਖੋ
++Comment[pa]=ਲੋਕਲ ਉਪਭੋਗੀ ਰਾਹੀਂ write(1) ਜਾਂ wall(1) ਨਾਲ ਭੇਜੇ ਸੁਨੇਹੇ ਵੇਖੋ
+ Comment[pl]=Śledzi wiadomości od użytkowników lokalnych wysyłane za pomocą write(1) lub wall(1)
+ Comment[pt]=Escutar mensagem de utilizadores locais enviadas com write(1) ou wall(1)
+ Comment[pt_BR]=Observa mensagens de usuários locais, enviadas com o write(1) ou o wall(1)
+--- konsole/other/screen.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konsole/other/screen.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -39,7 +39,7 @@
+ Name[nl]=Screen-sessie
+ Name[nn]=Skjermøkt
+ Name[nso]=Tiragalo ya Pontsho
+-Name[pa]=ਪਰਦਾ ਅਜਲਾਸ
++Name[pa]=ਪਰਦਾ ਸ਼ੈਸ਼ਨ
+ Name[pl]=Sesja screena
+ Name[pt]=Sessão do Screen
+ Name[pt_BR]=Sessão do Screen
+@@ -101,7 +101,7 @@
+ Comment[nl]=nieuwe Screen-sessie
+ Comment[nn]=Ny skjermøkt
+ Comment[nso]=Tiragalo ye Ntshwa ya Pontsho
+-Comment[pa]=ਨਵਾਂ ਪਰਦਾ ਅਜਲਾਸ
++Comment[pa]=ਨਵਾਂ ਪਰਦਾ ਸ਼ੈਸ਼ਨ
+ Comment[pl]=Nowa sesja programu "screen"
+ Comment[pt]=Nova Sessão do Screen
+ Comment[pt_BR]=Nova Sessão do Screen
+--- konsole/other/su.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konsole/other/su.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -26,7 +26,7 @@
+ Name[nds]=Plegerkonsool
+ Name[nl]=Root-shell
+ Name[nn]=Rotskal
+-Name[pa]=ਪ੍ਰਬੰਧਕ (root) ਸੈੱਲ
++Name[pa]=ਪ੍ਰਬੰਧਕ (root) ਸ਼ੈਲ
+ Name[pl]=Powłoka administratora
+ Name[pt]=Linha de Comandos Root
+ Name[pt_BR]=Shell do Root
+@@ -67,7 +67,7 @@
+ Comment[nds]=Niege Plegerkonsool
+ Comment[nl]=Nieuwe root-shell
+ Comment[nn]=Nytt rotskal
+-Comment[pa]=ਨਵੀਂ ਪ੍ਰਬੰਧਕ (root) ਸੈੱਲ
++Comment[pa]=ਨਵੀਂ ਪ੍ਰਬੰਧਕ (root) ਸ਼ੈਲ
+ Comment[pl]=Nowa powłoka administratora
+ Comment[pt]=Nova Linha de Comandos Root
+ Comment[pt_BR]=Novo Shell do Root
+@@ -82,6 +82,7 @@
+ Comment[ta]=புதிய ஓடு ஷெல்
+ Comment[tg]=Пӯстаи нав бо ҳуқуқи root
+ Comment[uk]=Новий командна оболонка з правами root
++Comment[zh_CN]=新建 Root Shell
+ Exec=su -
+ Schema=BlackOnLightYellow.schema
+ #Schema=Linux.schema
+--- konsole/other/shell.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konsole/other/shell.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -33,7 +33,7 @@
+ Name[nb]=Skall
+ Name[nn]=Skal
+ Name[nso]=Legapi
+-Name[pa]=ਸੈੱਲ
++Name[pa]=ਸ਼ੈਲ
+ Name[pl]=Powłoka
+ Name[pt]=Konsole
+ Name[ro]=Interpretor
+@@ -91,7 +91,7 @@
+ Comment[nl]=Nieuwe shell
+ Comment[nn]=Nytt skal
+ Comment[nso]=Legapi le Leswa
+-Comment[pa]=ਨਵੀਂ ਸੈੱਲ
++Comment[pa]=ਨਵੀਂ ਸ਼ੈਲ
+ Comment[pl]=Powłoka
+ Comment[pt]=Nova Linha de Comandos
+ Comment[pt_BR]=Novo Shell
+--- konsole/konsole.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konsole/konsole.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,7 +31,7 @@
+ Name[mn]=Консол
+ Name[nb]=Konsoll
+ Name[nn]=Konsoll
+-Name[pa]=ਕੇਸੋਲ
++Name[pa]=ਕੰਸੋਲ
+ Name[pl]=Konsola
+ Name[ro]=Consolă
+ Name[ru]=Консоль
+--- konsole/konsole-script.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konsole/konsole-script.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,7 +31,7 @@
+ Name[mn]=Консол
+ Name[nb]=Konsoll
+ Name[nn]=Konsoll
+-Name[pa]=ਕੇਸੋਲ
++Name[pa]=ਕੰਸੋਲ
+ Name[pl]=Konsola
+ Name[ro]=Consolă
+ Name[ru]=Консоль
+--- konsole/eventsrc	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konsole/eventsrc	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -65,7 +65,7 @@
+ Name[nds]=Pingel in'n sichtboren Törn
+ Name[nl]=Bel in zichtbare sessie
+ Name[nn]=Varsel i synleg økt
+-Name[pa]=ਦਿੱਖ ਅਜਲਾਸ ਵਿੱਚ ਘੰਟੀ
++Name[pa]=ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ
+ Name[pl]=Dzwonek w widocznej sesji
+ Name[pt]=Campainha numa sessão visível
+ Name[pt_BR]=Campainha em sessão visível
+@@ -118,7 +118,7 @@
+ Comment[nds]=Pingel de in'n sichtboren Törn bruukt warrt
+ Comment[nl]=Bel uitgezonden binnen een zichtbare sessie
+ Comment[nn]=Varsel sendt inne i ei synleg økt
+-Comment[pa]=ਇੱਕ ਦਿੱਖ ਅਜਲਾਸ ਵਿੱਚ ਘੰਟੀ
++Comment[pa]=ਇੱਕ ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ
+ Comment[pl]=Dzwonek uruchamiany w widocznej sesji
+ Comment[pt]=Campainha emitida dentro de uma sessão visível
+ Comment[pt_BR]=Campainha emitida dentro de uma sessão visível
+@@ -177,7 +177,7 @@
+ Name[nds]=Pingel in'n unsichtboren Törn
+ Name[nl]=Bel in niet-zichtbare sessie
+ Name[nn]=Varsel i usynleg økt
+-Name[pa]=ਨਾ-ਦਿੱਖ ਅਜਲਾਸ ਵਿੱਚ ਘੰਟੀ
++Name[pa]=ਨਾ-ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ
+ Name[pl]=Dzwonek w niewidocznej sesji
+ Name[pt]=Campainha numa sessão não-visível
+ Name[pt_BR]=Campainha em sessão não-visível
+@@ -230,7 +230,7 @@
+ Comment[nds]=Pingel de in'n unsichtboren Törn bruukt warrt
+ Comment[nl]=Bel uitgezonden in een niet-zichtbare sessie
+ Comment[nn]=Varsel sendt inne i ei usynleg økt
+-Comment[pa]=ਇੱਕ ਨਾ-ਦਿੱਖ ਅਜਲਾਸ ਵਿੱਚ ਘੰਟੀ
++Comment[pa]=ਇੱਕ ਨਾ-ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ
+ Comment[pl]=Dzwonek uruchamiany w niewidocznej sesji
+ Comment[pt]=Campainha emitida dentro de uma sessão invisível
+ Comment[pt_BR]=Campainha emitida dentro de uma sessão invisível
+@@ -286,7 +286,7 @@
+ Name[nds]=Aktiviteet in'n beluurten Törn
+ Name[nl]=Activiteit in geobserveerde sessie
+ Name[nn]=Aktivitet i overvaka økt
+-Name[pa]=ਜਾਂਚੀ ਅਜਲਾਸ ਵਿੱਚ ਸਰਗਰਮੀ
++Name[pa]=ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਸਰਗਰਮੀ
+ Name[pl]=Aktywność w monitorowanej sesji
+ Name[pt]=Actividade numa sessão vigiada
+ Name[pt_BR]=Atividade na sessão monitorada
+@@ -337,7 +337,7 @@
+ Comment[nds]=Aktiviteet in'n beluurten Törn opdeckt
+ Comment[nl]=Activiteit ontdekt in geobserveerde sessie
+ Comment[nn]=Oppdaga aktivitet i ei overvaka økt
+-Comment[pa]=ਇੱਕ ਜਾਂਚ ਅਜਲਾਸ ਵਿੱਚ ਸਰਗਰਮੀ ਪ੍ਰਾਪਤ ਹੋਈ
++Comment[pa]=ਇੱਕ ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਸਰਗਰਮੀ ਪ੍ਰਾਪਤ ਹੋਈ
+ Comment[pl]=Wykryto aktywność w monitorowanej sesji
+ Comment[pt]=Actividade detectada numa sessão monitorizada
+ Comment[pt_BR]=Atividade detectada em uma sessão monitorada
+@@ -393,7 +393,7 @@
+ Name[nds]=Still in'n beluurten Törn
+ Name[nl]=Stilte in geobserveerde sessie
+ Name[nn]=Stilt i overvaka økt
+-Name[pa]=ਜਾਂਚ ਅਜਲਾਸ ਵਿੱਚ ਖਾਮੋਸ਼ੀ
++Name[pa]=ਨਿਗਰਾਨ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਖਾਮੋਸ਼ੀ
+ Name[pl]=Brak aktywności w monitorowanej sesji
+ Name[pt]=Silêncio numa sessão vigiada
+ Name[pt_BR]=Silêncio na sessão monitorada
+@@ -444,7 +444,7 @@
+ Comment[nds]=Still in'n beluurten Törn opdeckt
+ Comment[nl]=Stilte ontdekt in geobserveerde sessie
+ Comment[nn]=Oppdaga at det er stilt i ei overvaka økt
+-Comment[pa]=ਜਾਂਚ ਅਜਲਾਸ ਵਿੱਚ ਖਾਮੋਸੀ ਪ੍ਰਾਪਤ
++Comment[pa]=ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਖਾਮੋਸ਼ੀ ਪ੍ਰਾਪਤ
+ Comment[pl]=Wykryto brak aktywności w monitorowanej sesji
+ Comment[pt]=Silêncio detectado numa sessão monitorizada
+ Comment[pt_BR]=Silêncio detectado em uma sessão monitorada
+@@ -501,7 +501,7 @@
+ Name[nds]=Törn wöör beennt mit Nich-Null-Status
+ Name[nl]=Sessie is voltooid met een non-zero status
+ Name[nn]=Økt avslutta med status ulik null
+-Name[pa]=ਨਾ-ਸਿਫਰ ਸਥਿਤੀ ਨਾਲ ਅਜਲਾਸ ਸਮਾਪਤ
++Name[pa]=ਨਾ-ਸਿਫਰ ਹਾਲਤ ਨਾਲ ਸ਼ੈਸ਼ਨ ਸਮਾਪਤ
+ Name[pl]=Sesja zakończona z niezerowym kodem powrotu
+ Name[pt]=Sessão terminada com código diferente de zero
+ Name[pt_BR]=Sessão finalizada com status diferente de zero
+@@ -556,7 +556,7 @@
+ Comment[nds]=En Törn is mit Nich-Null-Status to't Enn kamen
+ Comment[nl]=Een sessie is beëindigd met een non-zero status
+ Comment[nn]=Ei økt avslutta med status som ikkje var null
+-Comment[pa]=ਨਾ-ਸਿਫਰ ਸਥਿਤੀ ਨਾਲ ਅਜਲਾਸ ਬੰਦ
++Comment[pa]=ਨਾ-ਸਿਫਰ ਹਾਲਤ ਨਾਲ ਸ਼ੈਸ਼ਨ ਬੰਦ
+ Comment[pl]=Sesja zakończyła się z niezerowym kodem powrotu
+ Comment[pt]=Uma sessão terminou com código diferente de zero
+ Comment[pt_BR]=Uma sessão foi finalizada com status diferente de zero
+--- konsole/kcmkonsole.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ konsole/kcmkonsole.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -117,7 +117,7 @@
+ GenericName[nn]=Alle konsoll-innstillingar
+ GenericName[nso]=Dipeakanyo Kamoka tsa Konsole
+ GenericName[oc]=Tot l'arranjament de la consola
+-GenericName[pa]=ਸਭ ਕੰਸੋਲ ਵਿਵਸਥਾ
++GenericName[pa]=ਸਭ ਕੰਸੋਲ ਸੈਟਿੰਗ
+ GenericName[pl]=Wszystkie ustawienia Konsoli
+ GenericName[pt]=Configuração da Consola
+ GenericName[pt_BR]=Todas as configurações do Konsole
+@@ -181,6 +181,7 @@
+ Keywords[nds]=Konsole,Konsool,Terminal
+ Keywords[nn]=konsole,konsoll,terminal,kommandolinje
+ Keywords[oc]=konsole,consola,terminal
++Keywords[pa]=konsole,console,ਟਰਮੀਨਲ
+ Keywords[pl]=konsole,konsola,terminal
+ Keywords[pt]=konsole,consola,terminal
+ Keywords[ro]=konsole,consolă,terminal
+@@ -198,5 +199,6 @@
+ Keywords[vi]=konsole,console,đầu cuối
+ Keywords[wa]=konsole,conzôle,terminå
+ Keywords[xh]=konsole,isakhelo esiqulathe ibhodi yezitshixo,isiphelo sendlela
++Keywords[zh_CN]=konsole,console,terminal,终端,控制台
+ Keywords[zh_TW]=konsole,console,terminal,主控台,終端機
+ Keywords[zu]=ikhonsoli,ikhonsoli,okwangaphandle
+--- l10n/ba/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ba/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -66,6 +66,7 @@
+ Name[vi]=Bosnia và Herzegovina
+ Name[wa]=Bosneye
+ Name[xh]=Bosnia ne Herzegovina
++Name[zh_CN]=波斯尼亚和黑塞哥维那
+ Name[zh_TW]=波士尼亞與赫塞哥維納
+ Name[zu]=Bosnia kanye ne-Herzegovina
+ Region=southeurope
+--- l10n/bd/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bd/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,6 +41,7 @@
+ Name[tr]=BangladeÅŸ
+ Name[uk]=Бангладеш
+ Name[uz]=Бангладеш
++Name[zh_CN]=孟加拉国
+ Name[zh_TW]=孟加拉
+ Region=southasia
+ Languages=bn,en_GB
+--- l10n/be/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/be/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -65,6 +65,7 @@
+ Name[uz]=Белгия
+ Name[vi]=Bỉ
+ Name[wa]=Beldjike
++Name[zh_CN]=比利时
+ Name[zh_TW]=比利時
+ Region=westeurope
+ Languages=nl_BE,fr_BE,de_BE,nl,fr,de,wa
+--- l10n/bf/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bf/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -26,6 +26,7 @@
+ Name[uk]=Буркіна-Фасо
+ Name[uz]=Буркина-Фассо
+ Name[wa]=Bourkina Fasso
++Name[zh_CN]=布基纳法索
+ Name[zh_TW]=布吉納法索
+ Region=westafrica
+ Languages=fr
+--- l10n/bg/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bg/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -55,6 +55,7 @@
+ Name[uz]=Болгария
+ Name[ven]=Baligaria
+ Name[wa]=Bulgåreye
++Name[zh_CN]=保加利亚
+ Name[zh_TW]=保加利亞
+ Region=easteurope
+ Languages=bg
+--- l10n/bh/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bh/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,6 +41,7 @@
+ Name[uk]=Бахрейн
+ Name[uz]=Баҳрайн
+ Name[wa]=Bareyn
++Name[zh_CN]=å·´æž—
+ Name[zh_TW]=å·´æž—
+ Region=middleeast
+ Languages=ar
+--- l10n/bi/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bi/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -26,6 +26,7 @@
+ Name[uk]=Бурунді
+ Name[uz]=Бурунди
+ Name[wa]=Bouroundi
++Name[zh_CN]=布隆迪
+ Name[zh_TW]=浦隆地
+ Region=centralafrica
+ Languages=fr
+--- l10n/bm/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bm/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -34,6 +34,7 @@
+ Name[uk]=Бермуди
+ Name[uz]=Бермуда Ороллари
+ Name[wa]=Bermudes
++Name[zh_CN]=百慕大
+ Name[zh_TW]=百慕達
+ Region=northamerica
+ Languages=en_GB
+--- l10n/bn/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bn/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,6 +41,7 @@
+ Name[uk]=Бруней Даруссалам
+ Name[uz]=Бруней Доруссалом
+ Name[wa]=Bruney Darussalam
++Name[zh_CN]=文莱达鲁萨兰
+ Name[zh_TW]=文萊達魯薩蘭
+ Region=southeastasia
+ Languages=ms,zn_CN
+--- l10n/bs/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bs/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,6 +36,7 @@
+ Name[tr]=Bahamalar
+ Name[uk]=Багами
+ Name[uz]=Багама Ороллари
++Name[zh_CN]=巴哈马
+ Name[zh_TW]=巴拿馬
+ Region=caribbean
+ Languages=en_GB,es
+--- l10n/bt/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bt/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -39,6 +39,7 @@
+ Name[uk]=Бутан
+ Name[uz]=Бутан
+ Name[wa]=Boutan
++Name[zh_CN]=不丹
+ Name[zh_TW]=不丹
+ Region=southasia
+ Languages=dz,en
+--- l10n/jm/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/jm/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -48,6 +48,7 @@
+ Name[uk]=Ямайка
+ Name[uz]=Ямайка
+ Name[wa]=Djamayike
++Name[zh_CN]=牙买加
+ Name[zh_TW]=牙買加
+ Region=caribbean
+ Languages=en_GB,en_US
+--- l10n/bw/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bw/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -31,6 +31,7 @@
+ Name[uk]=Ботсвана
+ Name[uz]=Боцвана
+ Name[wa]=Boswana
++Name[zh_CN]=博茨瓦纳
+ Name[zh_TW]=波札那
+ Region=southafrica
+ Languages=en_GB,ts
+--- l10n/by/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/by/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -54,6 +54,7 @@
+ Name[uk]=Білорусія
+ Name[uz]=Белорус
+ Name[wa]=Belaruss
++Name[zh_CN]=白俄罗斯
+ Name[zh_TW]=白俄羅斯
+ Region=easteurope
+ Languages=be,ru
+--- l10n/bz/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/bz/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -27,6 +27,7 @@
+ Name[tg]=Белиз
+ Name[uk]=Беліз
+ Name[uz]=Белиз
++Name[zh_CN]=伯利兹
+ Name[zh_TW]=比利時
+ Region=centralamerica
+ Languages=en_GB,es
+--- l10n/cc/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/cc/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -53,6 +53,7 @@
+ Name[uk]=Кокосові острови
+ Name[uz]=Кокос (Килинг) Ороллари
+ Name[wa]=Iyes Cocos
++Name[zh_CN]=科科斯群岛
+ Name[zh_TW]=可可斯群島
+ Region=southeastasia
+ Languages=ms,en_GB
+--- l10n/cd/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/cd/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -51,6 +51,7 @@
+ Name[uk]=Конго, демократична республіка
+ Name[uz]=Конго Демократик Республикаси
+ Name[wa]=Congo, republike democratike
++Name[zh_CN]=刚果民主共和国
+ Region=centralafrica
+ Languages=fr
+ #DecimalSymbol=,
+--- l10n/rw/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/rw/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -42,6 +42,7 @@
+ Name[tr]=Ruanda
+ Name[uk]=Руанда
+ Name[uz]=Рванда
++Name[zh_CN]=卢旺达
+ Name[zh_TW]=盧安達
+ Region=centralafrica
+ Languages=fr,en_GB
+--- l10n/ch/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ch/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -65,6 +65,7 @@
+ Name[uz]=Швейцария
+ Name[vi]=Thuỵ Sĩ
+ Name[wa]=Swisse
++Name[zh_CN]=瑞士
+ Name[zh_TW]=瑞士
+ Region=centraleurope
+ Languages=de,fr,it
+--- l10n/zw/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/zw/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -22,7 +22,7 @@
+ Name[mn]=Замбабив
+ Name[mt]=Żimbabwe
+ Name[nds]=Simbabwe
+-Name[pa]=ਜਿੰਬਾਬਵੇਂ
++Name[pa]=ਜਿੰਬਾਬਵੇ
+ Name[ro]=Zimbabue
+ Name[ru]=Зимбабве
+ Name[sl]=Zimbabve
+@@ -34,6 +34,7 @@
+ Name[uk]=Зімбабве
+ Name[uz]=Зимбабве
+ Name[wa]=Zimbabwè
++Name[zh_CN]=津巴布韦
+ Name[zh_TW]=辛巴威
+ Region=southafrica
+ Languages=en_GB
+--- l10n/kg/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/kg/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,6 +50,7 @@
+ Name[uk]=Киргизстан
+ Name[uz]=Қирғизистон
+ Name[wa]=Kirguiztan
++Name[zh_CN]=吉尔吉斯斯坦
+ Name[zh_TW]=吉爾吉斯
+ Region=centralasia
+ Languages=ru
+--- l10n/kh/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/kh/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -57,6 +57,7 @@
+ Name[uz]=Камбоджа
+ Name[vi]=Cam pu chia
+ Name[wa]=Cambodje
++Name[zh_CN]=柬埔寨
+ Name[zh_TW]=柬埔寨
+ Region=southeastasia
+ Languages=fr,en_GB
+--- l10n/ki/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ki/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -24,6 +24,7 @@
+ Name[th]=คิริบาติ
+ Name[uk]=Кірібаті
+ Name[uz]=Кирибати
++Name[zh_CN]=基里巴斯
+ Name[zh_TW]=吉里巴斯
+ Region=oceania
+ Languages=en_GB
+--- l10n/sa/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sa/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -60,6 +60,7 @@
+ Name[uz]=Саудия Арабистони
+ Name[vi]=Ẩrập Saudi
+ Name[wa]=Arabeye Sawoudite
++Name[zh_CN]=沙特阿拉伯
+ Name[zh_TW]=沙烏地阿拉伯
+ Region=middleeast
+ Languages=ar
+--- l10n/cr/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/cr/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,6 +36,7 @@
+ Name[tr]=Kosta Rika
+ Name[uk]=Коста-Ріка
+ Name[uz]=Коста Рика
++Name[zh_CN]=哥斯达黎加
+ Name[zh_TW]=哥斯大黎加
+ Region=centralamerica
+ Languages=es
+--- l10n/sc/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sc/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -45,6 +45,7 @@
+ Name[uk]=Сейшельські острови
+ Name[uz]=Сейшел Ороллари
+ Name[wa]=Seycheles
++Name[zh_CN]=塞舌尔
+ Name[zh_TW]=塞席爾
+ Region=southafrica
+ Languages=en_GB,fr
+--- l10n/km/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/km/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -44,6 +44,7 @@
+ Name[uk]=Коморські острови
+ Name[uz]=Коморос
+ Name[wa]=Comores
++Name[zh_CN]=科摩罗
+ Name[zh_TW]=葛摩
+ Region=southafrica
+ Languages=fr,ar
+--- l10n/se/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/se/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -64,6 +64,7 @@
+ Name[ven]=Swidene
+ Name[vi]=Thuỵ Điển
+ Name[wa]=Suwede
++Name[zh_CN]=ç‘žå…¸
+ Name[zh_TW]=ç‘žå…¸
+ Region=northeurope
+ Languages=sv,se
+--- l10n/kn/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/kn/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -61,6 +61,7 @@
+ Name[ven]=St. Kitts na Nevis
+ Name[vi]=St. Kitts và Nevis
+ Name[xh]=St. Kitts neNevis
++Name[zh_CN]=圣基茨和尼维斯
+ Name[zh_TW]=聖克理斯多福及尼維斯
+ Name[zu]=St. Kitts kanye no-Nevis
+ Region=caribbean
+--- l10n/sh/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sh/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -51,6 +51,7 @@
+ Name[uk]=Острів Святої Єлени
+ Name[uz]=Авлиё Елена Ороли
+ Name[wa]=Sint Elene
++Name[zh_CN]=圣赫勒拿
+ Name[zh_TW]=聖赫勒拿島
+ Region=southamerica
+ Languages=en_GB
+--- l10n/cy/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/cy/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -55,6 +55,7 @@
+ Name[uz]=Кипр
+ Name[vi]=Síp
+ Name[wa]=Chîpe
++Name[zh_CN]=塞浦路斯
+ Name[zh_TW]=賽普勒斯
+ Region=middleeast
+ Languages=el,tr,en_GB
+--- l10n/cz/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/cz/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -61,6 +61,7 @@
+ Name[uz]=Чехия
+ Name[vi]=Séc
+ Name[wa]=Tchekeye
++Name[zh_CN]=捷克
+ Name[zh_TW]=捷克
+ Region=centraleurope
+ Languages=cs
+--- l10n/sk/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sk/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -59,6 +59,7 @@
+ Name[uk]=Словакія
+ Name[uz]=Словакия
+ Name[wa]=Eslovakeye
++Name[zh_CN]=斯洛伐克
+ Name[zh_TW]=斯洛伐克
+ Region=centraleurope
+ Languages=sk
+--- l10n/sm/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sm/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -27,6 +27,7 @@
+ Name[uk]=Сан-Маріно
+ Name[uz]=Сан-Марино
+ Name[wa]=Sint Marin
++Name[zh_CN]=圣马力诺
+ Name[zh_TW]=聖馬力諾
+ Region=southeurope
+ Languages=it
+--- l10n/sn/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sn/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -30,6 +30,7 @@
+ Name[uk]=Сенегал
+ Name[uz]=Сенегал
+ Name[wa]=Senegål
++Name[zh_CN]=塞内加尔
+ Name[zh_TW]=塞內加爾
+ Region=westafrica
+ Languages=fr
+--- l10n/kw/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/kw/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,6 +43,7 @@
+ Name[uk]=KКувейт
+ Name[uz]=Кувайт
+ Name[wa]=Kuweyt
++Name[zh_CN]=科威特
+ Name[zh_TW]=科威特
+ Region=middleeast
+ Languages=ar
+--- l10n/so/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/so/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -48,6 +48,7 @@
+ Name[uk]=Сомалі
+ Name[uz]=Сомали
+ Name[wa]=Somaleye
++Name[zh_CN]=索马里
+ Name[zh_TW]=索馬利亞
+ Region=northafrica
+ Languages=ar
+--- l10n/ky/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ky/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -57,6 +57,7 @@
+ Name[uk]=Кайман острів
+ Name[uz]=Кайман Ороллари
+ Name[wa]=Iyes Cayman
++Name[zh_CN]=开曼群岛
+ Name[zh_TW]=開曼群島
+ Region=caribbean
+ Languages=en_GB
+--- l10n/kz/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/kz/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,6 +52,7 @@
+ Name[uk]=Казахстан
+ Name[uz]=Қозоғистон
+ Name[wa]=Kazaxhtan
++Name[zh_CN]=哈萨克斯坦
+ Name[zh_TW]=哈薩克
+ Region=centralasia
+ Languages=kk,ru
+--- l10n/sr/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sr/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -47,6 +47,7 @@
+ Name[tr]=Surinam
+ Name[uk]=Сурінам
+ Name[uz]=Суринам
++Name[zh_CN]=苏里南
+ Name[zh_TW]=蘇利南
+ Region=southamerica
+ Languages=nl,en_GB
+--- l10n/st/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/st/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -56,6 +56,7 @@
+ Name[uk]=Сан-Томе і Прінсіпі
+ Name[uz]=Сан-Томе ва Принсипи
+ Name[wa]=São Tomé et Prince
++Name[zh_CN]=圣多美和普林西比
+ Region=centralafrica
+ Languages=pt
+ #DecimalSymbol=,
+--- l10n/sv/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sv/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,6 +37,7 @@
+ Name[th]=เอลซัลวาดอร์
+ Name[uk]=Ель-Сальвадор
+ Name[uz]=Салвадор
++Name[zh_CN]=萨尔瓦多
+ Name[zh_TW]=薩爾瓦多
+ Region=centralamerica
+ Languages=es
+--- l10n/sy/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sy/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -56,6 +56,7 @@
+ Name[uk]=Сирія
+ Name[uz]=Сурия
+ Name[wa]=Sireye
++Name[zh_CN]=叙利亚
+ Name[zh_TW]=敘利亞
+ Region=middleeast
+ Languages=ar
+--- l10n/sz/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/sz/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -45,6 +45,7 @@
+ Name[uk]=Свазіленд
+ Name[uz]=Свазиленд
+ Name[wa]=Suwazilande
++Name[zh_CN]=斯威士兰
+ Name[zh_TW]=史瓦濟蘭
+ Region=southafrica
+ Languages=en_GB,ss
+--- l10n/lb/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/lb/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -61,6 +61,7 @@
+ Name[uz]=Лебанон
+ Name[vi]=Li Băng
+ Name[wa]=Liban
++Name[zh_CN]=黎巴嫩
+ Name[zh_TW]=黎巴嫩
+ Region=middleeast
+ Languages=ar
+--- l10n/dj/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/dj/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -40,6 +40,7 @@
+ Name[tr]=Cibuti
+ Name[uk]=Джібуті
+ Name[uz]=Жибути
++Name[zh_CN]=吉布提
+ Name[zh_TW]=吉布地
+ Region=northafrica
+ Languages=ar
+--- l10n/lc/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/lc/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -42,6 +42,7 @@
+ Name[uk]=Сент-Люсія
+ Name[uz]=Сент-Люсия
+ Name[wa]=Ste Luceye
++Name[zh_CN]=圣卢西亚
+ Name[zh_TW]=聖露西亞
+ Region=caribbean
+ Languages=en_GB,en_US
+--- l10n/li/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/li/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -32,6 +32,7 @@
+ Name[uk]=Ліхтенштейн
+ Name[uz]=Лихтенштейн
+ Name[wa]=Lîchtensteyn
++Name[zh_CN]=列支敦士登
+ Name[zh_TW]=列支敦斯登
+ Region=westeurope
+ Languages=de
+--- l10n/lk/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/lk/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -30,6 +30,7 @@
+ Name[th]=ศรีลังกา
+ Name[uk]=Шрі-Ланка
+ Name[uz]=Шри Ланка
++Name[zh_CN]=斯里兰卡
+ Name[zh_TW]=斯里蘭卡
+ Region=southasia
+ Languages=ta,en_GB,en_US
+--- l10n/tc/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/tc/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -57,6 +57,7 @@
+ Name[uz]=Туркс ва Каикос Ороллари
+ Name[vi]=Quần đảo Turks và Caicos
+ Name[wa]=Iyes Turks et Caicos
++Name[zh_CN]=特克斯和凯科斯群岛
+ Name[zh_TW]=土克斯和開卡斯群島
+ Region=caribbean
+ Languages=ar,en_GB,hi
+--- l10n/dz/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/dz/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,6 +52,7 @@
+ Name[uk]=Алжир
+ Name[uz]=Жазоир
+ Name[wa]=Aldjereye
++Name[zh_CN]=阿尔及利亚
+ Name[zh_TW]=阿爾及利亞
+ Region=northafrica
+ Languages=ar
+--- l10n/lr/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/lr/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -39,6 +39,7 @@
+ Name[tr]=Liberya
+ Name[uk]=Ліберія
+ Name[uz]=Либерия
++Name[zh_CN]=利比里亚
+ Name[zh_TW]=賴比瑞亞
+ Region=westafrica
+ Languages=en_GB
+--- l10n/ls/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ls/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,6 +35,7 @@
+ Name[uk]=Лесото
+ Name[uz]=Лесото
+ Name[wa]=Lessoto
++Name[zh_CN]=莱索托
+ Name[zh_TW]=賴索扥
+ Region=southafrica
+ Languages=en_GB,zu,xh,st
+--- l10n/tk/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/tk/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -25,6 +25,7 @@
+ Name[tg]=Токилау
+ Name[uk]=Токелау
+ Name[uz]=Токелау
++Name[zh_CN]=托克劳
+ Name[zh_TW]=托克勞
+ Region=caribbean
+ Languages=en_GB
+--- l10n/lt/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/lt/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -62,6 +62,7 @@
+ Name[uk]=Литва
+ Name[uz]=Литва
+ Name[wa]=Litwaneye
++Name[zh_CN]=立陶宛
+ Name[zh_TW]=立陶宛
+ Region=centraleurope
+ Languages=lt
+--- l10n/lu/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/lu/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -59,6 +59,7 @@
+ Name[uk]=Люксембург
+ Name[uz]=Люксембург
+ Name[wa]=Lussimbork
++Name[zh_CN]=卢森堡
+ Name[zh_TW]=盧森堡
+ Region=westeurope
+ Languages=de,fr
+--- l10n/lv/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/lv/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -55,6 +55,7 @@
+ Name[uz]=Латвия
+ Name[ven]=Lativia
+ Name[wa]=Letoneye
++Name[zh_CN]=拉脱维亚
+ Name[zh_TW]=拉脫維亞
+ Region=easteurope
+ Languages=lv
+--- l10n/tn/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/tn/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -55,6 +55,7 @@
+ Name[uk]=Туніс
+ Name[uz]=Тунис
+ Name[wa]=Tunizeye
++Name[zh_CN]=突尼斯
+ Name[zh_TW]=突尼西亞
+ Region=northafrica
+ Languages=ar
+--- l10n/tp/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/tp/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -62,6 +62,7 @@
+ Name[uz]=Шарқий Тимур
+ Name[vi]=Đông Timo
+ Name[wa]=Timor Ess
++Name[zh_CN]=东帝汶
+ Name[zh_TW]=東帝汶
+ Region=southeastasia
+ Languages=pt,en_GB
+--- l10n/ec/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ec/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -53,6 +53,7 @@
+ Name[uk]=Еквадор
+ Name[uz]=Эквадор
+ Name[wa]=Ecwåteur
++Name[zh_CN]=厄瓜多尔
+ Name[zh_TW]=厄瓜多
+ Region=southamerica
+ Languages=es
+--- l10n/tt/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/tt/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -70,6 +70,7 @@
+ Name[vi]=Trinidad và Tobago
+ Name[wa]=Trinité et Tobago
+ Name[xh]=Trinidad ne Tobago
++Name[zh_CN]=特立尼达和多巴哥
+ Name[zh_TW]=千里達及托貝哥
+ Name[zu]=Trinidad knaye ne-Tobago
+ Region=caribbean
+--- l10n/tv/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/tv/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -24,6 +24,7 @@
+ Name[uk]=Тувалу
+ Name[uz]=Тувалу
+ Name[wa]=Touvalou
++Name[zh_CN]=图瓦卢
+ Name[zh_TW]=吐瓦魯
+ Region=oceania
+ Languages=en_GB
+--- l10n/eh/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/eh/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -60,6 +60,7 @@
+ Name[uz]=Ғарбий Сахара
+ Name[vi]=Tây Sahara
+ Name[wa]=Sara Coûtchantrece
++Name[zh_CN]=西撒哈拉
+ Name[zh_TW]=西盛哈拉
+ Region=northafrica
+ Languages=
+--- l10n/tz/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/tz/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -61,6 +61,7 @@
+ Name[uz]=Танзания Бирлашган Республикаси
+ Name[vi]=Tanzania, Cộng hoà thống nhât
+ Name[wa]=Tanzaneye
++Name[zh_CN]=坦桑尼亚联合共和国
+ Name[zh_TW]=坦尚尼亞
+ Region=southafrica
+ Languages=en_GB,sw
+--- l10n/md/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/md/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,6 +41,7 @@
+ Name[th]=มอลโดวา
+ Name[uk]=Молдова
+ Name[uz]=Молдова
++Name[zh_CN]=摩尔多瓦
+ Name[zh_TW]=摩爾多瓦
+ Region=easteurope
+ Languages=ro,ru
+--- l10n/mg/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mg/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -44,6 +44,7 @@
+ Name[tr]=Madagaskar
+ Name[uk]=Мадагаскар
+ Name[uz]=Мадагаскар
++Name[zh_CN]=马达加斯加
+ Name[zh_TW]=馬達加斯加
+ Region=southafrica
+ Languages=fr
+--- l10n/mh/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mh/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -58,6 +58,7 @@
+ Name[uk]=Маршальські острови
+ Name[uz]=Маршалл Ороллари
+ Name[wa]=Iyes Marshall
++Name[zh_CN]=马绍群岛
+ Name[zh_TW]=馬紹爾群島
+ Region=oceania
+ Languages=en_GB
+--- l10n/er/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/er/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -34,6 +34,7 @@
+ Name[uk]=Ерітрея
+ Name[uz]=Эритрия
+ Name[wa]=Eritrêye
++Name[zh_CN]=厄立特里亚
+ Name[zh_TW]=厄利垂亞
+ Region=northafrica
+ Languages=ti,ar
+--- l10n/es/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/es/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -66,6 +66,7 @@
+ Name[uz]=Испания
+ Name[vi]=Tây Ban Nha
+ Name[wa]=Sipagne
++Name[zh_CN]=西班牙
+ Name[zh_TW]=西班牙
+ Region=westeurope
+ Languages=es,ca,eu,gl
+--- l10n/mk/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mk/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -60,6 +60,7 @@
+ Name[uz]=Македония
+ Name[ven]=Masedonia
+ Name[wa]=Macedoneye
++Name[zh_CN]=马其顿
+ Name[zh_TW]=馬其頓
+ Languages=mk
+ Region=southeurope
+--- l10n/oceania.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/oceania.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -49,4 +49,5 @@
+ Name[uk]=Океанія
+ Name[uz]=Океания
+ Name[wa]=Oceyaneye
++Name[zh_CN]=大洋洲
+ Name[zh_TW]=大洋洲
+--- l10n/et/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/et/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -56,6 +56,7 @@
+ Name[uk]=Ефіопія
+ Name[uz]=Эфиопия
+ Name[wa]=Etiopeye
++Name[zh_CN]=埃塞俄比亚
+ Name[zh_TW]=衣索比亞
+ Region=northafrica
+ Languages=en_GB,am,om,so,ti
+--- l10n/ml/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ml/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -23,6 +23,7 @@
+ Name[th]=มาลี
+ Name[uk]=Малі
+ Name[uz]=Мали
++Name[zh_CN]=马里
+ Name[zh_TW]=馬利
+ Region=westafrica
+ Languages=fr
+--- l10n/mm/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mm/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,6 +35,7 @@
+ Name[uz]=Мянмар
+ Name[vi]=Miến Điện
+ Name[wa]=Birmaneye
++Name[zh_CN]=缅甸
+ Name[zh_TW]=緬甸
+ Region=southeastasia
+ #Languages=
+--- l10n/mq/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mq/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,6 +41,7 @@
+ Name[uk]=Мартініка
+ Name[uz]=Мартиника
+ Name[wa]=Martinike
++Name[zh_CN]=马提尼克
+ Name[zh_TW]=馬提尼克
+ Region=caribbean
+ Languages=fr
+--- l10n/mr/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mr/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -47,6 +47,7 @@
+ Name[uk]=Мавританія
+ Name[uz]=Мавритания
+ Name[wa]=Moritanreye
++Name[zh_CN]=毛里塔尼亚
+ Name[zh_TW]=茅利塔尼亞
+ Region=westafrica
+ Languages=ar,en_GB
+--- l10n/ms/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ms/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -25,6 +25,7 @@
+ Name[th]=มอนต์เซอร์รัท
+ Name[uk]=Монтсеррат
+ Name[uz]=Монцеррат
++Name[zh_CN]=蒙特塞拉特
+ Name[zh_TW]=蒙的塞拉特
+ Region=caribbean
+ Languages=en_GB
+--- l10n/mt/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mt/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -29,6 +29,7 @@
+ Name[uk]=Мальта
+ Name[uz]=Малта
+ Name[wa]=Male
++Name[zh_CN]=马耳他
+ Name[zh_TW]=馬爾他
+ Region=southeurope
+ Languages=mt,en_GB,en
+--- l10n/mu/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mu/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,6 +41,7 @@
+ Name[uk]=Маврікій
+ Name[uz]=Маврикий
+ Name[wa]=Iye Môrice
++Name[zh_CN]=毛里求斯
+ Name[zh_TW]=毛里求斯
+ Region=southafrica
+ Languages=en_GB,fr,hi
+--- l10n/mv/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mv/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -52,6 +52,7 @@
+ Name[tr]=Maldivler
+ Name[uk]=Мальдіви
+ Name[uz]=Малдив Ороллари
++Name[zh_CN]=马尔代夫
+ Name[zh_TW]=馬爾地夫
+ Region=southasia
+ Languages=ar,hi,en_GB
+--- l10n/mw/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mw/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -27,6 +27,7 @@
+ Name[tr]=Malavi
+ Name[uk]=Малаві
+ Name[uz]=Малави
++Name[zh_CN]=马拉维
+ Name[zh_TW]=馬拉威
+ Region=southafrica
+ Languages=en_GB
+--- l10n/mz/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/mz/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -51,6 +51,7 @@
+ Name[uk]=Мозамбік
+ Name[uz]=Мозамбик
+ Name[wa]=Mozambike
++Name[zh_CN]=莫桑比克
+ Name[zh_TW]=莫三比克
+ Region=southafrica
+ Languages=pt
+--- l10n/uy/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/uy/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,6 +43,7 @@
+ Name[uk]=Уругвай
+ Name[uz]=Уругвай
+ Name[wa]=Ourougway
++Name[zh_CN]=乌拉圭
+ Name[zh_TW]=烏拉圭
+ Region=southamerica
+ Languages=es
+--- l10n/na/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/na/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -44,6 +44,7 @@
+ Name[uk]=Намібія
+ Name[uz]=Намибия
+ Name[wa]=Namibeye
++Name[zh_CN]=纳米比亚
+ Name[zh_TW]=那米比亞
+ Region=southafrica
+ Languages=af,de,en_GB
+--- l10n/fk/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/fk/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -56,6 +56,7 @@
+ Name[uk]=Фолклендські острови (Британія)
+ Name[uz]=Фолкленд (Малвин) Ороллари
+ Name[wa]=Iyes Malouwines
++Name[zh_CN]=福克兰群岛(马尔维纳斯)
+ Name[zh_TW]=福克蘭群島 (馬爾維納斯)
+ Region=southamerica
+ Languages=en_GB
+--- l10n/nc/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/nc/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -57,6 +57,7 @@
+ Name[uk]=Нова Каледонія
+ Name[uz]=Янги Каледония
+ Name[wa]=Nouve Caledonreye
++Name[zh_CN]=新喀里多尼亚
+ Name[zh_TW]=新喀里多尼亞
+ Region=oceania
+ Languages=fr
+--- l10n/fm/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/fm/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -50,6 +50,7 @@
+ Name[uk]=Мікронезія, федеративні штати
+ Name[uz]=Микронезия
+ Name[wa]=Micronezeye
++Name[zh_CN]=密克罗尼西亚联邦
+ Region=oceania
+ Languages=en_GB
+ #DecimalSymbol=,
+--- l10n/ne/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ne/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -21,7 +21,7 @@
+ Name[mk]=Нигер
+ Name[mn]=Нигер
+ Name[mt]=Niġer
+-Name[pa]=ਨਿਜੀੀਰ
++Name[pa]=ਨਿਜੀਰ
+ Name[pt]=Nigéria
+ Name[pt_BR]=Nigéria
+ Name[ru]=Нигер
+@@ -33,6 +33,7 @@
+ Name[uk]=Нігер
+ Name[uz]=Нигер
+ Name[wa]=Nidjer
++Name[zh_CN]=尼日尔
+ Name[zh_TW]=尼日
+ Region=westafrica
+ Languages=fr,ar
+--- l10n/nf/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/nf/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -56,6 +56,7 @@
+ Name[uk]=Острів Норфолк
+ Name[uz]=Норфолк Ороли
+ Name[wa]=Iye di Norfolk
++Name[zh_CN]=诺福克岛
+ Name[zh_TW]=諾福克島
+ Region=oceania
+ Languages=en_GB
+--- l10n/ng/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ng/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -28,7 +28,7 @@
+ Name[mk]=Нигерија
+ Name[mn]=Нигери
+ Name[mt]=Niġerja
+-Name[pa]=ਨਈਿਜੀਰਿਆ
++Name[pa]=ਨਈਜੀਰਿਆ
+ Name[pt]=Nigéria
+ Name[pt_BR]=Nigéria
+ Name[ru]=Нигерия
+@@ -43,6 +43,7 @@
+ Name[uk]=Нігерія
+ Name[uz]=Нигерия
+ Name[wa]=Nidjeria
++Name[zh_CN]=尼日利亚
+ Name[zh_TW]=奈及利亞
+ Region=westafrica
+ Languages=en_GB
+--- l10n/ni/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ni/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -44,6 +44,7 @@
+ Name[uk]=Нікарагуа
+ Name[uz]=Никарагуа
+ Name[wa]=Nicaragwa
++Name[zh_CN]=尼加拉瓜
+ Name[zh_TW]=尼加拉瓜
+ Region=centralamerica
+ Languages=es
+--- l10n/vc/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/vc/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -69,6 +69,7 @@
+ Name[vi]=St. Vincent và Grenadines
+ Name[wa]=St. Vincint et les Grenadines
+ Name[xh]=St. Vincent ne Grenadines
++Name[zh_CN]=圣文森特和格林纳丁斯
+ Name[zh_TW]=聖文森及格納那丁
+ Name[zu]=I-St. Vincent kanye ne-Grenadines
+ Region=caribbean
+--- l10n/nl/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/nl/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -66,6 +66,7 @@
+ Name[uz]=Нидерландлар
+ Name[vi]=Hà Lan
+ Name[wa]=Bas Payis
++Name[zh_CN]=荷兰
+ Name[zh_TW]=荷蘭
+ Region=westeurope
+ Languages=nl
+--- l10n/ve/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ve/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -38,6 +38,7 @@
+ Name[uk]=Венесуела
+ Name[uz]=Венесуэла
+ Name[wa]=Venezwela
++Name[zh_CN]=委内瑞拉
+ Name[zh_TW]=委內瑞拉
+ Region=southamerica
+ Languages=es
+--- l10n/np/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/np/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -27,6 +27,7 @@
+ Name[th]=เนปาล
+ Name[uk]=Непал
+ Name[uz]=Непал
++Name[zh_CN]=尼泊尔
+ Name[zh_TW]=尼泊爾
+ Region=southasia
+ Languages=en_GB
+--- l10n/nu/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/nu/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -25,6 +25,7 @@
+ Name[uk]=Ніуе
+ Name[uz]=Ниуе
+ Name[wa]=Niuwé
++Name[zh_CN]=纽埃
+ Name[zh_TW]=紐鄂島
+ Region=oceania
+ Languages=es
+--- l10n/ga/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ga/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -29,6 +29,7 @@
+ Name[th]=กาบอน
+ Name[uk]=Габон
+ Name[uz]=Габон
++Name[zh_CN]=加蓬
+ Name[zh_TW]=加彭
+ Region=centralafrica
+ Languages=fr
+--- l10n/gd/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gd/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -33,6 +33,7 @@
+ Name[uk]=Гренада
+ Name[uz]=Гренада
+ Name[wa]=Grenåde
++Name[zh_CN]=格林纳达
+ Name[zh_TW]=格瑞那達
+ Region=caribbean
+ Languages=en_GB,en_US
+--- l10n/ge/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ge/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -46,6 +46,7 @@
+ Name[uk]=Грузія
+ Name[uz]=Гуржистон
+ Name[wa]=Djeyordjeye
++Name[zh_CN]=格鲁吉亚
+ Name[zh_TW]=喬治亞
+ Region=easteurope
+ Languages=ka,ru
+--- l10n/gh/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gh/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -34,6 +34,7 @@
+ Name[uk]=Гана
+ Name[uz]=Гана
+ Name[wa]=Gana
++Name[zh_CN]=加纳
+ Name[zh_TW]=迦納
+ Region=westafrica
+ Languages=en_GB
+--- l10n/gi/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gi/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -30,6 +30,7 @@
+ Name[uk]=Гібралтар
+ Name[uz]=Гибралтар
+ Name[wa]=Djibraltar
++Name[zh_CN]=直布罗陀
+ Name[zh_TW]=直布羅陀
+ Region=westeurope
+ #Languages=
+--- l10n/gn/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gn/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,6 +37,7 @@
+ Name[uk]=Гвінея
+ Name[uz]=Гвинея
+ Name[wa]=Guinêye
++Name[zh_CN]=几内亚
+ Name[zh_TW]=幾內亞
+ Region=westafrica
+ Languages=fr
+--- l10n/gp/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gp/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,6 +35,7 @@
+ Name[tg]=Гвадалуппо
+ Name[uk]=Гваделупа
+ Name[uz]=Гваделупа
++Name[zh_CN]=瓜德罗普
+ Name[zh_TW]=瓜德魯普
+ Region=caribbean
+ Languages=fr
+--- l10n/gq/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gq/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -56,6 +56,7 @@
+ Name[uk]=Екваторіальна Гвінея
+ Name[uz]=Экваториал Гвинея
+ Name[wa]=Guinêye Ecwåtoriåle
++Name[zh_CN]=赤道几内亚
+ Name[zh_TW]=赤道幾內亞
+ Region=centralafrica
+ Languages=es,fr,en_GB
+--- l10n/gt/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gt/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,6 +36,7 @@
+ Name[uk]=Гватемала
+ Name[uz]=Гватемала
+ Name[wa]=Gwatemala
++Name[zh_CN]=危地马拉
+ Name[zh_TW]=瓜地馬拉
+ Region=centralamerica
+ Languages=es
+--- l10n/wf/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/wf/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -60,6 +60,7 @@
+ Name[uz]=Уоллис ва Футуна Ороллари
+ Name[vi]=Wallis và Futuna
+ Name[wa]=Wallis et Futuna
++Name[zh_CN]=瓦利斯和富图纳群岛
+ Region=oceania
+ Languages=fr
+ #DecimalSymbol=,
+--- l10n/gw/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gw/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,6 +35,7 @@
+ Name[uk]=Гвінея-Бісау
+ Name[uz]=Гвинея-Биссау
+ Name[wa]=Guinêye-Bissaw
++Name[zh_CN]=几内亚比绍
+ Name[zh_TW]=幾內亞比紹
+ Region=westafrica
+ Languages=es
+--- l10n/caribbean.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/caribbean.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -63,4 +63,5 @@
+ Name[uk]=Карибські острови
+ Name[uz]=Кариб Ороллари
+ Name[wa]=Carayibes
++Name[zh_CN]=加勒比
+ Name[zh_TW]=加勒比
+--- l10n/gy/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/gy/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -36,6 +36,7 @@
+ Name[tr]=Guana
+ Name[uk]=Гайяна
+ Name[uz]=Гвиана
++Name[zh_CN]=圭亚那
+ Name[zh_TW]=蓋亞納
+ Region=southamerica
+ Languages=en_GB
+--- l10n/ws/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ws/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -29,6 +29,7 @@
+ Name[uk]=Самоа
+ Name[uz]=Самоа
+ Name[wa]=Samowa
++Name[zh_CN]=萨摩亚群岛
+ Name[zh_TW]=薩摩亞
+ Region=oceania
+ Languages=en_GB
+--- l10n/pe/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/pe/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -37,6 +37,7 @@
+ Name[uk]=Перу
+ Name[uz]=Перу
+ Name[wa]=Perou
++Name[zh_CN]=秘鲁
+ Name[zh_TW]=秘魯
+ Region=southamerica
+ Languages=es
+--- l10n/pf/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/pf/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -60,6 +60,7 @@
+ Name[uz]=Француз Полинезия
+ Name[vi]=Polynesia thuộc Pháp
+ Name[wa]=Polinezeye francesse
++Name[zh_CN]=法属波利尼西亚
+ Name[zh_TW]=法屬波利尼西亞
+ Region=oceania
+ Languages=fr
+--- l10n/pg/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/pg/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -57,6 +57,7 @@
+ Name[uk]=Папуа Нова Гвінея
+ Name[uz]=Папуа Янги Гвинея
+ Name[wa]=Papouwazeye Nouve Guinêye
++Name[zh_CN]=巴布亚新几内亚
+ Name[zh_TW]=巴布紐幾內亞
+ Region=oceania
+ Languages=en_GB
+--- l10n/ph/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ph/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -59,6 +59,7 @@
+ Name[uk]=Філіппіни
+ Name[uz]=Филиппин
+ Name[wa]=Filipenes
++Name[zh_CN]=菲律宾
+ Name[zh_TW]=菲律賓
+ Region=southeastasia
+ Languages=en_GB
+--- l10n/hr/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/hr/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -64,6 +64,7 @@
+ Name[uk]=Хорватія
+ Name[uz]=Хорватия
+ Name[wa]=Crowåceye
++Name[zh_CN]=克罗地亚
+ Name[zh_TW]=克羅埃西亞
+ Region=southeurope
+ Languages=hr
+--- l10n/pm/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/pm/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -56,6 +56,7 @@
+ Name[uk]=Сент-П'єр і Мікелон
+ Name[uz]=Сент-Пер ва Микелон
+ Name[wa]=Sint Pire et Miquelon
++Name[zh_CN]=圣皮埃尔和密克隆
+ Region=northamerica
+ Languages=es,en_GB
+ #DecimalSymbol=,
+--- l10n/pn/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/pn/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -21,6 +21,7 @@
+ Name[ta]=பிட்காய்ன்
+ Name[tg]=Питкорин
+ Name[uz]=Питкерн
++Name[zh_CN]=皮特开恩
+ Name[zh_TW]=匹特開恩島
+ Region=oceania
+ Languages=en_GB
+--- l10n/ps/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ps/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -65,6 +65,7 @@
+ Name[vi]=Lãnh thổ của Palestine
+ Name[wa]=Palestene
+ Name[xh]=Umhlaba wePalestina
++Name[zh_CN]=巴勒斯坦地区
+ Name[zh_TW]=巴勒斯坦領地
+ Name[zu]=Indawo yama-Phalesitina
+ Region=middleeast
+--- l10n/pt/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/pt/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -41,6 +41,7 @@
+ Name[uk]=Португалія
+ Name[uz]=Португалия
+ Name[vi]=Bồ Đào Nha
++Name[zh_CN]=葡萄牙
+ Name[zh_TW]=葡萄牙
+ Region=westeurope
+ Languages=pt
+--- l10n/ad/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ad/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -30,6 +30,7 @@
+ Name[uk]=Андорра
+ Name[uz]=Андорра
+ Name[wa]=Andore
++Name[zh_CN]=安道尔
+ Name[zh_TW]=安道爾
+ Region=westeurope
+ Languages=ca,fr,es
+--- l10n/ag/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ag/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -66,6 +66,7 @@
+ Name[vi]=Antigua và Barbuda
+ Name[wa]=Antigua eyet Barbuda
+ Name[xh]=Antigua ne Barbuda
++Name[zh_CN]=安提瓜和巴布达
+ Name[zh_TW]=安地瓜島和巴布達島
+ Name[zu]=Antigua kanye ne-Barbuda
+ Region=caribbean
+--- l10n/py/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/py/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -45,6 +45,7 @@
+ Name[uk]=Парагвай
+ Name[uz]=Парагвай
+ Name[wa]=Paragway
++Name[zh_CN]=巴拉圭
+ Name[zh_TW]=巴拉圭
+ Region=southamerica
+ Languages=es
+--- l10n/an/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/an/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -57,6 +57,7 @@
+ Name[uz]=Нидерландлар Антил Ороллари
+ Name[vi]=Hà Lan Antilles
+ Name[wa]=Antiyes Neyerlandesses
++Name[zh_CN]=荷属安的列斯群岛
+ Name[zh_TW]=荷屬安地列斯群島
+ Region=caribbean
+ Languages=nl,en_GB,es
+--- l10n/as/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/as/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -58,6 +58,7 @@
+ Name[uk]=Американське Самоа
+ Name[uz]=Америка Самоаси
+ Name[wa]=Samowa Amerikinne
++Name[zh_CN]=美属萨摩亚
+ Name[zh_TW]=美屬薩摩亞
+ Region=oceania
+ Languages=en_US
+--- l10n/il/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/il/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -45,6 +45,7 @@
+ Name[uz]=Исроил
+ Name[wa]=Israyel
+ Name[xh]=USirayeli
++Name[zh_CN]=以色列
+ Name[zh_TW]=以色列
+ Region=middleeast
+ Languages=he,ar
+--- l10n/aw/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/aw/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -25,6 +25,7 @@
+ Name[uk]=Аруба
+ Name[uz]=Аруба
+ Name[wa]=Arouba
++Name[zh_CN]=阿鲁巴
+ Name[zh_TW]=阿魯巴
+ Region=caribbean
+ Languages=nl,en_GB,sp
+--- l10n/ir/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ l10n/ir/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -35,6 +35,7 @@
+ Name[tr]=Ä°ran
+ Name[uk]=Іран
+ Name[uz]=Эрон
++Name[zh_CN]=伊朗
+ Name[zh_TW]=伊朗
+ Region=middleeast
+ Languages=
+--- kdm/config.def	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdm/config.def	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -2046,6 +2046,16 @@
+  </varlistentry>
+  </variablelist>
+ 
++# This needs to come _in front_ of the font settings to be effective!
++Key: AntiAliasing
++Type: bool
++Default: false
++User: greeter
++Instance: #*/!
++Comment: &
++Description:
++ Whether the fonts used in the greeter should be antialiased.
++
+ Key: GreetFont
+ Type: string
+ Default: "charter,24,5,0,50,0"
+@@ -2076,15 +2086,6 @@
+ Description:
+  The font used for the <quote>Login Failed</quote> message.
+ 
+-Key: AntiAliasing
+-Type: bool
+-Default: false
+-User: greeter-c
+-Instance: #*/!
+-Comment: &
+-Description:
+- Whether the fonts used in the greeter should be antialiased.
+-
+ Key: NumLock
+ Type: enum
+  Off: turn off
+--- kdm/kfrontend/kdm_greet.c	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdm/kfrontend/kdm_greet.c	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -738,7 +738,6 @@
+ main( int argc ATTR_UNUSED, char **argv )
+ {
+ 	char *ci;
+-	FILE *f;
+ 	int i;
+ 	char qtrc[40];
+ 
+@@ -779,14 +778,6 @@
+ 	if (!(savhome = strdup( qtrc )))
+ 		LogPanic( "Cannot save $HOME\n" );
+ 	atexit( cleanup );
+-	strcat( qtrc, "/.qt" );
+-	mkdir( qtrc, 0700 );
+-	strcat( qtrc, "/qtrc" );
+-	if (!(f = fopen( qtrc, "w" )))
+-		LogPanic( "Cannot create qt config\n" );
+-	fprintf( f, "[General]\nuseXft=%s\n",
+-	         _antiAliasing ? "true" : "false" );
+-	fclose( f );
+ 
+ 	setenv( "LC_ALL", _language, 1 );
+ 
+--- kdm/kfrontend/kdmshutdown.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdm/kfrontend/kdmshutdown.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -630,12 +630,10 @@
+ 		box->addWidget( lab );
+ 		QListView *lv = new QListView( this );
+ 		lv->setSelectionMode( QListView::NoSelection );
+-		lv->setResizeMode( QListView::AllColumns );
+ 		lv->setAllColumnsShowFocus( true );
++		lv->header()->setResizeEnabled( false );
+ 		lv->addColumn( i18n("Session") );
+ 		lv->addColumn( i18n("Location") );
+-		lv->setColumnWidthMode( 0, QListView::Maximum );
+-		lv->setColumnWidthMode( 1, QListView::Maximum );
+ 		QListViewItem *itm;
+ 		int ns = 0;
+ 		QString user, loc;
+@@ -644,12 +642,8 @@
+ 			itm = new QListViewItem( lv, user, loc );
+ 		}
+ 		int fw = lv->frameWidth() * 2;
+-		QSize hds( lv->header()->sizeHint() );
+-		lv->setMinimumWidth( fw + hds.width() +
+-			(ns > 10 ? style().pixelMetric( QStyle::PM_ScrollBarExtent ) : 0 ) );
+-		lv->setFixedHeight( fw + hds.height() +
++		lv->setFixedHeight( fw + lv->header()->height() +
+ 			itm->height() * (ns < 3 ? 3 : ns > 10 ? 10 : ns) );
+-		lv->header()->adjustHeaderSize();
+ 		box->addWidget( lv );
+ 		complete( lv );
+ 	} else
+--- kdm/kfrontend/sessions/xfce4.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdm/kfrontend/sessions/xfce4.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -6,7 +6,6 @@
+ Name=XFce 4
+ Name[eo]=Facoj 4
+ Name[hi]=एक्सएफसीई4
+-Name[pa]=XFce ੪
+ Name[sv]=Xfce 4
+ Comment=The Cholesterol Free Desktop Environment, version 4. A desktop environment reminiscent of CDE
+ Comment[af]=Die Kolesterol Vrye Werkskerm Omgewing, weergawe 4. Boots CDE na
+--- kdm/kfrontend/sessions/lwm.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdm/kfrontend/sessions/lwm.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -38,7 +38,7 @@
+ Comment[nds]=De Lightweight-Finsterpleger. Eenfach en Finsterpleger ahn Instellen
+ Comment[nl]=De Lightweight Window Manager, een niet-instelbare, kale windowmanager
+ Comment[nn]=Lightweight Window Manager. Ein enkel vindaugssjef utan innstillingar.
+-Comment[pa]=ਇੱਕ ਹਲਕਾ, ਨਾ-ਸੰਰਚਿਤਯੋਗ ਝਰੋਖਾ ਪ੍ਰਬੰਧਕ
++Comment[pa]=ਇੱਕ ਹਲਕਾ, ਨਾ-ਸੰਰਚਨਾ-ਯੋਗ ਝਰੋਖਾ ਪ੍ਰਬੰਧਕ
+ Comment[pl]=Lightweight Window Manager (Lekki menedżer okien). Surowy menedżer okien bez możliwości konfiguracji
+ Comment[pt]=O Lightweight Window Manager. Um gestor de janelas não-configurável e básico
+ Comment[pt_BR]=Um gerenciador de janelas leve, sendo básico e não muito configurável
+--- kdm/kfrontend/sessions/gnome.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdm/kfrontend/sessions/gnome.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -43,7 +43,7 @@
+ Comment[nds]=De GNU Network Object Model Environment. En kumplette Schriefdisch-Ümgeven, ümsunst un eenfach to bruken
+ Comment[nl]=De GNU Network Object Model Environment, een complete, vrije en eenvoudig te gebruiken desktop environment.
+ Comment[nn]=GNU Network Object Model Environment. Eit skrivebordsmiljø som er komplett, fritt og lett å bruka.
+-Comment[pa]=GNU Network Object Model Environment ।ਇੱਕ ਸੰਪੂਰਨ, ਮੁਫਤ ਅਤ ਵਰਤਣ ਵਿੱਚ ਅਤਿ ਆਸਾਨ ਵਿਹੜਾ ਵਾਤਾਵਰਣ
++Comment[pa]=GNU Network Object Model Environment । ਇੱਕ ਸੰਪੂਰਨ, ਮੁਫਤ ਅਤ ਵਰਤਣ ਵਿੱਚ ਅਤਿ ਆਸਾਨ ਵਿਹੜਾ ਵਾਤਾਵਰਣ
+ Comment[pl]=GNU Network Object Model Environment (GNOME). Pełne, wolne i łatwe w użyciu środowisko pulpitu
+ Comment[pt]=O GNU Network Object Model Environment. Um ambiente de trabalho completo, livre e fácil de usar
+ Comment[pt_BR]=Acrônimo para GNU Network Object Model Environment ou Ambiente de Modelo de Objetos de Rede GNU; um ambiente de trabalho completo, livre e fácil de usar
+--- kdm/kfrontend/kdmconfig.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdm/kfrontend/kdmconfig.cpp	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -92,6 +92,9 @@
+ 		aRetFont.setFixedPitch( nFontBits & 0x08 != 0 );
+ 		aRetFont.setRawMode( nFontBits & 0x20 != 0 );
+ 	}
++	aRetFont.setStyleStrategy( (QFont::StyleStrategy)
++	   (QFont::PreferMatch |
++	    (_antiAliasing ? QFont::PreferAntialias : QFont::NoAntialias)) );
+ 
+ 	return aRetFont;
+ }
+--- kdm/README	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ kdm/README	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -168,7 +168,7 @@
+ directory specified by FifoDir=. The subdir is the key to addressing and
+ security; the sockets all have the file name "socket" and file permissions
+ rw-rw-rw- (0666). This is because some systems don't care for the file
+-permission of the socket files.
++permissions of the socket files.
+ There are two types of sockets: the global one (dmctl) and the per-display
+ ones (dmctl-<display>).
+ The global one's subdir is owned by root, the subdirs of the per-display
+@@ -313,12 +313,12 @@
+   IFS=$'\t'
+   set -- `kdmctl listbootoptions`
+   if [ "$1" = ok ]; then
+-	fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}')
+-	if [ -n "$fbsd" ]; then
++    fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}')
++    if [ -n "$fbsd" ]; then
+       kdmctl shutdown reboot "=$fbsd" ask > /dev/null
+-	else
+-	  echo "FreeBSD boot unavailable."
+-	fi
++    else
++      echo "FreeBSD boot unavailable."
++    fi
+   else
+     echo "Boot options unavailable."
+   fi
+--- ksysguard/gui/ksysguard.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 438047)
++++ ksysguard/gui/ksysguard.desktop	(.../branches/KDE/3.4/kdebase)	(revision 438047)
+@@ -49,7 +49,7 @@
+ GenericName[nds]=Leisten-Monitor
+ GenericName[nl]=Prestatiemonitor
+ GenericName[nn]=Ytelsesovervakar
+-GenericName[pa]=ਕਾਰਜਕੁਸ਼ਤਾ ਨਿਗਰਾਨ
++GenericName[pa]=ਪਰਦਰਸ਼ਨ ਨਿਗਰਾਨ
+ GenericName[pl]=Monitor wydajności
+ GenericName[pt]=Monitor de Performance
+ GenericName[pt_BR]=Monitor de Performance

Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff	2005-07-26 20:23:27 UTC (rev 1376)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff	2005-07-26 20:25:28 UTC (rev 1377)
@@ -1,142 +1,18 @@
---- kde.orig/kcontrol/fonts/fonts.cpp
-+++ kde.patched/kcontrol/fonts/fonts.cpp
-@@ -401,7 +401,7 @@
+--- kdebase-3.4.2/kdm/config.def	2005-07-24 03:20:34.669627040 +0000
++++ config.def	2005-07-24 03:22:34.563400416 +0000
+@@ -2049,29 +2049,29 @@
+ # This needs to come _in front_ of the font settings to be effective!
+ Key: AntiAliasing
+ Type: bool
+-Default: false
++Default: true
+ User: greeter
+-Instance: #*/!
++Instance: */
+ Comment: &
+ Description:
+  Whether the fonts used in the greeter should be antialiased.
  
- void FontAASettings::defaults()
- {
--  excludeRange->setChecked(true);
-+  excludeRange->setChecked(false);
-   excludeFrom->setValue(8.0);
-   excludeTo->setValue(15.0);
-   useSubPixel->setChecked(false);
-@@ -524,17 +524,17 @@
- 
-   // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
- 
--  QFont f0("helvetica", 12);
--  QFont f1("courier", 12);
--  QFont f2("helvetica", 10);
--  QFont f3("helvetica", 12, QFont::Bold);
--  QFont f4("helvetica", 11);
-+  QFont f0("Sans Serif", 10);
-+  QFont f1("Monospace", 10);
-+  QFont f2("Sans Serif", 10);
-+  QFont f3("Sans Serif", 10, QFont::Bold);
-+  QFont f4("Sans Serif", 10);
- 
--  f0.setPointSize(12);
--  f1.setPointSize(12);
-+  f0.setPointSize(10);
-+  f1.setPointSize(10);
-   f2.setPointSize(10);
--  f3.setPointSize(12);
--  f4.setPointSize(11);
-+  f3.setPointSize(10);
-+  f4.setPointSize(10);
- 
-   defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
- 
-@@ -656,7 +656,7 @@
-   for ( int i = 0; i < (int) fontUseList.count(); i++ )
-     fontUseList.at( i )->setDefault();
- 
--  useAA = false;
-+  useAA = true;
-   cbAA->setChecked(useAA);
-   aaSettings->defaults();
-   emit changed(true);
---- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml
-+++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
-@@ -113,12 +113,12 @@
-   </panel>
-   <widgets name="Plastik" />
-   <fonts>
--    <font value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
--    <fixed value="Courier New,10,-1,5,50,0,0,0,0,0" object="General" />
--    <toolBarFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
--    <menuFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
--    <activeFont value="Arial,12,-1,5,75,0,0,0,0,0" object="WM" />
--    <taskbarFont value="Arial,11,-1,5,50,0,0,0,0,0" object="General" />
-+    <font value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
-+    <fixed value="Monospace,10,-1,5,50,0,0,0,0,0" object="General" />
-+    <toolBarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
-+    <menuFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
-+    <activeFont value="Sans Serif,10,-1,5,75,0,0,0,0,0" object="WM" />
-+    <taskbarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
-     <StandardFont value="" object="FMSettings" />
-   </fonts>
- </ktheme>
---- kde.orig/kcontrol/kdm/kdm-font.cpp
-+++ kde.patched/kcontrol/kdm/kdm-font.cpp
-@@ -90,9 +90,9 @@
- 
- void KDMFontWidget::set_def()
- {
--  stdFontChooser->setFont(QFont("helvetica", 12));
-+  stdFontChooser->setFont(QFont("Sans Serif", 10));
-   failFontChooser->setFont(QFont("helvetica", 12, QFont::Bold));
--  greetingFontChooser->setFont(QFont("charter", 24));
-+  greetingFontChooser->setFont(QFont("Sans Serif", 22));
- }
- 
- void KDMFontWidget::save()
-@@ -128,7 +128,7 @@
- void KDMFontWidget::defaults()
- {
-   set_def();
--  aacb->setChecked(false);
-+  aacb->setChecked(true);
- }
- 
- #include "kdm-font.moc"
---- kde.orig/kpersonalizer/keyecandypage.cpp
-+++ kde.patched/kpersonalizer/keyecandypage.cpp
-@@ -594,20 +594,9 @@
- void KEyeCandyPage::enableAntialiasingFonts(bool enable, bool reset){
- 	if (!reset){
- 		if ( ( (sys->isXfromXFreeInc() && (sys->getXRelease() > 40000000)) || sys->isXfromXOrg() )
--		     && sys->getRenderSupport()
--		     && (*userFonts.at(1)).contains("elvetica")) {
-+		     && sys->getRenderSupport() ) {
- 			QSettings().writeEntry("/qt/useXft", enable);
- 			QSettings().writeEntry("/qt/enableXft", enable);
--			if (enable) {
--				KGlobal::config()->setGroup("General");
--				KGlobal::config()->writeEntry("fixed", sys->getFixedWidthFont().toString(), true, true);
--				KGlobal::config()->writeEntry("font", sys->getNormalFont().toString(), true, true);
--				KGlobal::config()->writeEntry("menuFont", sys->getNormalFont().toString(), true, true);
--				KGlobal::config()->writeEntry("taskbarFont", sys->getSmallFont().toString(), true, true);
--				KGlobal::config()->writeEntry("toolBarFont", sys->getNormalFont().toString(), true, true);
--				KGlobal::config()->setGroup("WM");
--				KGlobal::config()->writeEntry("activeFont", sys->getBoldFont().toString(), true, true);
--			}
- 		}
- 	} else {
- 		QSettings().writeEntry("/qt/useXft", b_useXft);
-@@ -717,13 +706,13 @@
- 	b_useXft=QSettings().readBoolEntry("/qt/useXft");
- 	b_enableXft=QSettings().readBoolEntry("/qt/enableXft");
- 	KGlobal::config()->setGroup("General");
--	userFonts.append(KGlobal::config()->readEntry("fixed", "courier,10,-1,5,50,0,0,0,0,0"));
--	userFonts.append(KGlobal::config()->readEntry("font", "helvetica,12,-1,5,50,0,0,0,0,0"));
--	userFonts.append(KGlobal::config()->readEntry("menuFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
--	userFonts.append(KGlobal::config()->readEntry("taskbarFont", "helvetica,11,-1,5,50,0,0,0,0,0"));
--	userFonts.append(KGlobal::config()->readEntry("toolBarFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("fixed", "Monospace,10,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("font", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("menuFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("taskbarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("toolBarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
- 	KGlobal::config()->setGroup("WM");
--	userFonts.append(KGlobal::config()->readEntry("activeFont", "helvetica,12,-1,5,75,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("activeFont", "Sans Serif,10,-1,5,75,0,0,0,0,0"));
- 
- 	KGlobal::config()->setGroup("PanelIcons");
- 	st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
---- kde.orig/kdm/config.def
-+++ kde.patched/kdm/config.def
-@@ -2048,20 +2048,20 @@
- 
  Key: GreetFont
  Type: string
 -Default: "charter,24,5,0,50,0"
@@ -160,35 +36,3 @@
  Comment: &
  Description:
   The normal font used in the greeter.
-@@ -2078,9 +2078,9 @@
- 
- Key: AntiAliasing
- Type: bool
--Default: false
-+Default: true
- User: greeter-c
--Instance: #*/!
-+Instance: */
- Comment: &
- Description:
-  Whether the fonts used in the greeter should be antialiased.
---- kde.orig/ksplashml/themeengine/standard/themestandard.cpp
-+++ kde.patched/ksplashml/themeengine/standard/themestandard.cpp
-@@ -32,7 +32,7 @@
-
- ThemeStandard::ThemeStandard( QWidget *parent, const char *name, const QStringList &args )
-   :ThemeEngine( parent, name, args ), mIcon(0L), mPrevIcon(0L), mIconCount(0), mStdIconWidth(-1),
--  mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("helvetica"),
-+  mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("Sans Serif"),
-   mSbFontSz(16), mSbFontBold(true), mSbFontItalic(false), mSbFont(QFont()), mSbFg(QColor()), mSbBg(QColor()),
-   mSbIcon("run"), mIconsVisible(true), mIconsJumping(true), mSplashScreen("(Default)")
- {
-@@ -148,7 +148,7 @@
-   mSbVisible = cfg->readBoolEntry( "Statusbar Visible", true);
-   mSbPbVisible = cfg->readBoolEntry( "Progress Visible", true);
-
--  mSbFontName = cfg->readEntry( "Statusbar Font", "helvetica" );
-+  mSbFontName = cfg->readEntry( "Statusbar Font", "Sans Serif" );
-   mSbFontSz = cfg->readNumEntry( "Statusbar Font Size", 16 );
-   mSbFontBold = cfg->readBoolEntry( "Statusbar Font Bold", true );
-   mSbFontItalic = cfg->readBoolEntry( "Statusbar Font Italic", false );

More information about the Pkg-kde-commits mailing list