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

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2016-03-01 13:09:20 +00:00
parent 9d09cf6dc9
commit 9472756205
6 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backends/drm/drm.json
View file

@ -3,6 +3,7 @@
"Description": "Render through drm node.",
"Description[ca@valencia]": "Renderitza mitjançant el node del DRM.",
"Description[ca]": "Renderitza mitjançant el node del DRM.",
"Description[da]": "Render igennem drm-knude.",
"Description[de]": "In DRM-Knoten rendern.",
"Description[es]": "Renderizar a través del nodo DRM.",
"Description[fi]": "Renderöi DRM-noden läpi.",

1
backends/fbdev/fbdev.json
View file

@ -3,6 +3,7 @@
"Description": "Render to framebuffer.",
"Description[ca@valencia]": "Renderitza al «framebuffer».",
"Description[ca]": "Renderitza al «framebuffer».",
"Description[da]": "Render til framebuffer.",
"Description[de]": "In Framebuffer rendern.",
"Description[es]": "Renderizar en el «framebuffer».",
"Description[fi]": "Renderöi framebufferiin.",

1
backends/hwcomposer/hwcomposer.json
View file

@ -3,6 +3,7 @@
"Description": "Render through hwcomposer through libhybris.",
"Description[ca@valencia]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».",
"Description[ca]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».",
"Description[da]": "Rendér igennem hwcomposer igennem libhybris.",
"Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».",
"Description[fi]": "Renderöi hwcomposerin läpi käyttäen libhybristä.",
"Description[fr]": "Rendre par le biais de « hwcomposer » via « libhybris ».",

2
backends/virtual/virtual.json
View file

@ -3,6 +3,7 @@
"Description": "Render to a virtual framebuffer.",
"Description[ca@valencia]": "Renderitza a un «framebuffer» virtual.",
"Description[ca]": "Renderitza a un «framebuffer» virtual.",
"Description[da]": "Rendér til en virtuel framebuffer.",
"Description[de]": "In virtuellen Framebuffer rendern.",
"Description[es]": "Renderizar en un «framebuffer» virtual.",
"Description[fi]": "Renderöi virtuaaliseen framebufferiin.",
@ -29,6 +30,7 @@
"Name": "virtual",
"Name[ca@valencia]": "Virtual",
"Name[ca]": "Virtual",
"Name[da]": "virtuel",
"Name[de]": "Virtuell",
"Name[nl]": "virtueel",
"Name[nn]": "virtuell",

1
backends/wayland/wayland.json
View file

@ -3,6 +3,7 @@
"Description": "Render to a nested window on running Wayland compositor.",
"Description[ca@valencia]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.",
"Description[ca]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.",
"Description[da]": "Rendér til et indlejret vindue på kørende Wayland-compositor.",
"Description[es]": "Renderizar en una ventana anidada en el compositor Wayland en ejecución.",
"Description[fi]": "Renderöi sisäkkäiseen ikkunaan, jota hallitsee Wayland-koostin.",
"Description[fr]": "Rendre sur une fenêtre imbriquée sur un compositeur Wayland en cours de fonctionnement.",

1
backends/x11/x11.json
View file

@ -3,6 +3,7 @@
"Description": "Render to a nested window on X11 windowing system.",
"Description[ca@valencia]": "Renderitza a una finestra imbricada en el sistema de finestres X11.",
"Description[ca]": "Renderitza a una finestra imbricada en el sistema de finestres X11.",
"Description[da]": "Rendér til et indlejret vindue på X11-vinduessystemet.",
"Description[es]": "Renderizar en una ventana anidada en el sistema de ventanas X11.",
"Description[fi]": "Renderöi sisäkkäiseen ikkunaan, joka on X11-ikkunointijärjestelmässä.",
"Description[fr]": "Rendre sur une fenêtre imbriquée sur le système de fenêtrage X11.",