yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.7'

Browse source
This commit is contained in:
Martin Gräßlin 2016-09-12 13:14:15 +02:00
commit 156bf258e9
4 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/eyeonscreen/package/metadata.desktop
View file

@ -3,6 +3,7 @@ Name=eye On Screen
Name[ca]=Ull a la pantalla
Name[ca@valencia]=Ull a la pantalla
Name[da]=øjet på skærmen
Name[el]=βλέμμα στην Οθόνη
Name[en_GB]=eye On Screen
Name[es]=Ojo a la pantalla
Name[et]=eye On Screen
@ -38,6 +39,7 @@ Comment=Suck windows into desktop to show the latter. This might remind you of s
Comment[ca]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom.
Comment[ca@valencia]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom.
Comment[da]=Sug vinduer ind i skrivebordet for at vise dette. Måske minder det dig om noget.
Comment[el]=Αναρρόφηση παραθύρων στην επιφάνεια εργασίας για να εμφανίσει το τελευταίο. Αυτό ίσως σας θυμίζει κάτι.
Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something.
Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo.
Comment[et]=Imeb aknad töölauda ja näitab viimast. See võib midagi meenutada ...

2
effects/morphingpopups/package/metadata.desktop
View file

@ -3,6 +3,7 @@ Comment=Cross fade animation when Tooltips or Notifications change their geometr
Comment[ca]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seva geometria
Comment[ca@valencia]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seua geometria
Comment[da]=Crossfade-animation når værktøjstip og bekendtgørelser skifter geometry
Comment[el]=Εφέ ομαλής μετάβασης όταν οι Υποδείξεις ή οι Ειδοποιήσεις αλλάζουν την γεωμετρία τους.
Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry
Comment[es]=Animación de transición suave cuando las ayudas emergentes o las notificaciones cambian su geometría
Comment[et]=Animatsioon hääbumisega, kui kohtspikrid või märguanded muudavad geomeetriat
@ -32,6 +33,7 @@ Name=Morphing popups
Name[ca]=Missatges emergents en metamorfosi
Name[ca@valencia]=Missatges emergents en metamorfosi
Name[da]=Sammensmeltende pop-op'er
Name[el]=Morphing αναδυόμενων
Name[en_GB]=Morphing popups
Name[es]=Transformación de ventanas emergentes
Name[et]=Moonduvad hüpikdialoogid

1
kcmkwin/kwincompositing/kwincompositing.desktop
View file

@ -103,6 +103,7 @@ X-KDE-Keywords[ca]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D
X-KDE-Keywords[ca@valencia]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D,OpenGL,XRender,arranjament de vídeo,efectes gràfics,efectes d'escriptori,velocitat de les animacions
X-KDE-Keywords[da]=kwin,vindue,håndtering,window,manager,compositing,effekt,3D effekter,2D effekter,OpenGL,XRender,video-indstillinger,grafiske effekter,skrivebordseffekter,desktop effects,animationshastighed
X-KDE-Keywords[de]=kwin,Fenstermanager,Fensterverwaltung,Effekt,Fenster,Compositing,3D-Effekte,2D-Effekte,OpenGL,XRender,Video-Einstellungen,Grafikeffekte,Arbeitsflächeneffekte,Animationsgeschwindigkeit
X-KDE-Keywords[el]=kwin,παράθυρο,διαχειριστής,σύνθεση,εφέ,3D εφέ,2D εφέ,OpenGL,XRender,ρυθμίσεις βίντεο,γραφικά εφέ,εφέ επιφάνειας εργασίας, ταχύτητα κινούμενης εικόνας
X-KDE-Keywords[en_GB]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed
X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio,velocidad de animación
X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid,animatsiooni kiirus

4
libkwineffects/kwinglutils.cpp
View file

@ -703,6 +703,10 @@ bool ShaderManager::selfTest()
qCWarning(LIBKWINGLUTILS) << "Framebuffer objects not supported - skipping shader tests";
return true;
}
if (GLPlatform::instance()->isNvidia() && GLPlatform::instance()->glRendererString().contains("Quadro")) {
qCWarning(LIBKWINGLUTILS) << "Skipping self test as it is reported to return false positive results on Quadro hardware";
return true;
}
// Create the source texture
QImage image(2, 2, QImage::Format_ARGB32_Premultiplied);