SOURCES: kdelibs-branch.diff, kdebase-branch.diff - up
arekm
arekm at pld-linux.org
Wed Jan 2 22:35:43 CET 2008
Author: arekm Date: Wed Jan 2 21:35:43 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.68 -> 1.69) , kdebase-branch.diff (1.66 -> 1.67)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.68 SOURCES/kdelibs-branch.diff:1.69
--- SOURCES/kdelibs-branch.diff:1.68 Mon Dec 24 11:06:02 2007
+++ SOURCES/kdelibs-branch.diff Wed Jan 2 22:35:35 2008
@@ -1,7 +1,7 @@
Index: mimetypes/multipart/x-mixed-replace.desktop
===================================================================
---- mimetypes/multipart/x-mixed-replace.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/multipart/x-mixed-replace.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/multipart/x-mixed-replace.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/multipart/x-mixed-replace.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -18,7 +18,7 @@
Comment[de]=Datenstrom (Server Push)
Comment[el]=Ροή από δεδομένα (προώθηση εξυπηρετητή)
@@ -13,8 +13,8 @@
Comment[fa]=جریان داده( فشار کارساز)
Index: mimetypes/application/x-tex-pk.desktop
===================================================================
---- mimetypes/application/x-tex-pk.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-tex-pk.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-tex-pk.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-tex-pk.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -17,7 +17,7 @@
Comment[de]=Schriftpaket
Comment[el]=Packed γραμματοσειρά
@@ -26,8 +26,8 @@
Comment[fa]=قلم بستهای
Index: mimetypes/application/x-font-speedo.desktop
===================================================================
---- mimetypes/application/x-font-speedo.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-speedo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-speedo.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-speedo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -21,7 +21,7 @@
Comment[de]=Speedo-Schriftart
Comment[el]=Γραμματοσειρά Speedo
@@ -39,8 +39,8 @@
Comment[fa]=قلم Speedo
Index: mimetypes/application/x-font-ghostscript.desktop
===================================================================
---- mimetypes/application/x-font-ghostscript.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-ghostscript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-ghostscript.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-ghostscript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -21,7 +21,7 @@
Comment[de]=Ghostscript-Schrift
Comment[el]=Έγγραφο Ghostscript
@@ -52,8 +52,8 @@
Comment[fa]=قلم Ghostscript
Index: mimetypes/application/x-font-otf.desktop
===================================================================
---- mimetypes/application/x-font-otf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-otf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-otf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-otf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -17,7 +17,7 @@
Comment[de]=OpenType-Schrift
Comment[el]=Γραμματοσειρά OpenType
@@ -65,8 +65,8 @@
Comment[fa]=قلم نوع باز
Index: mimetypes/application/x-font-pcf.desktop
===================================================================
---- mimetypes/application/x-font-pcf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-pcf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-pcf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-pcf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -21,7 +21,7 @@
Comment[de]=PCF-Bitmap-Schrift
Comment[el]=Γραμματοσειρά PCF bitmap
@@ -78,8 +78,8 @@
Comment[fa]=قلم نگاشت بیت PCF
Index: mimetypes/application/x-designer.desktop
===================================================================
---- mimetypes/application/x-designer.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-designer.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-designer.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-designer.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -44,7 +44,7 @@
Comment[mn]=Qt-Designer-Файл
Comment[ms]=Fail Qt Designer
@@ -91,8 +91,8 @@
Comment[nl]=Qt Designer-bestand
Index: mimetypes/application/x-java-applet.desktop
===================================================================
---- mimetypes/application/x-java-applet.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-java-applet.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-java-applet.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-java-applet.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -15,7 +15,7 @@
Comment[cy]=Rhaglennig Java
Comment[da]=Java-applet
@@ -104,8 +104,8 @@
Comment[et]=Java aplett
Index: mimetypes/application/x-font-snf.desktop
===================================================================
---- mimetypes/application/x-font-snf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-snf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-snf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-snf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -21,7 +21,7 @@
Comment[de]=SNF-Bitmap-Schrift
Comment[el]=Γραμματοσειρά SNF bitmap
@@ -117,8 +117,8 @@
Comment[fa]=قلم نگاشت بیت SNF
Index: mimetypes/application/x-font-ttc.desktop
===================================================================
---- mimetypes/application/x-font-ttc.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-ttc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-ttc.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-ttc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -17,7 +17,7 @@
Comment[de]=TrueType-Schriftensammlung
Comment[el]=Συλλογή γραμματοσειρών TrueType
@@ -130,8 +130,8 @@
Comment[fa]=مجموعۀ قلم حقیقی
Index: mimetypes/application/x-font-ttf.desktop
===================================================================
---- mimetypes/application/x-font-ttf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-ttf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-ttf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-ttf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -17,7 +17,7 @@
Comment[de]=TrueType-Schrift
Comment[el]=Γραμματοσειρά TrueType
@@ -143,8 +143,8 @@
Comment[fa]=قلم حقیقی
Index: mimetypes/application/x-afm.desktop
===================================================================
---- mimetypes/application/x-afm.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-afm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-afm.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-afm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -16,7 +16,7 @@
Comment[de]=Metrische Informationen für PostScript-Schrift
Comment[el]=Μετρικά γραμματοσειράς PostScript
@@ -156,8 +156,8 @@
Comment[fa]=اندازۀ قلم پستاسکریپت
Index: mimetypes/application/x-javascript.desktop
===================================================================
---- mimetypes/application/x-javascript.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-javascript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-javascript.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-javascript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -17,7 +17,7 @@
Comment[de]=JavaScript-Datei
Comment[el]=Αρχείο κώδικα JavaScript
@@ -169,8 +169,8 @@
Comment[fa]=پروندۀ جاوااسکریپت
Index: mimetypes/application/x-tex-gf.desktop
===================================================================
---- mimetypes/application/x-tex-gf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-tex-gf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-tex-gf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-tex-gf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -17,7 +17,7 @@
Comment[de]=Generische Schrift
Comment[el]=Γενική γραμματοσειρά
@@ -182,8 +182,8 @@
Comment[fa]=قلم عمومی
Index: mimetypes/application/x-font-bdf.desktop
===================================================================
---- mimetypes/application/x-font-bdf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-bdf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-bdf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-bdf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -21,7 +21,7 @@
Comment[de]=BDF-Bitmap-Schrift
Comment[el]=Γραμματοσειρά BDF bitmap
@@ -195,8 +195,8 @@
Comment[fa]=قلم نگاشت بیت BDF
Index: mimetypes/application/x-font-type1.desktop
===================================================================
---- mimetypes/application/x-font-type1.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/application/x-font-type1.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/application/x-font-type1.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/application/x-font-type1.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -21,7 +21,7 @@
Comment[de]=Type1-Schrift
Comment[el]=Γραμματοσειρά PostScript Type1
@@ -208,8 +208,8 @@
Comment[fa]=قلم نوع ۱ پستاسکریپت
Index: mimetypes/text/javascript.desktop
===================================================================
---- mimetypes/text/javascript.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ mimetypes/text/javascript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- mimetypes/text/javascript.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ mimetypes/text/javascript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -16,7 +16,7 @@
Comment[de]=JavaScript-Datei
Comment[el]=Αρχείο κώδικα JavaScript
@@ -221,8 +221,8 @@
Comment[fa]=پروندۀ جاوااسکریپت
Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
---- kioslave/http/kcookiejar/kcookiejar.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kioslave/http/kcookiejar/kcookiejar.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kioslave/http/kcookiejar/kcookiejar.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kioslave/http/kcookiejar/kcookiejar.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -340,7 +340,7 @@
bool secureRequest = (_url.find( L1("https://"), 0, false) == 0 ||
_url.find( L1("webdavs://"), 0, false) == 0);
@@ -252,8 +252,8 @@
{
Index: kioslave/http/http.cc
===================================================================
---- kioslave/http/http.cc (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kioslave/http/http.cc (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kioslave/http/http.cc (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kioslave/http/http.cc (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -3409,10 +3409,6 @@
} while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
@@ -293,8 +293,8 @@
}
Index: kinit/start_kdeinit_wrapper.c
===================================================================
---- kinit/start_kdeinit_wrapper.c (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kinit/start_kdeinit_wrapper.c (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kinit/start_kdeinit_wrapper.c (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kinit/start_kdeinit_wrapper.c (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -85,7 +85,7 @@
if(argc == 0)
return 1;
@@ -306,8 +306,8 @@
}
Index: kio/kio/karchive.cpp
===================================================================
---- kio/kio/karchive.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kio/kio/karchive.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kio/kio/karchive.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kio/kio/karchive.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -204,6 +204,7 @@
QDir dir( path );
if ( !dir.exists() )
@@ -318,8 +318,8 @@
{
Index: kio/kio/kservice.cpp
===================================================================
---- kio/kio/kservice.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kio/kio/kservice.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kio/kio/kservice.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kio/kio/kservice.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -109,6 +109,7 @@
entryMap.remove("Hidden");
if (m_bDeleted)
@@ -366,8 +366,8 @@
}
Index: kio/misc/kpac/script.cpp
===================================================================
---- kio/misc/kpac/script.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kio/misc/kpac/script.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kio/misc/kpac/script.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kio/misc/kpac/script.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -64,7 +64,7 @@
static Address parse( const UString& ip )
{ return Address( ip.qstring(), true ); }
@@ -406,8 +406,8 @@
};
Index: kio/misc/kpac/eventsrc
===================================================================
---- kio/misc/kpac/eventsrc (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kio/misc/kpac/eventsrc (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kio/misc/kpac/eventsrc (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kio/misc/kpac/eventsrc (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -41,7 +41,7 @@
Comment[mk]=Автоматска конфигурација на прокси
Comment[mn]=Автомат итгэмжилэгчийн тохиргоо
@@ -419,8 +419,8 @@
Comment[nl]=Automatische proxyconfiguratie
Index: kio/misc/kio_uiserver.desktop
===================================================================
---- kio/misc/kio_uiserver.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kio/misc/kio_uiserver.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kio/misc/kio_uiserver.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kio/misc/kio_uiserver.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -23,7 +23,7 @@
Comment[bn]=কে.ডি.ই. অগ্রগতি তথ্য UI সার্ভার
Comment[br]=Servijer stlenn EA Progress KDE
@@ -432,8 +432,8 @@
Comment[cy]=Gweinydd UI KDE i Ddangos Cynnydd
Index: kabc/scripts/addressee.src.cpp
===================================================================
---- kabc/scripts/addressee.src.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kabc/scripts/addressee.src.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kabc/scripts/addressee.src.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kabc/scripts/addressee.src.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -379,9 +379,11 @@
text = e;
else {
@@ -451,8 +451,8 @@
Index: kabc/plugins/net/net.desktop
===================================================================
---- kabc/plugins/net/net.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kabc/plugins/net/net.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kabc/plugins/net/net.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kabc/plugins/net/net.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -37,6 +37,7 @@
Name[kk]=Желі
Name[km]=បណ្តាញ
@@ -463,8 +463,8 @@
Name[lv]=Tīkls
Index: kabc/plugins/dir/dir.desktop
===================================================================
---- kabc/plugins/dir/dir.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kabc/plugins/dir/dir.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kabc/plugins/dir/dir.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kabc/plugins/dir/dir.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -38,6 +38,7 @@
Name[kk]=Каталог
Name[km]=ថត
@@ -475,8 +475,8 @@
Name[lv]=Direktorija
Index: kabc/kabc_manager.desktop
===================================================================
---- kabc/kabc_manager.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kabc/kabc_manager.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kabc/kabc_manager.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kabc/kabc_manager.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -34,6 +34,7 @@
Name[ja]=コンタクト
Name[kk]=Контакттар
@@ -487,8 +487,8 @@
Name[lv]=Kontakti
Index: kdecore/kcmdlineargs.cpp
===================================================================
---- kdecore/kcmdlineargs.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdecore/kcmdlineargs.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdecore/kcmdlineargs.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdecore/kcmdlineargs.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -396,6 +396,8 @@
int p = nextOption.find(' ');
if (p > 0)
@@ -500,8 +500,8 @@
nextOption = nextOption.mid(2);
Index: kdecore/eventsrc
===================================================================
---- kdecore/eventsrc (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdecore/eventsrc (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdecore/eventsrc (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdecore/eventsrc (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -614,7 +614,7 @@
Comment=There is more than one possible match
Comment[af]=Daar is meer as een moontlik ooreenkoms
@@ -547,8 +547,8 @@
Name[lv]=Atteikties
Index: kdecore/kconfigbase.h
===================================================================
---- kdecore/kconfigbase.h (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdecore/kconfigbase.h (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdecore/kconfigbase.h (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdecore/kconfigbase.h (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -2008,6 +2008,12 @@
private:
class KConfigBasePrivate;
@@ -564,8 +564,8 @@
class KConfigGroupSaverPrivate;
Index: kdecore/all_languages.desktop
===================================================================
---- kdecore/all_languages.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdecore/all_languages.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdecore/all_languages.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdecore/all_languages.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1568,7 +1568,7 @@
Name[da]=Kirkeslavisk
Name[de]=Kirchenslawisch
@@ -593,8 +593,8 @@
Name[lv]=Turku
Index: kdecore/kconfigbase.cpp
===================================================================
---- kdecore/kconfigbase.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdecore/kconfigbase.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdecore/kconfigbase.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdecore/kconfigbase.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1022,6 +1022,15 @@
bool bGlobal,
bool bNLS )
@@ -662,8 +662,8 @@
void KConfigBase::writeEntry ( const QString& pKey, const QValueList<int> &list,
Index: kdecore/tests/kurltest.cpp
===================================================================
---- kdecore/tests/kurltest.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdecore/tests/kurltest.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdecore/tests/kurltest.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdecore/tests/kurltest.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -92,6 +92,7 @@
check( "KURL::isValid()", emptyURL.isValid() ? "TRUE":"FALSE", "FALSE");
check( "KURL::isEmpty()", emptyURL.isEmpty() ? "TRUE":"FALSE", "TRUE");
@@ -710,8 +710,8 @@
Index: kdecore/kstartupinfo.cpp
===================================================================
---- kdecore/kstartupinfo.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdecore/kstartupinfo.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdecore/kstartupinfo.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdecore/kstartupinfo.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -545,7 +545,7 @@
void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id )
@@ -754,8 +754,8 @@
}
Index: kdecore/kurl.cpp
===================================================================
---- kdecore/kurl.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdecore/kurl.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdecore/kurl.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdecore/kurl.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -30,7 +30,6 @@
#include <kglobal.h>
#include <kidna.h>
@@ -781,8 +781,8 @@
}
Index: khtml/khtml_part.cpp
===================================================================
---- khtml/khtml_part.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ khtml/khtml_part.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- khtml/khtml_part.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ khtml/khtml_part.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -3272,6 +3272,7 @@
{
//kdDebug(6050) << "Restarting" << endl;
@@ -793,8 +793,8 @@
else // really done
Index: khtml/html/html_formimpl.cpp
===================================================================
---- khtml/html/html_formimpl.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- khtml/html/html_formimpl.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -963,7 +963,7 @@
if (id() == ID_BUTTON)
return true;
@@ -806,8 +806,8 @@
QWidget* widget = static_cast<RenderWidget*>(m_render)->widget();
Index: khtml/ecma/kjs_navigator.cpp
===================================================================
---- khtml/ecma/kjs_navigator.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ khtml/ecma/kjs_navigator.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- khtml/ecma/kjs_navigator.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ khtml/ecma/kjs_navigator.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -625,7 +625,7 @@
/*****************************************************************************/
@@ -819,8 +819,8 @@
description MimeType_Description DontDelete|ReadOnly
Index: khtml/ecma/kjs_html.h
===================================================================
---- khtml/ecma/kjs_html.h (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ khtml/ecma/kjs_html.h (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- khtml/ecma/kjs_html.h (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ khtml/ecma/kjs_html.h (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -84,7 +84,7 @@
LinkSheet, TitleText, MetaName, MetaHttpEquiv, MetaContent, MetaScheme,
BaseHref, BaseTarget, IsIndexForm, IsIndexPrompt, StyleDisabled,
@@ -832,8 +832,8 @@
SelectTabIndex, SelectValue, SelectSelectedIndex, SelectLength,
Index: khtml/ecma/kjs_html.cpp
===================================================================
---- khtml/ecma/kjs_html.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ khtml/ecma/kjs_html.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- khtml/ecma/kjs_html.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ khtml/ecma/kjs_html.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -683,6 +683,11 @@
# IE extension
onload KJS::HTMLElement::BodyOnLoad DontDelete
@@ -874,8 +874,8 @@
KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLFormElementProto, HTMLElementProto)
Index: khtml/java/org/kde/kjas/server/KJASProtocolHandler.java
===================================================================
---- khtml/java/org/kde/kjas/server/KJASProtocolHandler.java (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ khtml/java/org/kde/kjas/server/KJASProtocolHandler.java (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- khtml/java/org/kde/kjas/server/KJASProtocolHandler.java (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ khtml/java/org/kde/kjas/server/KJASProtocolHandler.java (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -279,10 +279,13 @@
String appletID = getArg( command );
int objid = Integer.parseInt( getArg( command ) );
@@ -893,8 +893,8 @@
}
Index: khtml/java/kjavaappletviewer.cpp
===================================================================
---- khtml/java/kjavaappletviewer.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ khtml/java/kjavaappletviewer.cpp (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- khtml/java/kjavaappletviewer.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ khtml/java/kjavaappletviewer.cpp (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -570,6 +570,7 @@
args.append (QString::number (applet->appletId ()));
args.append (QString::number ((int) objid));
@@ -909,8 +909,8 @@
svn:mime-type = application/x-jar
Index: khtml/java/kjavaappletviewer.desktop
===================================================================
---- khtml/java/kjavaappletviewer.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ khtml/java/kjavaappletviewer.desktop (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- khtml/java/kjavaappletviewer.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ khtml/java/kjavaappletviewer.desktop (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -13,7 +13,7 @@
Name[cy]=Gwelydd Rhaglennig Java Mewnadeiladedig
Name[da]=Indlejret Java-applet fremviser
@@ -922,8 +922,8 @@
Name[et]=Põimitav Java apleti näitaja
Index: kdoctools/customization/ja/entities/underGPL.docbook
===================================================================
---- kdoctools/customization/ja/entities/underGPL.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/ja/entities/underGPL.docbook (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/ja/entities/underGPL.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/ja/entities/underGPL.docbook (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1,2 +1,2 @@
-<para>This program is licensed under the terms of the <ulink
-url="common/gpl-translated.html">GNU General Public License</ulink>.</para>
@@ -931,16 +931,16 @@
+url="common/gpl-translated.html">GNU General Public License </ulink> です。</para>
Index: kdoctools/customization/ja/entities/underArtisticLicense.docbook
===================================================================
---- kdoctools/customization/ja/entities/underArtisticLicense.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/ja/entities/underArtisticLicense.docbook (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/ja/entities/underArtisticLicense.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/ja/entities/underArtisticLicense.docbook (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1,2 +1 @@
-<para>This program is licensed under the terms of the <ulink
-url="common/artistic-license.html">Artistic License</ulink>.</para>
+<para>このプログラムのライセンスは <ulink url="common/artistic-license.html">Artistic License</ulink> です。</para>
Index: kdoctools/customization/ja/entities/underFDL.docbook
===================================================================
---- kdoctools/customization/ja/entities/underFDL.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/ja/entities/underFDL.docbook (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/ja/entities/underFDL.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/ja/entities/underFDL.docbook (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1,3 +1,3 @@
-<para id="gnu-fdl" xreflabel="the section entitled "GNU Free Documentation License"">This documentation is licensed under the terms of the <ulink
+<para id="gnu-fdl" xreflabel="the section entitled "GNU Free Documentation License"">このドキュメンテーションのライセンスは <ulink
@@ -949,16 +949,16 @@
+License</ulink> です。</para>
Index: kdoctools/customization/ja/entities/underBSDLicense.docbook
===================================================================
---- kdoctools/customization/ja/entities/underBSDLicense.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/ja/entities/underBSDLicense.docbook (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/ja/entities/underBSDLicense.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/ja/entities/underBSDLicense.docbook (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1,2 +1 @@
-<para>This program is licensed under the terms of the <ulink
-url="common/bsd-license.html">BSD License</ulink>.</para>
+<para>このプログラムのライセンスは <ulink url="common/bsd-license.html">BSD License</ulink> です。</para>
Index: kdoctools/customization/ja/entities/help-menu.docbook
===================================================================
---- kdoctools/customization/ja/entities/help-menu.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/ja/entities/help-menu.docbook (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/ja/entities/help-menu.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/ja/entities/help-menu.docbook (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1,58 +1,93 @@
<variablelist>
<varlistentry>
@@ -1093,16 +1093,16 @@
</variablelist>
Index: kdoctools/customization/ja/entities/underX11License.docbook
===================================================================
---- kdoctools/customization/ja/entities/underX11License.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/ja/entities/underX11License.docbook (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/ja/entities/underX11License.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/ja/entities/underX11License.docbook (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1,2 +1 @@
-<para>This program is licensed under the terms of the <ulink
-url="common/x11-license.html">X11 License</ulink>.</para>
+<para>このプログラムのライセンスは <ulink url="common/x11-license.html">X11 License</ulink> です。</para>
Index: kdoctools/customization/ja/entities/install-compile.docbook
===================================================================
---- kdoctools/customization/ja/entities/install-compile.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/ja/entities/install-compile.docbook (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/ja/entities/install-compile.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/ja/entities/install-compile.docbook (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1,12 +1,8 @@
-<para>In order to compile and install &kappname; on your system, type the
-following in the base directory of the &kappname; distribution:</para>
@@ -1120,8 +1120,8 @@
+<para>&kappname; は <command>autoconf</command> と <command>automake</command> を使っているので容易にコンパイルできるはずです。問題にぶつかった場合は、&kde; のメーリングリストに報告してください。</para>
Index: kdoctools/customization/ja/entities/install-intro.docbook
===================================================================
---- kdoctools/customization/ja/entities/install-intro.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/ja/entities/install-intro.docbook (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/ja/entities/install-intro.docbook (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/ja/entities/install-intro.docbook (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -1,6 +1,4 @@
<!-- requires that packagename is defined in the documentation prologue -->
-<para>&kappname; is part of the &kde; project &kde-http;.</para>
@@ -1133,8 +1133,8 @@
+<para>&kappname; は &kde; プロジェクトのメイン &FTP; サイトである &kde-ftp; にある &package; パッケージに含まれています。</para>
Index: kdoctools/customization/fr/user.entities
===================================================================
---- kdoctools/customization/fr/user.entities (.../tags/KDE/3.5.8/kdelibs) (wersja 752384)
-+++ kdoctools/customization/fr/user.entities (.../branches/KDE/3.5/kdelibs) (wersja 752384)
+--- kdoctools/customization/fr/user.entities (.../tags/KDE/3.5.8/kdelibs) (wersja 756146)
++++ kdoctools/customization/fr/user.entities (.../branches/KDE/3.5/kdelibs) (wersja 756146)
@@ -12,7 +12,7 @@
<!ENTITY relecteurDavidAmmouial '<othercredit role="reviewer"><firstname>David</firstname><surname>Ammouial</surname><affiliation><address><email></email></address></affiliation><contrib>Relecture de la documentation française </contrib></othercredit>'>
@@ -1164,8 +1164,8 @@
<!ENTITY JeanJacquesFinazzi 'Jean-Jacques Finazzi <email>jj.finazzi at club.fr</email>'>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdelibs-branch.diff?r1=1.68&r2=1.69&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdebase-branch.diff?r1=1.66&r2=1.67&f=u
More information about the pld-cvs-commit
mailing list