SOURCES: kdelibs-branch.diff, kdebase-branch.diff - updated
arekm
arekm at pld-linux.org
Sat Mar 15 23:13:29 CET 2008
Author: arekm Date: Sat Mar 15 22:13:29 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.75 -> 1.76) , kdebase-branch.diff (1.73 -> 1.74)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.75 SOURCES/kdelibs-branch.diff:1.76
--- SOURCES/kdelibs-branch.diff:1.75 Sat Mar 1 22:00:24 2008
+++ SOURCES/kdelibs-branch.diff Sat Mar 15 23:13:22 2008
@@ -1,7 +1,7 @@
Index: kate/part/katesupercursor.cpp
===================================================================
---- kate/part/katesupercursor.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ kate/part/katesupercursor.cpp (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- kate/part/katesupercursor.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ kate/part/katesupercursor.cpp (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -186,7 +186,7 @@
{
if (newLine)
@@ -13,8 +13,8 @@
m_col -= col;
Index: mimetypes/audio/x-oggflac.desktop
===================================================================
---- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=Ogg FLAC Klank
Comment[ar]=ملف Ogg FLAC صوتي
@@ -26,8 +26,8 @@
Comment[bs]=Ogg FLAC audio
Index: mimetypes/audio/vnd.rn-realaudio.desktop
===================================================================
---- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -10,7 +10,7 @@
Comment[ar]=ملف Real Audio
Comment[az]=RealAudio Faylı
@@ -39,8 +39,8 @@
Comment[bs]=RealAudio datoteka
Index: mimetypes/audio/x-vorbis.desktop
===================================================================
---- mimetypes/audio/x-vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=Ogg Vorbis Klank
Comment[ar]=ملف Ogg Vorbis صوتي
@@ -52,8 +52,8 @@
Comment[bs]=Ogg Vorbis audio
Index: mimetypes/audio/x-flac.desktop
===================================================================
---- mimetypes/audio/x-flac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-flac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-flac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-flac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -5,7 +5,7 @@
Comment[af]=FLAC Klank
Comment[ar]=ملف FLAC صوتي
@@ -65,8 +65,8 @@
Comment[bs]=FLAC audio
Index: mimetypes/audio/x-aiff.desktop
===================================================================
---- mimetypes/audio/x-aiff.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-aiff.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-aiff.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-aiff.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -5,7 +5,7 @@
Comment[af]=Aiff/Amiga Klank
Comment[ar]=صوت AIFF/Amiga
@@ -78,8 +78,8 @@
Comment[bs]=AIFF/Amiga audio
Index: mimetypes/audio/mpegurl.desktop
===================================================================
---- mimetypes/audio/mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -10,7 +10,7 @@
Comment[ar]=صوت انسيابي من MPEG الطبقة 3
Comment[az]=Axıcı MPEG Layer 3 Audio
@@ -91,8 +91,8 @@
Comment[bs]=Streaming MPEG Layer 3 audio
Index: mimetypes/audio/x-musepack.desktop
===================================================================
---- mimetypes/audio/x-musepack.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-musepack.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-musepack.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-musepack.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -7,7 +7,7 @@
Comment=Musepack Audio
Comment[af]=Musepack Klank
@@ -104,8 +104,8 @@
Comment[bs]=Musepack audio
Index: mimetypes/audio/x-mpegurl.desktop
===================================================================
---- mimetypes/audio/x-mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[ar]=صوت انسيابي من MPEG الطبقة 3
Comment[az]=Axıcı MPEG Layer 3 Audio
@@ -117,8 +117,8 @@
Comment[bs]=Streaming MPEG Layer 3 audio
Index: mimetypes/audio/basic.desktop
===================================================================
---- mimetypes/audio/basic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/basic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/basic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/basic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -5,7 +5,7 @@
Comment[af]=Ulaw (Sun) Audio
Comment[ar]=صوت ULAW (صن)
@@ -130,8 +130,8 @@
Comment[bs]=ULAW (Sun) audio
Index: mimetypes/audio/prs.sid.desktop
===================================================================
---- mimetypes/audio/prs.sid.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/prs.sid.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/prs.sid.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/prs.sid.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -7,7 +7,7 @@
Comment=C64 SID Music
Comment[af]=C64 SID Musiek
@@ -143,8 +143,8 @@
Comment[bs]=C64 SID muzika
Index: mimetypes/audio/x-mod.desktop
===================================================================
---- mimetypes/audio/x-mod.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-mod.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-mod.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-mod.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -7,7 +7,7 @@
Comment=Amiga Soundtracker Audio
Comment[ar]=صوت Amiga Soundtracker
@@ -156,8 +156,8 @@
Comment[bs]=Amiga Soundtracker audio
Index: mimetypes/audio/aac.desktop
===================================================================
---- mimetypes/audio/aac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/aac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/aac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/aac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -9,7 +9,7 @@
Comment[ar]=ملف AAC صوتي
Comment[az]=AAC Səsi
@@ -169,8 +169,8 @@
Comment[bs]=AAC zvuk
Index: mimetypes/audio/x-pn-realaudio.desktop
===================================================================
---- mimetypes/audio/x-pn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-pn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-pn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-pn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[ar]=ملف Real Audio
Comment[az]=RealAudio Faylı
@@ -182,8 +182,8 @@
Comment[bs]=RealAudio datoteka
Index: mimetypes/audio/x-matroska.desktop
===================================================================
---- mimetypes/audio/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=Matroska Klank
Comment[ar]=ملف ماتروسكا صوتي
@@ -195,8 +195,8 @@
Comment[bs]=Matroska audio
Index: mimetypes/audio/x-midi.desktop
===================================================================
---- mimetypes/audio/x-midi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-midi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-midi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-midi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=MIDI Klank
Comment[ar]=صوت MIDI
@@ -208,8 +208,8 @@
Comment[bs]=MIDI audio
Index: mimetypes/audio/mpeg.desktop
===================================================================
---- mimetypes/audio/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -9,7 +9,7 @@
Comment=MPEG Audio
Comment[af]=MPEG Klank
@@ -221,8 +221,8 @@
Comment[bs]=MPEG audio
Index: mimetypes/audio/x-adpcm.desktop
===================================================================
---- mimetypes/audio/x-adpcm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-adpcm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-adpcm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-adpcm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -5,7 +5,7 @@
Comment[af]=PCM Klank
Comment[ar]=صوت PCM
@@ -234,8 +234,8 @@
Comment[bs]=PCM audio
Index: mimetypes/audio/x-speex.desktop
===================================================================
---- mimetypes/audio/x-speex.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-speex.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-speex.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-speex.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=Speex Klank
Comment[ar]=ملف Speex صوتي
@@ -247,8 +247,8 @@
Comment[bs]=Speex audio
Index: mimetypes/audio/mp4.desktop
===================================================================
---- mimetypes/audio/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=MPEG-4 Klank
Comment[ar]=صوت MPEG-4
@@ -260,8 +260,8 @@
Comment[bs]=MPEG-4 audio
Index: mimetypes/audio/x-wav.desktop
===================================================================
---- mimetypes/audio/x-wav.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-wav.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-wav.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-wav.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=Wav Audio
Comment[ar]=صوت WAV
@@ -273,8 +273,8 @@
Comment[bs]=WAV audio
Index: mimetypes/audio/x-mp2.desktop
===================================================================
---- mimetypes/audio/x-mp2.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-mp2.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-mp2.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-mp2.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment=MPEG Layer 2 Audio
Comment[af]=MPEG Vlak 2 Klank
@@ -286,8 +286,8 @@
Comment[bs]=MPEG Layer 2 audio
Index: mimetypes/audio/vorbis.desktop
===================================================================
---- mimetypes/audio/vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=Ogg Vorbis Klank
Comment[ar]=ملف Ogg Vorbis صوتي
@@ -299,8 +299,8 @@
Comment[bs]=Ogg Vorbis audio
Index: mimetypes/audio/x-mp3.desktop
===================================================================
---- mimetypes/audio/x-mp3.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-mp3.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-mp3.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-mp3.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -9,7 +9,7 @@
Comment[af]=MPEG Vlak 3 Klank
Comment[ar]=صوت MPEG الطبقة 3
@@ -312,8 +312,8 @@
Comment[bs]=MPEG Layer 3 audio
Index: mimetypes/audio/x-ms-wma.desktop
===================================================================
---- mimetypes/audio/x-ms-wma.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/audio/x-ms-wma.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/audio/x-ms-wma.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/audio/x-ms-wma.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -7,7 +7,7 @@
Comment=Windows Media Audio
Comment[af]=Windows Media Klank
@@ -325,8 +325,8 @@
Comment[bs]=Windows Media audio
Index: mimetypes/text/vnd.abc.desktop
===================================================================
---- mimetypes/text/vnd.abc.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/text/vnd.abc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/text/vnd.abc.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/text/vnd.abc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -3,7 +3,7 @@
Comment=ABC Music File
Comment[af]=ABC Musiek Lêer
@@ -338,8 +338,8 @@
Comment[bs]=ABC muzička datoteka
Index: mimetypes/video/x-ogm.desktop
===================================================================
---- mimetypes/video/x-ogm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/x-ogm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/x-ogm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/x-ogm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment=Ogg/Ogm Video
Comment[ar]=ملف مرئي Ogg/Ogm
@@ -351,8 +351,8 @@
Comment[bs]=Ogg/Ogm video
Index: mimetypes/video/x-theora.desktop
===================================================================
---- mimetypes/video/x-theora.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/x-theora.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/x-theora.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/x-theora.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -7,7 +7,7 @@
Comment=Theora Video
Comment[ar]=ملف فيديو Theora
@@ -364,8 +364,8 @@
Comment[bs]=Theora video
Index: mimetypes/video/mpeg.desktop
===================================================================
---- mimetypes/video/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -9,7 +9,7 @@
Comment[ar]=ملف مرئي MPEG
Comment[az]=MPEG Video Faylı
@@ -377,8 +377,8 @@
Comment[ca]=Vídeo MPEG
Index: mimetypes/video/quicktime.desktop
===================================================================
---- mimetypes/video/quicktime.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/quicktime.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/quicktime.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/quicktime.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -7,7 +7,7 @@
Comment=Quicktime Video
Comment[ar]=ملف مرئي Quicktime
@@ -390,8 +390,8 @@
Comment[ca]=Vídeo Quicktime
Index: mimetypes/video/x-ms-wmv.desktop
===================================================================
---- mimetypes/video/x-ms-wmv.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/x-ms-wmv.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/x-ms-wmv.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/x-ms-wmv.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -5,7 +5,7 @@
Comment[ar]=ملف مرئي Windows Media
Comment[az]=Windows Mediya Video Faylı
@@ -403,8 +403,8 @@
Comment[bs]=Windows Media video
Index: mimetypes/video/x-msvideo.desktop
===================================================================
---- mimetypes/video/x-msvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/x-msvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/x-msvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/x-msvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -8,7 +8,7 @@
Comment[af]=Microsoft Avi Video
Comment[ar]=مرئي Microsoft AVI
@@ -416,8 +416,8 @@
Comment[bs]=Microsoft AVI video
Index: mimetypes/video/vnd.rn-realvideo.desktop
===================================================================
---- mimetypes/video/vnd.rn-realvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/vnd.rn-realvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/vnd.rn-realvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/vnd.rn-realvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -9,7 +9,7 @@
Comment[ar]=ملف RealVideo
Comment[az]=RealVideo Faylı
@@ -429,8 +429,8 @@
Comment[bs]=RealVideo datoteka
Index: mimetypes/video/avi.desktop
===================================================================
---- mimetypes/video/avi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/avi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/avi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/avi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -9,7 +9,7 @@
Comment[af]=Microsoft Avi Video
Comment[ar]=مرئي Microsoft AVI
@@ -442,8 +442,8 @@
Comment[bs]=Microsoft AVI video
Index: mimetypes/video/mp4.desktop
===================================================================
---- mimetypes/video/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -7,7 +7,7 @@
Comment=MPEG-4 Video
Comment[ar]=ملف مرئي MPEG-4
@@ -455,8 +455,8 @@
Comment[bs]=MPEG-4 video
Index: mimetypes/video/x-flic.desktop
===================================================================
---- mimetypes/video/x-flic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/x-flic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/x-flic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/x-flic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -9,7 +9,7 @@
Comment[ar]=ملف FLIC لأوتوديسك
Comment[az]=Autodesk FLIC Faylı
@@ -468,8 +468,8 @@
Comment[bs]=Autodesk FLIC datoteke
Index: mimetypes/video/x-matroska.desktop
===================================================================
---- mimetypes/video/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 781012)
-+++ mimetypes/video/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 781012)
+--- mimetypes/video/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ mimetypes/video/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
@@ -7,7 +7,7 @@
Comment=Matroska Video
Comment[ar]=مرئي Matroska
@@ -479,6 +479,48 @@
Comment[bn]=মাত্রোস্কা ভিডিও
Comment[br]=Video Matroska
Comment[bs]=Matroska video
+Index: kdecore/tests/kurltest.cpp
+===================================================================
+--- kdecore/tests/kurltest.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ kdecore/tests/kurltest.cpp (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+@@ -112,6 +112,11 @@
+ check( "KURL::host()", url1.host(), "www1.foo.bar");
+ check( "KURL::url()", url1.url(), "http://www1.foo.bar");
+
++ baseURL = "http://www.Abc.de";
++ check( "KURL::host() is lowercase", baseURL.host(), "www.abc.de");
++ baseURL = "donkey://Abc/DE";
++ check( "KURL::host() is lowercase", baseURL.host(), "abc");
++
+ baseURL = "http://www.foo.bar";
+ KURL rel_url( baseURL, "/top//test/../test1/file.html" );
+ check( "KURL::url()", rel_url.url(), "http://www.foo.bar/top//test1/file.html" );
+Index: kdecore/kapplication.cpp
+===================================================================
+--- kdecore/kapplication.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ kdecore/kapplication.cpp (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+@@ -1349,7 +1349,7 @@
+ return;
+ if (kapp && (Tty != kapp->type()))
+ setOverrideCursor( Qt::waitCursor );
+- my_system(QFile::encodeName(srv)+" --suicide");
++ my_system(QFile::encodeName(srv)+" --suicide"+" --new-startup");
+ if (kapp && (Tty != kapp->type()))
+ restoreOverrideCursor();
+ #endif
+Index: dcop/dcopserver.cpp
+===================================================================
+--- dcop/dcopserver.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
++++ dcop/dcopserver.cpp (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+@@ -1318,6 +1318,8 @@
+ if (!shutdown)
+ {
+ shutdown = true;
++ QByteArray data;
++ dcopSignals->emitSignal(0L /* dcopserver */, "terminateKDE()", data, false);
+ m_timer->start( 10000 ); // if within 10 seconds nothing happens, we'll terminate
+ disconnect( m_timer, SIGNAL(timeout()), this, SLOT(slotTerminate()) );
+ connect( m_timer, SIGNAL(timeout()), this, SLOT(slotExit()) );
Zmiany atrybutów dla: .
___________________________________________________________________
================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.73 SOURCES/kdebase-branch.diff:1.74
--- SOURCES/kdebase-branch.diff:1.73 Sat Mar 1 22:00:23 2008
+++ SOURCES/kdebase-branch.diff Sat Mar 15 23:13:23 2008
@@ -1,7 +1,7 @@
Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop
===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop (.../tags/KDE/3.5.9/kdebase) (wersja 781012)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop (.../branches/KDE/3.5/kdebase) (wersja 781012)
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop (.../tags/KDE/3.5.9/kdebase) (wersja 786050)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop (.../branches/KDE/3.5/kdebase) (wersja 786050)
@@ -60,6 +60,7 @@
Name[zh_TW]=FSF/UNESCO 自由軟體目錄
ServiceTypes=SearchProvider
@@ -11,10 +11,113 @@
+Query[nds]=http://directory.fsf.org/search/fsd-search.py?q=\\{@}
+Index: kcontrol/kio/kcookiesmanagement.cpp
+===================================================================
+--- kcontrol/kio/kcookiesmanagement.cpp (.../tags/KDE/3.5.9/kdebase) (wersja 786050)
++++ kcontrol/kio/kcookiesmanagement.cpp (.../branches/KDE/3.5/kdebase) (wersja 786050)
+@@ -149,7 +149,7 @@
+ {
+ QString caption = i18n ("DCOP Communication Error");
+ QString message = i18n ("Unable to delete all the cookies as requested.");
+- KMessageBox::sorry (this, caption, message);
++ KMessageBox::sorry (this, message,caption);
+ return;
+ }
+ m_bDeleteAll = false; // deleted[Cookies|Domains] have been cleared yet
+@@ -169,7 +169,7 @@
+ {
+ QString caption = i18n ("DCOP Communication Error");
+ QString message = i18n ("Unable to delete cookies as requested.");
+- KMessageBox::sorry (this, caption, message);
++ KMessageBox::sorry (this, message,caption);
+ return;
+ }
+
+@@ -250,7 +250,7 @@
+ QString caption = i18n ("Information Lookup Failure");
+ QString message = i18n ("Unable to retrieve information about the "
+ "cookies stored on your computer.");
+- KMessageBox::sorry (this, caption, message);
++ KMessageBox::sorry (this, message, caption);
+ return;
+ }
+
+Index: kicker/extensions/taskbar/taskbarextension.desktop
+===================================================================
+--- kicker/extensions/taskbar/taskbarextension.desktop (.../tags/KDE/3.5.9/kdebase) (wersja 786050)
++++ kicker/extensions/taskbar/taskbarextension.desktop (.../branches/KDE/3.5/kdebase) (wersja 786050)
+@@ -54,7 +54,7 @@
+ Name[pt]=Barra de Tarefas Externa
+ Name[pt_BR]=Barra de Tarefas Externa
+ Name[ro]=Bară de procese externă
+-Name[ru]=Расширенная панель задач
++Name[ru]=Внешняя панель задач
+ Name[rw]=Umurongoibikorwa w'Inyuma
+ Name[se]=Olgguldas bargoholga
+ Name[sk]=Externý taskbar
+@@ -119,7 +119,7 @@
+ Comment[pt]=Extensão do painel de barra de tarefas externa
+ Comment[pt_BR]=Extensão do painel para a barra de tarefas externa
+ Comment[ro]=Extensie pentru bară de procese externă
+-Comment[ru]=Расширение панели задач KDE
++Comment[ru]=Внешняя панель задач KDE
+ Comment[se]=Olgguldas bargoholga viiddádus
+ Comment[sk]=Rozšírenie externého panelu úloh
+ Comment[sl]=Zunanja razširitev opravilne vrstice
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp (.../tags/KDE/3.5.9/kdebase) (wersja 786050)
++++ kioslave/media/mediamanager/halbackend.cpp (.../branches/KDE/3.5/kdebase) (wersja 786050)
+@@ -849,6 +849,13 @@
+ result << tmp;
+ }
+
++ if ( valids.contains("locale") )
++ {
++ value = config.readBoolEntry( "locale", true );
++ tmp = QString( "locale=%1" ).arg( value ? "true" : "false" );
++ result << tmp;
++ }
++
+ if (valids.contains("utf8"))
+ {
+ value = config.readBoolEntry("utf8", true);
+@@ -922,7 +929,7 @@
+
+ QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options);
+
+- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
++ const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", "locale", 0 };
+ for (int index = 0; names[index]; ++index)
+ if (valids.contains(names[index]))
+ config.writeEntry(names[index], valids[names[index]] == "true");
+@@ -942,6 +949,10 @@
+ config.writeEntry("automount", valids["automount"]);
+ }
+
++ if (valids.contains("locale") ) {
++ config.writeEntry("locale", valids["locale"]);
++ }
++
+ return true;
+ }
+
+@@ -1140,6 +1151,11 @@
+ soptions << QString("uid=%1").arg(getuid());
+ }
+
++ if (valids["locale"] == "true")
++ {
++ soptions << QString("locale=%1").arg( KGlobal::locale()->language() );
++ }
++
+ if (valids["ro"] == "true")
+ soptions << "ro";
+
Index: konqueror/konquerorsu.desktop
===================================================================
---- konqueror/konquerorsu.desktop (.../tags/KDE/3.5.9/kdebase) (wersja 781012)
-+++ konqueror/konquerorsu.desktop (.../branches/KDE/3.5/kdebase) (wersja 781012)
+--- konqueror/konquerorsu.desktop (.../tags/KDE/3.5.9/kdebase) (wersja 786050)
++++ konqueror/konquerorsu.desktop (.../branches/KDE/3.5/kdebase) (wersja 786050)
@@ -60,7 +60,7 @@
Name[pt]=Gestor de Ficheiros - Modo de Super Utilizador
Name[pt_BR]=Gerenciador de Arquivos (Modo Super-Usuário)
@@ -24,10 +127,188 @@
Name[rw]=Mucungadosiye - Uburyo Ukoresha Mukuru
Name[se]=Fiilagieđahalli – Supergeavaheaddjemodus
Name[sk]=Správca súborov - Super-používateľský mód
+Index: khotkeys/kcontrol/actions_listview_widget.cpp
+===================================================================
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdelibs-branch.diff?r1=1.75&r2=1.76&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdebase-branch.diff?r1=1.73&r2=1.74&f=u
More information about the pld-cvs-commit
mailing list