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.17.5
parent
0e50a9d55c
commit
85bc931d72
|
@ -31,7 +31,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",
|
||||||
|
|
|
@ -31,7 +31,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",
|
||||||
|
|
Loading…
Reference in New Issue