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-09-04 04:47:09 +02:00
parent 6681f1c0df
commit 62c6e1399b
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,12 +4,14 @@
"Description": "KWin Compositor plugin rendering through QPainter", "Description": "KWin Compositor plugin rendering through QPainter",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través del 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[nl]": "KWin-compositor-plug-in rendering via QPainter",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez QPainter",
"Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter", "Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter",
"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",
"Id": "KWinSceneQPainter", "Id": "KWinSceneQPainter",
"Name": "SceneQPainter", "Name": "SceneQPainter",
"Name[pl]": "QPainter sceny",
"Name[sv]": "Scen QPainter", "Name[sv]": "Scen QPainter",
"Name[x-test]": "xxSceneQPainterxx" "Name[x-test]": "xxSceneQPainterxx"
} }

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

@ -4,12 +4,14 @@
"Description": "KWin Compositor plugin rendering through XRender", "Description": "KWin Compositor plugin rendering through XRender",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'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[nl]": "KWin-compositor-plug-in rendering via XRender",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez XRender",
"Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender", "Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender",
"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",
"Id": "KWinSceneXRender", "Id": "KWinSceneXRender",
"Name": "SceneXRender", "Name": "SceneXRender",
"Name[pl]": "XRender sceny",
"Name[sv]": "Scen XRender", "Name[sv]": "Scen XRender",
"Name[x-test]": "xxSceneXRenderxx" "Name[x-test]": "xxSceneXRenderxx"
} }