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-09-21 01:47:35 +00:00
parent 501136b222
commit 1680fa1318
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/effects/screenedge/metadata.json
View file

@ -26,7 +26,7 @@
"Description[pt]": "Realça um extremo do ecrã quando se aproxima",
"Description[pt_BR]": "Destaca a borda da tela quando se aproxima",
"Description[ro]": "Evidențiază o muchie a ecranului la apropiere",
"Description[ru]": "Выделение краёв экрана при приближении к нему",
"Description[ru]": "Выделение края экрана при приближении к нему",
"Description[sk]": "Zvýrazní okraj obrazovky pri priblížení",
"Description[sl]": "Osvetli rob zaslona, ko se mu bliža",
"Description[sv]": "Markerar en skärmkant när man närmar sig den",