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-03 04:47:03 +02:00
parent bc45ff1458
commit 6681f1c0df
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,15 @@
"CompositingType": 4, "CompositingType": 4,
"KPlugin": { "KPlugin": {
"Description": "KWin Compositor plugin rendering through QPainter", "Description": "KWin Compositor plugin rendering through QPainter",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter",
"Description[nl]": "KWin-compositor-plug-in rendering via QPainter",
"Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
"Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
"Id": "KWinSceneQPainter", "Id": "KWinSceneQPainter",
"Name": "SceneQPainter" "Name": "SceneQPainter",
"Name[sv]": "Scen QPainter",
"Name[x-test]": "xxSceneQPainterxx"
} }
} }

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

@ -2,7 +2,15 @@
"CompositingType": 2, "CompositingType": 2,
"KPlugin": { "KPlugin": {
"Description": "KWin Compositor plugin rendering through XRender", "Description": "KWin Compositor plugin rendering through XRender",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender",
"Description[nl]": "KWin-compositor-plug-in rendering via XRender",
"Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
"Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
"Id": "KWinSceneXRender", "Id": "KWinSceneXRender",
"Name": "SceneXRender" "Name": "SceneXRender",
"Name[sv]": "Scen XRender",
"Name[x-test]": "xxSceneXRenderxx"
} }
} }