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"
This commit is contained in:
parent
bc45ff1458
commit
6681f1c0df
2 changed files with 18 additions and 2 deletions
|
@ -2,7 +2,15 @@
|
|||
"CompositingType": 4,
|
||||
"KPlugin": {
|
||||
"Description": "KWin Compositor plugin rendering through QPainter",
|
||||
"Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter",
|
||||
"Description[nl]": "KWin-compositor-plug-in rendering via QPainter",
|
||||
"Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter",
|
||||
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter",
|
||||
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
|
||||
"Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
|
||||
"Id": "KWinSceneQPainter",
|
||||
"Name": "SceneQPainter"
|
||||
"Name": "SceneQPainter",
|
||||
"Name[sv]": "Scen QPainter",
|
||||
"Name[x-test]": "xxSceneQPainterxx"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,7 +2,15 @@
|
|||
"CompositingType": 2,
|
||||
"KPlugin": {
|
||||
"Description": "KWin Compositor plugin rendering through XRender",
|
||||
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender",
|
||||
"Description[nl]": "KWin-compositor-plug-in rendering via XRender",
|
||||
"Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender",
|
||||
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender",
|
||||
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
|
||||
"Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
|
||||
"Id": "KWinSceneXRender",
|
||||
"Name": "SceneXRender"
|
||||
"Name": "SceneXRender",
|
||||
"Name[sv]": "Scen XRender",
|
||||
"Name[x-test]": "xxSceneXRenderxx"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue