alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.8' into frameworks

Browse Source 
Conflicts:
	CMakeLists.txt
	kdecore/tests/kservicetest.cpp
	kdeui/dialogs/kconfigdialog.h
	kdeui/sonnet/configdialog.cpp
	kdeui/widgets/kpushbutton.cpp
	kdeui/widgets/kpushbutton.h
	kio/kfile/kpropertiesdialog.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcedata.h
	nepomuk/core/resourcemanager.cpp
	nepomuk/core/resourcemanager.h
	nepomuk/core/resourcewatcher.cpp
	nepomuk/core/resourcewatcher.h
	nepomuk/query/queryparser.cpp
	tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
	tier1/solid/src/solid/backends/fstab/fstabstorageaccess.cpp
This commit is contained in:
Stephen Kelly 2012-03-04 20:48:53 +01:00
commit 13d5508112
6 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/services/plasma.protocol
View File

@ -27,6 +27,7 @@ Description[he]=פרוטוקול עבור הרכיבים של Plasma
Description[hr]=Protokol za servise u Plasmi Description[hr]=Protokol za servise u Plasmi
Description[hu]=Protokoll a Plazma-szolgáltatáshoz Description[hu]=Protokoll a Plazma-szolgáltatáshoz
Description[ia]=un protocollo per servicios de Plasma Description[ia]=un protocollo per servicios de Plasma
Description[id]=Protokol untuk layanan Plasma
Description[is]=Samskiptamáti fyrir Plasma-þjónustur Description[is]=Samskiptamáti fyrir Plasma-þjónustur
Description[it]=Un protocollo per servizi plasma Description[it]=Un protocollo per servizi plasma
Description[ja]=Plasma サービスのためのプロトコル Description[ja]=Plasma サービスのためのプロトコル

1
data/servicetypes/plasma-service.desktop
View File

@ -24,6 +24,7 @@ Comment[he]=שירות של Plasma
Comment[hr]=Servis u Plasmi Comment[hr]=Servis u Plasmi
Comment[hu]=Plazma-szolgáltatás Comment[hu]=Plazma-szolgáltatás
Comment[ia]=Servicio de Plasma Comment[ia]=Servicio de Plasma
Comment[id]=Layanan Plasma
Comment[is]=Plasma-þjónusta Comment[is]=Plasma-þjónusta
Comment[it]=Servizio plasma Comment[it]=Servizio plasma
Comment[ja]=Plasma サービス Comment[ja]=Plasma サービス

1
data/servicetypes/plasma-toolbox.desktop
View File

@ -24,6 +24,7 @@ Comment[he]=ארגז כלים של Plasma
Comment[hr]=Plasma alatni okvir Comment[hr]=Plasma alatni okvir
Comment[hu]=Plazma-eszközkészlet Comment[hu]=Plazma-eszközkészlet
Comment[ia]=Instrumentario de Plasma Comment[ia]=Instrumentario de Plasma
Comment[id]=Kotak alat Plasma
Comment[is]=Plasma verkfærasafn Comment[is]=Plasma verkfærasafn
Comment[it]=Barra degli strumenti plasma Comment[it]=Barra degli strumenti plasma
Comment[ja]=Plasma ツールボックス Comment[ja]=Plasma ツールボックス

1
paintutils.cpp
View File

@ -147,6 +147,7 @@ QPixmap texturedText(const QString &text, const QFont &font, Plasma::Svg *textur
buffPainter.setCompositionMode(QPainter::CompositionMode_SourceOver); buffPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
buffPainter.drawImage(QPoint(0,0), image); buffPainter.drawImage(QPoint(0,0), image);
buffPainter.drawPixmap(QPoint(1,1), pixmap); buffPainter.drawPixmap(QPoint(1,1), pixmap);
buffPainter.end();
return ret; return ret;
} }

1
popupapplet.cpp
View File

@ -78,6 +78,7 @@ void PopupApplet::setPopupIcon(const QIcon &icon)
d->icon = 0; d->icon = 0;
setLayout(0); setLayout(0);
setAspectRatioMode(d->savedAspectRatio); setAspectRatioMode(d->savedAspectRatio);
d->popupConstraintsEvent(FormFactorConstraint);
} }
return; return;

2
tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
View File

@ -22,6 +22,7 @@ Name[he]=בדיקה
Name[hr]=Test Name[hr]=Test
Name[hu]=Teszt Name[hu]=Teszt
Name[ia]=Essayo Name[ia]=Essayo
Name[id]=Tes
Name[is]=Prófun Name[is]=Prófun
Name[it]=Prova Name[it]=Prova
Name[ja]=テスト Name[ja]=テスト
@ -83,6 +84,7 @@ Comment[he]=תוסף דמה לבדיקה
Comment[hr]=Lažan priključak za testiranje Comment[hr]=Lažan priključak za testiranje
Comment[hu]=Üres bővítmény teszteléshez Comment[hu]=Üres bővítmény teszteléshez
Comment[ia]=Un plugin vacue pro essayar Comment[ia]=Un plugin vacue pro essayar
Comment[id]=Plugin palsu untuk pengujian
Comment[is]=Tilraunaíforrit fyrir prófanir Comment[is]=Tilraunaíforrit fyrir prófanir
Comment[it]=Una estensione fittizia di prova Comment[it]=Una estensione fittizia di prova
Comment[ja]=テスト用のダミープラグイン Comment[ja]=テスト用のダミープラグイン