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-06-13 07:33:20 +02:00
parent c44adda40f
commit f9a3a97dc7
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

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

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

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