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
l10n daemon script 2017-09-15 05:12:58 +02:00
parent 7c9b9ed288
commit 8041040f43
2 changed files with 2 additions and 0 deletions

View File

@ -10,6 +10,7 @@
"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_BR]": "Plugin do compositor KWin renderizando pelo QPainter",
"Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз QPainter",
"Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz QPainter",
"Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz QPainter",

View File

@ -10,6 +10,7 @@
"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_BR]": "Plugin do compositor KWin renderizando pelo XRender",
"Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер",
"Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz XRender",
"Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz XRender",