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 2018-11-20 08:43:32 +01:00
parent aace9b1675
commit 1f645b4bc5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/wobblywindows/wobblywindows_config.desktop
View file

@ -58,7 +58,7 @@ Name[pl]=Chwiejne okna
Name[pt]=Janelas Trémulas
Name[pt_BR]=Janelas instáveis
Name[ro]=Ferestre tremurătoare
Name[ru]=Дрожащие окна
Name[ru]=Колышущиеся окна
Name[si]=කවුළු සොලවන්න
Name[sk]=Zvlnené okná
Name[sl]=Majava okna