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-23 01:27:10 +00:00
parent 76d1de48a8
commit 5246408660
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

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