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 2021-06-14 01:16:13 +00:00
parent 943bdc0e64
commit 3ed363c498
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/windowaperture/package/metadata.desktop
View file

@ -29,7 +29,7 @@ Name[pt]=Aperto das Janelas
Name[pt_BR]=Aperto das janelas
Name[ro]=Diafragmă fereastră
Name[ru]=Разбрасывание окон в стороны
Name[sk]=Otvor okien
Name[sk]=Clona okien
Name[sl]=Zaslonka okna
Name[sr]=Бленда прозора
Name[sr@ijekavian]=Бленда прозора