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 2020-06-25 09:53:28 +02:00
parent f3356b1f4f
commit 6a42eccfec
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/eyeonscreen/package/metadata.desktop
View file

@ -10,7 +10,7 @@ Name[en_GB]=eye On Screen
Name[es]=Ojo a la pantalla
Name[et]=eye On Screen
Name[eu]=begia pantailan
Name[fi]=eye On Screen
Name[fi]=Silmä näytöllä
Name[fr]=Jeter un oeil sur le bureau
Name[gl]=Ollo na pantalla
Name[he]=עין על המסך