Commit 07d1cb11 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 9919dfa1
......@@ -7,12 +7,20 @@
"Description[nl]": "KWin-compositor-plug-in rendering via OpenGL",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez OpenGL",
"Description[pt]": "'Plugin' de Composição do KWin com desenho via OpenGL",
"Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз опенГЛ",
"Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz OpenGL",
"Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz OpenGL",
"Description[sr]": "К‑винов прикључак слагача за рендеровање кроз опенГЛ",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via OpenGL",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням OpenGL",
"Description[x-test]": "xxKWin Compositor plugin rendering through OpenGLxx",
"Id": "KWinSceneOpenGL",
"Name": "SceneOpenGL",
"Name[pl]": "OpenGL sceny",
"Name[sr@ijekavian]": "ОпенГЛ-сцена",
"Name[sr@ijekavianlatin]": "OpenGL-scena",
"Name[sr@latin]": "OpenGL-scena",
"Name[sr]": "ОпенГЛ-сцена",
"Name[sv]": "Scen OpenGL",
"Name[x-test]": "xxSceneOpenGLxx"
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment