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-09-10 04:56:20 +02:00
parent 45f98f694c
commit 95ae8dad1b
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,12 +8,20 @@
"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[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",
"Description[sr]": "К‑винов прикључак слагача за рендеровање кроз QPainter",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
"Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx", "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
"Id": "KWinSceneQPainter", "Id": "KWinSceneQPainter",
"Name": "SceneQPainter", "Name": "SceneQPainter",
"Name[pl]": "QPainter sceny", "Name[pl]": "QPainter sceny",
"Name[sr@ijekavian]": "QPainter-сцена",
"Name[sr@ijekavianlatin]": "QPainter-scena",
"Name[sr@latin]": "QPainter-scena",
"Name[sr]": "QPainter-сцена",
"Name[sv]": "Scen QPainter", "Name[sv]": "Scen QPainter",
"Name[x-test]": "xxSceneQPainterxx" "Name[x-test]": "xxSceneQPainterxx"
} }

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

@ -8,12 +8,20 @@
"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[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",
"Description[sr]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
"Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx", "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
"Id": "KWinSceneXRender", "Id": "KWinSceneXRender",
"Name": "SceneXRender", "Name": "SceneXRender",
"Name[pl]": "XRender sceny", "Name[pl]": "XRender sceny",
"Name[sr@ijekavian]": "Икс‑рендер-сцена",
"Name[sr@ijekavianlatin]": "XRender-scena",
"Name[sr@latin]": "XRender-scena",
"Name[sr]": "Икс‑рендер-сцена",
"Name[sv]": "Scen XRender", "Name[sv]": "Scen XRender",
"Name[x-test]": "xxSceneXRenderxx" "Name[x-test]": "xxSceneXRenderxx"
} }