SVN_SILENT made messages (.desktop file) - always resolve ours

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"
icc-effect-5.14.5
l10n daemon script 2018-09-22 08:04:02 +02:00
parent 9d49ba6a97
commit 53ba323f76
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,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 成插件",
"Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件",
"Id": "KWinSceneQPainter",
"Name": "SceneQPainter",

View File

@ -31,7 +31,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 成插件",
"Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件",
"Id": "KWinSceneXRender",
"Name": "SceneXRender",