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 2017-11-04 06:13:10 +01:00
parent d71792378e
commit 880d0afcf1
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
"Description[nl]": "KWin-compositor-plug-in rendering via QPainter", "Description[nl]": "KWin-compositor-plug-in rendering via QPainter",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez 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]": "'Plugin' de Composição do KWin com desenho via QPainter",
"Description[pt_BR]": "Plugin do compositor KWin renderizando pelo QPainter",
"Description[sk]": "Renderovací plugin kompozítora KWin cez QPainter", "Description[sk]": "Renderovací plugin kompozítora KWin cez QPainter",
"Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз QPainter", "Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз QPainter",
"Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz QPainter", "Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz QPainter",

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

@ -11,6 +11,7 @@
"Description[nl]": "KWin-compositor-plug-in rendering via XRender", "Description[nl]": "KWin-compositor-plug-in rendering via XRender",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez 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]": "'Plugin' de Composição do KWin com desenho via XRender",
"Description[pt_BR]": "Plugin do compositor KWin renderizando pelo XRender",
"Description[sk]": "Renderovací plugin kompozítora KWin cez XRender", "Description[sk]": "Renderovací plugin kompozítora KWin cez XRender",
"Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер", "Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер",
"Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz XRender", "Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz XRender",