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 2017-09-12 04:56:04 +02:00
parent 875c00d64e
commit 23eaed2f83
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/scenes/qpainter/qpainter.json
View file

@ -2,6 +2,7 @@
"CompositingType": 4, "CompositingType": 4,
"KPlugin": { "KPlugin": {
"Description": "KWin Compositor plugin rendering through QPainter", "Description": "KWin Compositor plugin rendering through QPainter",
"Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través del QPainter",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter", "Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter",
"Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω QPainter", "Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω QPainter",
"Description[es]": "Complemento compositor de KWin renderizando mediante QPainter", "Description[es]": "Complemento compositor de KWin renderizando mediante QPainter",

1
plugins/scenes/xrender/xrender.json
View file

@ -2,6 +2,7 @@
"CompositingType": 2, "CompositingType": 2,
"KPlugin": { "KPlugin": {
"Description": "KWin Compositor plugin rendering through XRender", "Description": "KWin Compositor plugin rendering through XRender",
"Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través de l'XRender",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender", "Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender",
"Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω XRender", "Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω XRender",
"Description[es]": "Complemento compositor de KWin renderizando mediante XRender", "Description[es]": "Complemento compositor de KWin renderizando mediante XRender",