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-10-24 05:16:57 +02:00
parent 2a13a292ea
commit f6e32f5ba1
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

@ -17,6 +17,7 @@
"Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz QPainter",
"Description[sr]": "К‑винов прикључак слагача за рендеровање кроз QPainter",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter",
"Description[tr]": "QPainter üzerinden KWin Compositor eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
"Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
"Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件",

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

@ -17,6 +17,7 @@
"Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz XRender",
"Description[sr]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender",
"Description[tr]": "XRender üzerinden KWin Compositor eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
"Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
"Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件",