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 2019-03-09 05:50:43 +01:00
parent 0984f6ccfd
commit 0aa9cb1f7a
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/squash/package/metadata.desktop
View file

@ -38,7 +38,6 @@ Name[pl]=Ściskanie
Name[pt]=Esmagar
Name[pt_BR]=Achatar
Name[ru]=Сжатие
Name[sk]=Rozpučiť
Name[sv]=Kläm
Name[uk]=Складування
Name[x-test]=xxSquashxx