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 2018-01-28 05:10:57 +01:00
parent 977a5ef012
commit 53969e4828
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/scenes/opengl/opengl.json
View file

@ -12,6 +12,7 @@
"Description[it]": "Estensione del compositore di KWin per la resa tramite OpenGL",
"Description[ko]": "OpenGL로 렌더링하는 KWin 컴포지터 플러그인",
"Description[nl]": "KWin-compositor-plug-in rendering via OpenGL",
"Description[nn]": "KWin-samansetjartillegg som brukar 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",

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

@ -14,6 +14,7 @@
"Description[it]": "Estensione del compositore di KWin per la resa tramite QPainter",
"Description[ko]": "QPainter로 렌더링하는 KWin 컴포지터 플러그인",
"Description[nl]": "KWin-compositor-plug-in rendering via QPainter",
"Description[nn]": "KWin-samansetjartillegg som brukar 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",

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

@ -14,6 +14,7 @@
"Description[it]": "Estensione del compositore di KWin per la resa tramite XRender",
"Description[ko]": "XRender로 렌더링하는 KWin 컴포지터 플러그인",
"Description[nl]": "KWin-compositor-plug-in rendering via XRender",
"Description[nn]": "KWin-samansetjartillegg som brukar 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",