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 2022-12-11 01:54:54 +00:00
parent e8545fdb37
commit f2bca662da
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/backends/x11/windowed/x11.json
View file

@ -36,7 +36,7 @@
"Description[sr@latin]": "Renderovanje u ugnežđeni prozor na prozorskom sistemu X11.",
"Description[sr]": "Рендеровање у угнежђени прозор на прозорском систему Икс11.",
"Description[sv]": "Återge till ett nästlat fönster på X11-fönstersystem.",
"Description[tr]": "X11 pencere sisteminde iç içe geçmiş bir pencereye gerçekle.",
"Description[tr]": "X11 pencere sisteminde iç içe geçmiş bir pencereye sunun.",
"Description[uk]": "Обробляти у вкладене вікно системи керування вікнами X11.",
"Description[vi]": "Kết xuất vào một cửa sổ lồng trong hệ thống cửa sổ X11.",
"Description[x-test]": "xxRender to a nested window on X11 windowing system.xx",