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.14.5
parent
5d07543d2f
commit
35bea8a87e
|
@ -9,6 +9,7 @@
|
|||
"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[pt_BR]": "Plugin do compositor KWin renderizando pelo 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",
|
||||
|
|
Loading…
Reference in New Issue