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-01-12 12:09:37 +00:00
parent e861c5f185
commit 9bf7ad4a9f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backends/virtual/virtual.json
View file

@ -3,6 +3,7 @@
"Description": "Render to a virtual framebuffer.", "Description": "Render to a virtual framebuffer.",
"Description[ca@valencia]": "Renderitza a un «framebuffer» virtual.", "Description[ca@valencia]": "Renderitza a un «framebuffer» virtual.",
"Description[ca]": "Renderitza a un «framebuffer» virtual.", "Description[ca]": "Renderitza a un «framebuffer» virtual.",
"Description[de]": "In virtuellen Framebuffer rendern.",
"Description[es]": "Renderizar en un «framebuffer» virtual.", "Description[es]": "Renderizar en un «framebuffer» virtual.",
"Description[fi]": "Renderöi virtuaaliseen framebufferiin.", "Description[fi]": "Renderöi virtuaaliseen framebufferiin.",
"Description[fr]": "Rendre sur un « framebuffer » factice.", "Description[fr]": "Rendre sur un « framebuffer » factice.",