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 2018-01-24 05:14:01 +01:00
parent 86f835ac35
commit df28de8716
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@
"Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
"Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
"Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件",
"Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件",
"Id": "KWinSceneQPainter",
"Name": "SceneQPainter",
"Name[pl]": "QPainter sceny",

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

@ -27,7 +27,7 @@
"Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
"Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
"Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件",
"Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件",
"Id": "KWinSceneXRender",
"Name": "SceneXRender",
"Name[pl]": "XRender sceny",