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-12-01 05:42:23 +01:00
parent 331b16fb7a
commit 0fcc20b51b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwincompositing/kwincompositing.desktop
View file

@ -27,7 +27,7 @@ Name[eu]=Konposatzailea
Name[fi]=Koostin
Name[fr]=Compositeur
Name[gl]=Compositor
Name[hu]=Összeállító
Name[hu]=Kompozitor
Name[ia]=Compositor
Name[id]=Kompositor
Name[it]=Compositore