Commit eedd89fd 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 735fcc6e
......@@ -5,6 +5,7 @@
"Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través de l'OpenGL",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'OpenGL",
"Description[es]": "Complemento compositor de KWin renderizando mediante OpenGL",
"Description[it]": "Estensione del compositore di KWin per la resa tramite OpenGL",
"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",
......
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