SOURCES: kdebase-branch.diff, kdepim-branch.diff - up from upstream

arekm arekm at pld-linux.org
Sat Dec 31 17:58:36 CET 2005 

Author: arekm                        Date: Sat Dec 31 16:58:36 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up from upstream

---- Files affected:
SOURCES:
   kdebase-branch.diff (1.20 -> 1.21) , kdepim-branch.diff (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.20 SOURCES/kdebase-branch.diff:1.21
--- SOURCES/kdebase-branch.diff:1.20	Tue Dec  6 18:31:00 2005
+++ SOURCES/kdebase-branch.diff	Sat Dec 31 17:58:31 2005
@@ -1,7 +1,7 @@
 Index: ksmserver/shutdown.h
 ===================================================================
---- ksmserver/shutdown.h	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ ksmserver/shutdown.h	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- ksmserver/shutdown.h	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ ksmserver/shutdown.h	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -1,87 +0,0 @@
 -/*****************************************************************
 -ksmserver - the KDE session management server
@@ -93,7 +93,7 @@
 Index: ksmserver/shutdowndlg.cpp
 ===================================================================
 --- ksmserver/shutdowndlg.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/shutdowndlg.cpp	(.../branches/KDE/3.5/kdebase)	(revision 486057)
++++ ksmserver/shutdowndlg.cpp	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -0,0 +1,273 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -381,7 +381,7 @@
 Index: ksmserver/startup.cpp
 ===================================================================
 --- ksmserver/startup.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/startup.cpp	(.../branches/KDE/3.5/kdebase)	(revision 486057)
++++ ksmserver/startup.cpp	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -0,0 +1,289 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -685,7 +685,7 @@
 Index: ksmserver/legacy.cpp
 ===================================================================
 --- ksmserver/legacy.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/legacy.cpp	(.../branches/KDE/3.5/kdebase)	(revision 486057)
++++ ksmserver/legacy.cpp	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -0,0 +1,388 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -1087,8 +1087,8 @@
 
 Index: ksmserver/server.cpp
 ===================================================================
---- ksmserver/server.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ ksmserver/server.cpp	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- ksmserver/server.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ ksmserver/server.cpp	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -2,6 +2,7 @@
  ksmserver - the KDE session management server
  
@@ -2308,7 +2308,7 @@
 Index: ksmserver/shutdowndlg.h
 ===================================================================
 --- ksmserver/shutdowndlg.h	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/shutdowndlg.h	(.../branches/KDE/3.5/kdebase)	(revision 486057)
++++ ksmserver/shutdowndlg.h	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -0,0 +1,88 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -2410,8 +2410,8 @@
 
 Index: ksmserver/shutdown.cpp
 ===================================================================
---- ksmserver/shutdown.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ ksmserver/shutdown.cpp	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- ksmserver/shutdown.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ ksmserver/shutdown.cpp	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -2,267 +2,514 @@
  ksmserver - the KDE session management server
  
@@ -3122,8 +3122,8 @@
 +}
 Index: ksmserver/server.h
 ===================================================================
---- ksmserver/server.h	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ ksmserver/server.h	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- ksmserver/server.h	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ ksmserver/server.h	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -33,37 +33,8 @@
  typedef QValueList<QCString> QCStringList;
  class KSMListener;
@@ -3211,7 +3211,7 @@
 Index: ksmserver/client.cpp
 ===================================================================
 --- ksmserver/client.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/client.cpp	(.../branches/KDE/3.5/kdebase)	(revision 486057)
++++ ksmserver/client.cpp	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -0,0 +1,190 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -3415,8 +3415,8 @@
 
 Index: ksmserver/test.cpp
 ===================================================================
---- ksmserver/test.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ ksmserver/test.cpp	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- ksmserver/test.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ ksmserver/test.cpp	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -1,4 +1,4 @@
 -#include <shutdown.h>
 +#include "shutdowndlg.h"
@@ -3442,7 +3442,7 @@
 Index: ksmserver/client.h
 ===================================================================
 --- ksmserver/client.h	(.../tags/KDE/3.5.0/kdebase)	(revision 0)
-+++ ksmserver/client.h	(.../branches/KDE/3.5/kdebase)	(revision 486057)
++++ ksmserver/client.h	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -0,0 +1,60 @@
 +/*****************************************************************
 +ksmserver - the KDE session management server
@@ -3516,8 +3516,8 @@
 
 Index: ksmserver/Makefile.am
 ===================================================================
---- ksmserver/Makefile.am	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ ksmserver/Makefile.am	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- ksmserver/Makefile.am	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ ksmserver/Makefile.am	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -22,11 +22,13 @@
  bin_PROGRAMS =
  lib_LTLIBRARIES =
@@ -3545,18 +3545,52 @@
  	$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
 Index: ksmserver/server2.h
 ===================================================================
---- ksmserver/server2.h	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ ksmserver/server2.h	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- ksmserver/server2.h	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ ksmserver/server2.h	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -12,3 +12,5 @@
  #include <X11/SM/SM.h>
  #include <X11/SM/SMlib.h>
  }
 +
 +#include <fixx11h.h>
+Index: debian/local/kdm.options.5
+===================================================================
+--- debian/local/kdm.options.5	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ debian/local/kdm.options.5	(.../branches/KDE/3.5/kdebase)	(revision 492936)
+@@ -13,8 +13,8 @@
+ .\"
+ .\" You should have received a copy of the GNU General Public License with
+ .\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
+-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
+-.\" Suite 330, Boston, MA 02110-1301 USA
++.\" not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++.\" Fifth Floor, Boston, MA 02110-1301 USA
+ .TH kdm.options 5 "2003\-09\-18" "Debian Project"
+ .SH NAME
+ kdm.options \- configuration options for X display manager
+Index: kate/data/kateui.rc
+===================================================================
+--- kate/data/kateui.rc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kate/data/kateui.rc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
+@@ -85,12 +85,12 @@
+   <Menu name="window"><text>&amp;Window</text>
+     <Action name="view_new_view" />
+     <Separator />
+-    <Action name="view_new_tab"/>
++<!--    <Action name="view_new_tab"/>
+     <Action name="view_close_tab"/>
+     <Separator />
+     <Action name="view_next_tab"/>
+     <Action name="view_prev_tab"/>
+-    <Separator />
++    <Separator />-->
+     <Action name="view_split_vert"/>
+     <Action name="view_split_horiz"/>
+     <Action name="view_close_current_space" />
 Index: kate/data/kateplugin.desktop
 ===================================================================
---- kate/data/kateplugin.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kate/data/kateplugin.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kate/data/kateplugin.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kate/data/kateplugin.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -70,7 +70,6 @@
  Comment[uk]=Đ’Ń‚ŃƒĐťĐžĐş Kate
  Comment[uz]=Kate ŃƒŃ‡ŃƒĐ˝ пНагин
@@ -3567,8 +3601,8 @@
  Comment[zu]=I-Plugin ye-Kate
 Index: kate/data/kate.desktop
 ===================================================================
---- kate/data/kate.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kate/data/kate.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kate/data/kate.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kate/data/kate.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -62,7 +62,6 @@
  GenericName[uz]=КонгаКтириНган Патн таҳрирчи
  GenericName[vi]=TrĂŹnh soấn văn bản tiĂŞn tiáşżn
@@ -3587,8 +3621,8 @@
  X-KDE-StartupNotify=true
 Index: kate/data/kwrite.desktop
 ===================================================================
---- kate/data/kwrite.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kate/data/kwrite.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kate/data/kwrite.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kate/data/kwrite.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -73,7 +73,6 @@
  GenericName[vi]=TrĂŹnh soấn văn bản
  GenericName[wa]=Aspougneu di tecse
@@ -3631,8 +3665,8 @@
 
 Index: kdepasswd/kcm/kcm_useraccount.desktop
 ===================================================================
---- kdepasswd/kcm/kcm_useraccount.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kdepasswd/kcm/kcm_useraccount.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kdepasswd/kcm/kcm_useraccount.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kdepasswd/kcm/kcm_useraccount.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -57,16 +57,17 @@
  Name[sr at Latn]=Lozinka i korisnički nalog
  Name[sv]=LÜsenord och användarkonto
@@ -3682,6 +3716,15 @@
  Keywords[zh_CN]=password,email,name,organization,realname,login image,face,echo mode,密码,甾子邎䝜,ĺ§“ĺ,睄睇,çœŸĺŽžĺ§“ĺ,ç™ťé™†ĺ›žĺƒ,ĺ¤´ĺƒ,ĺ›žć˜ž
  Keywords[zh_TW]=password,email,name,organization,realname,login image,face,echo mode,密碟,é›ťĺ­éƒľäťś,çľ„çš”,çœŸĺ,癝ĺ
Ľĺœ–片,é˘č˛Œ,ĺ›žéŸłć¨Ąĺź
  Comment=User information such as password, name and email
+@@ -122,7 +126,7 @@
+ Comment[eu]=Erabiltzaileari buruzko informazioa; pasahitza, izena eta posta-helbidea, adibidez.
+ Comment[fi]=Käyttäjien tiedot, kuten salasanat, nimet ja sähkÜpostiosoite
+ Comment[fr]=Informations sur l'utilisateur, comme le mot de passe, le nom, et l'adresse ĂŠlectronique
+-Comment[fy]=brĂťkersynformaasje sa as wachtwurd, namme en e adres
++Comment[fy]=BrĂťkersynformaasje sa as wachtwurd, namme en e-adres
+ Comment[gl]=InformazĂłn do usuĂĄrio como contrasinal, nome e correo-e
+ Comment[he]=מידע אי׊י כגון ץץמה, ׊ם וכתובת דוא"ל
+ Comment[hi]=ŕ¤‰ŕ¤Şŕ¤ŻŕĽ‹ŕ¤•ŕĽŕ¤¤ŕ¤ž ŕ¤œŕ¤žŕ¤¨ŕ¤•ŕ¤žŕ¤°ŕĽ€ ŕ¤œŕĽˆŕ¤¸ŕĽ‡ कि पासवर्ड, नञऎ त़ञ ŕ¤ˆ-ऎ༇ल
 @@ -153,11 +157,11 @@
  Comment[sr at Latn]=Informacije o korisniku kao ĹĄto je lozinka, ime i e-poĹĄta
  Comment[sv]=Användarinformation som lÜsenord, namn och e-post
@@ -3697,8 +3740,8 @@
  Comment[zh_TW]=使用č€
čł‡č¨ŠĺŚ‚ĺŻ†ç˘źă€ĺç¨ąĺ’Œé›ťĺ­éƒľäťś
 Index: kdepasswd/kdepasswd.desktop
 ===================================================================
---- kdepasswd/kdepasswd.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kdepasswd/kdepasswd.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kdepasswd/kdepasswd.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kdepasswd/kdepasswd.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -60,11 +60,11 @@
  Name[sr at Latn]=Promeni lozinku
  Name[sv]=Ă„ndra lĂśsenord
@@ -3714,8 +3757,8 @@
  Name[zh_TW]=攚莊密碟
 Index: kpersonalizer/kpersonalizer.desktop
 ===================================================================
---- kpersonalizer/kpersonalizer.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kpersonalizer/kpersonalizer.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kpersonalizer/kpersonalizer.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kpersonalizer/kpersonalizer.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -12,6 +12,7 @@
  Name[be]=ĐœĐ°ĐšŃŃ‚Đ°Ń€ настрОКкі працОўнага cтаНа
  Name[bg]=ĐĐ°ŃŃ‚Ń€ĐžĐšĐşĐ¸ на райОтнОтО ĐźŃŃŃ‚Đž
@@ -3724,6 +3767,15 @@
  Name[bs]=PodeĹĄavanje radne povrĹĄine
  Name[ca]=Assistent de configuraciĂł de l'escriptori
  Name[cs]=PrĹŻvodce nastavenĂ­ pracovnĂ­ plochy
+@@ -44,7 +45,7 @@
+ Name[mn]=ТОŃ
Đ¸Ń€ŃƒŃƒĐťĐłĐ°-Đ˘ŃƒŃĐťĐ°ĐłŃ‡
+ Name[mt]=Saħħar għas-setings tad-desktop
+ Name[nb]=Veiviser for skrivebordsoppsett
+-Name[nds]=HĂźlper fĂśr't Schriefdisch-Inrichten
++Name[nds]=Schriefdischinstellen-HĂślper
+ Name[nl]=KDE's Configuratie Assistent
+ Name[nn]=Vegvisar for skrivebordsoppsett
+ Name[nso]=Wizard ya Dipeakanyo tsa Desktop
 @@ -71,7 +72,6 @@
  Name[ven]=Wizadi ya mavhekanyele a desikithopo
  Name[wa]=Macrea des apontiaedjes do scribanne
@@ -3734,8 +3786,8 @@
  Name[zu]=I-Wizard yezilungiselelo ze-Desktop
 Index: kfind/kfindpart.desktop
 ===================================================================
---- kfind/kfindpart.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kfind/kfindpart.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kfind/kfindpart.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kfind/kfindpart.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -68,7 +68,6 @@
  Name[ven]=Todani tshipida
  Name[vi]=TÏm tᝍng phần
@@ -3752,8 +3804,8 @@
 
 Index: kfind/findpart.desktop
 ===================================================================
---- kfind/findpart.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kfind/findpart.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kfind/findpart.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kfind/findpart.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -70,7 +70,6 @@
  Name[ven]=Todani tshipida
  Name[vi]=TÏm tᝍng phần
@@ -3764,8 +3816,8 @@
  Name[zu]=Thola Ingxenye
 Index: kfind/Kfind.desktop
 ===================================================================
---- kfind/Kfind.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kfind/Kfind.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kfind/Kfind.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kfind/Kfind.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -32,6 +32,7 @@
  Name[km]=ážšáž€â€‹ážŻáž€ážŸážśážš/ថត
  Name[lt]=Rasti bylas/aplankus
@@ -3790,8 +3842,8 @@
  X-KDE-StartupNotify=true
 Index: kcontrol/background/background.desktop
 ===================================================================
---- kcontrol/background/background.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/background/background.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/background/background.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/background/background.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -81,7 +81,6 @@
  Name[vi]=Ảnh nᝁn
  Name[wa]=Fond
@@ -3816,10 +3868,23 @@
  Keywords[zh_CN]=background,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple wallpapers,pixmap,čƒŒć™Ż,ćĄŒé˘,é˘œč‰˛,ĺ›žĺƒ,墙纸,桡色,嚳襥,矓冲,多个墙纸,ä˝ĺ›ž
  Keywords[zh_TW]=background,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple wallpapers,pixmap,čƒŒć™Ż,ćĄŒé˘,éĄč‰˛,ĺ˝ąĺƒ,ćĄŒĺ¸ƒ,桡色,嚳襥,緩衝,ĺ¤šĺ€‹ćĄŒĺ¸ƒ,ä˝ĺœ–
  Keywords[zu]=inkundla yangemuva,ama-desktop,imibala,imibala,izithombe,amaphepha ezindonga,ukuxubanisa,ukulinganisa,cache,amaphepha ezindonga eziningi,pixmap
+Index: kcontrol/background/bgrender.cpp
+===================================================================
+--- kcontrol/background/bgrender.cpp	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/background/bgrender.cpp	(.../branches/KDE/3.5/kdebase)	(revision 492936)
+@@ -978,7 +978,7 @@
+         fp += m_renderer[i]->fingerprint();
+     }
+     int h = QHash(fp);
+-    kdDebug() << k_funcinfo << " fp=\""<<fp<<"\" h="<<h<<endl;
++    //kdDebug() << k_funcinfo << " fp=\""<<fp<<"\" h="<<h<<endl;
+     return QHash(fp);
+ }
+ 
 Index: kcontrol/smartcard/smartcard.desktop
 ===================================================================
---- kcontrol/smartcard/smartcard.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/smartcard/smartcard.desktop	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/smartcard/smartcard.desktop	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/smartcard/smartcard.desktop	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -58,7 +58,6 @@
  Name[uz]=Smartcard'Нар
  Name[ven]=Garata
@@ -3846,8 +3911,8 @@
  Keywords[zu]=Ikhadi elikhaliphile,PKCS,SSLumfundi,okukhaliphile,ikhadi
 Index: kcontrol/krdb/kcs/KeramikEmerald.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/KeramikEmerald.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/KeramikEmerald.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/KeramikEmerald.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/KeramikEmerald.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -43,7 +43,6 @@
  Name[th]=ŕš€ŕ¸„ŕ¸Łŕ¸˛ŕ¸Ąŕ¸´ŕ¸ŕ¸Ąŕ¸Łŕ¸ŕ¸•
  Name[uz]=Đ—ŃƒĐźŃ€Đ°Đ´ кораПика
@@ -3858,9 +3923,17 @@
  activeBackground=213,166,55
 Index: kcontrol/krdb/kcs/Next.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/Next.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/Next.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
-@@ -44,7 +44,6 @@
+--- kcontrol/krdb/kcs/Next.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/Next.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
+@@ -26,6 +26,7 @@
+ Name[eo]=Neksto
+ Name[es]=NeXT
+ Name[fa]=Ř¨ŘšŘŻŰŒ
++Name[fy]=Fierder
+ Name[ga]=Ar Aghaidh
+ Name[hi]=ŕ¤
गलञ
+ Name[km]=áž”áž“áŸ’áž‘ážśáž”áŸ‹
+@@ -44,7 +45,6 @@
  Name[vi]=Tiáşżp theo 
  Name[wa]=NeXT
  Name[xh]=Elandelayo
@@ -3870,8 +3943,8 @@
  selectBackground=0,0,0
 Index: kcontrol/krdb/kcs/MediaPeach.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/MediaPeach.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/MediaPeach.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/MediaPeach.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/MediaPeach.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -31,7 +31,6 @@
  Name[uz]=ШафтОНи
  Name[ven]=Beregisi Zwimvumvusi
@@ -3882,8 +3955,8 @@
  Name[zu]=Unozindaba osapetshisi
 Index: kcontrol/krdb/kcs/BlueSlate.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/BlueSlate.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/BlueSlate.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/BlueSlate.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/BlueSlate.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -60,7 +60,6 @@
  Name[uz]=ĐšŃžĐşĐ¸Ńˆ ĐşŃƒĐť
  Name[ven]=Tshileiti tsha lutombo
@@ -3894,8 +3967,8 @@
  background=#9db9c8
 Index: kcontrol/krdb/kcs/YellowOnBlue.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -18,8 +18,10 @@
  Name[hu]=Erősen kontrasztos sårga, kÊk alapon
  Name[is]=HĂĄ birtuskila gult ĂĄ blĂĄu
@@ -3923,8 +3996,8 @@
  activeBackground=0,0,180
 Index: kcontrol/krdb/kcs/DesertRed.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/DesertRed.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/DesertRed.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/DesertRed.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/DesertRed.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -60,7 +60,6 @@
  Name[vi]=Đỏ chói
  Name[wa]=Rodje do dezert
@@ -3935,8 +4008,8 @@
  Name[zu]=Okubovu okogwadule
 Index: kcontrol/krdb/kcs/PointReyesGreen.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/PointReyesGreen.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/PointReyesGreen.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/PointReyesGreen.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/PointReyesGreen.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -63,7 +63,6 @@
  Name[ven]=Kha Muvhala mudala
  Name[vi]=MĂ u xanh Point Reyes 
@@ -3947,8 +4020,8 @@
  selectForeground=255,255,255
 Index: kcontrol/krdb/kcs/Keramik.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/Keramik.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/Keramik.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/Keramik.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/Keramik.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -21,7 +21,6 @@
  Name[th]=ŕš€ŕ¸„ŕ¸Łŕ¸˛ŕ¸Ąŕ¸´ŕ¸
  Name[uk]=КораПік
@@ -3959,8 +4032,8 @@
  activeForeground=255,255,255
 Index: kcontrol/krdb/kcs/Pumpkin.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/Pumpkin.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/Pumpkin.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/Pumpkin.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/Pumpkin.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -62,7 +62,6 @@
  Name[uz]=ҚОвОқ
  Name[ven]=Fhuri
@@ -3971,8 +4044,8 @@
  Name[zu]=Ithanga
 Index: kcontrol/krdb/kcs/KeramikWhite.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/KeramikWhite.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/KeramikWhite.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/KeramikWhite.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/KeramikWhite.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -59,7 +59,6 @@
  Name[uz]=Оқ кораПика
  Name[vi]=Keramik trắng
@@ -3983,8 +4056,8 @@
  Name[zu]=Okumhlophe kwe-Keramik
 Index: kcontrol/krdb/kcs/System.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/System.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/System.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/System.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/System.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -83,7 +83,6 @@
  Name[vi]=Hᝇ Thᝑng
  Name[wa]=Sistinme
@@ -3995,8 +4068,8 @@
  Name[zu]=Isistimu
 Index: kcontrol/krdb/kcs/AtlasGreen.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/AtlasGreen.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/AtlasGreen.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/AtlasGreen.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/AtlasGreen.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -58,7 +58,6 @@
  Name[ven]=Atlas Dala
  Name[vi]=MĂ u xanh Atlas
@@ -4007,8 +4080,8 @@
  background=#afb49f
 Index: kcontrol/krdb/kcs/BeOS.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/BeOS.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/BeOS.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/BeOS.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/BeOS.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -13,7 +13,6 @@
  Name[lo]=ຼະບຝບປະຕິບູດການ BeOS
  Name[tg]=ХистоПаи ОПиНи Be
@@ -4019,8 +4092,8 @@
  buttonBackground=217,217,217
 Index: kcontrol/krdb/kcs/SolarisCDE.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/SolarisCDE.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/SolarisCDE.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/SolarisCDE.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/SolarisCDE.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -16,7 +16,6 @@
  Name[tt]=QoyaĹŸlÄą
  Name[ven]=Solarisi
@@ -4031,8 +4104,8 @@
  activeForeground=255,255,255
 Index: kcontrol/krdb/kcs/DigitalCDE.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/DigitalCDE.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/DigitalCDE.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/DigitalCDE.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/DigitalCDE.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -38,7 +38,6 @@
  Name[ven]=CDE ya Didzhithala
  Name[vi]=CDE sáť‘
@@ -4043,8 +4116,8 @@
  background=#4b7b82
 Index: kcontrol/krdb/kcs/DarkBlue.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/DarkBlue.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/DarkBlue.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/DarkBlue.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/DarkBlue.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -80,7 +80,6 @@
  Name[ven]=Lutombo lwo nzwinzwimalaho
  Name[vi]=Màu xanh thẍm
@@ -4055,8 +4128,8 @@
  Name[zu]=Okuluhlaza kakhulu
 Index: kcontrol/krdb/kcs/CDE.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/CDE.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/CDE.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/CDE.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/CDE.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -6,7 +6,6 @@
  Name[mn]=КДE
  Name[tg]=ĐœŃƒŇłĐ¸Ń‚Đ¸ графикии ĐźŃƒŃˆŃ‚Đ°Ń€Đ°Đş (CDE)
@@ -4067,8 +4140,8 @@
  buttonForeground=#ffffff
 Index: kcontrol/krdb/kcs/Windows2000.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/Windows2000.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/Windows2000.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/Windows2000.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/Windows2000.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -12,7 +12,6 @@
  Name[uk]=РодПОнд 2000
  Name[uz]=РодПОнд 2000
@@ -4079,8 +4152,8 @@
  activeForeground=255,255,255
 Index: kcontrol/krdb/kcs/KDETwo.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/KDETwo.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/KDETwo.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/KDETwo.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/KDETwo.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -20,7 +20,6 @@
  Name[lo]=KDE
  Name[mn]=КДЭ 2
@@ -4091,8 +4164,8 @@
  visitedLinkColor=128,0,128
 Index: kcontrol/krdb/kcs/WindowsXP.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/WindowsXP.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/WindowsXP.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/WindowsXP.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/WindowsXP.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -11,7 +11,6 @@
  Name[th]=ŕš€ŕ¸Łŕ¸”ŕ¸Ąŕ¸­ŕ¸™ŕ¸”ŕšŒ XP
  Name[uk]=РодПОнд XP
@@ -4103,8 +4176,8 @@
  activeForeground=255,255,255
 Index: kcontrol/krdb/kcs/PaleGray.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/PaleGray.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/PaleGray.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/PaleGray.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/PaleGray.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -61,7 +61,6 @@
  Name[ven]=Lutada lwo tshenuluwaho
  Name[vi]=Màu xåm nhất
@@ -4115,8 +4188,8 @@
  Name[zu]=Okumpunga ngokukhanyayo
 Index: kcontrol/krdb/kcs/Storm.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/Storm.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/Storm.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/Storm.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
++++ kcontrol/krdb/kcs/Storm.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 492936)
 @@ -61,7 +61,6 @@
  Name[ven]=Madumbu
  Name[wa]=Timpesse
@@ -4127,8 +4200,8 @@
  Name[zu]=Ukuduma
 Index: kcontrol/krdb/kcs/KDEOne.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/KDEOne.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 486057)
-+++ kcontrol/krdb/kcs/KDEOne.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 486057)
+--- kcontrol/krdb/kcs/KDEOne.kcsrc	(.../tags/KDE/3.5.0/kdebase)	(revision 492936)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.11&r2=1.12&f=u

More information about the pld-cvs-commit mailing list