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-08-24 01:20:52 +00:00
parent 731564f04d
commit 6f6944058b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/effects/overview/kcm/overvieweffectkcm.desktop
View file

@ -15,6 +15,7 @@ Name[cs]=přehled
Name[es]=vista general
Name[eu]=Ikuspegi orokorra
Name[fr]=aperçu
Name[it]=panoramica
Name[lt]=apžvalga
Name[nl]=overzicht
Name[sl]=pregled