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-03-08 07:03:02 +01:00
parent 05811535d4
commit fd68cf3ff4
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/eyeonscreen/package/metadata.desktop
View file

@ -3,6 +3,7 @@ Name=Eye on Screen
Name[az]=Pəncərənin ekranın mərkəzinə çəkilməsi Name[az]=Pəncərənin ekranın mərkəzinə çəkilməsi
Name[ca]=Ull a la pantalla Name[ca]=Ull a la pantalla
Name[cs]=Oko na obrazovce Name[cs]=Oko na obrazovce
Name[de]=Ansicht der Arbeitsfläche
Name[en_GB]=Eye on Screen Name[en_GB]=Eye on Screen
Name[es]=Ojo a la pantalla Name[es]=Ojo a la pantalla
Name[et]=Eye on Screen Name[et]=Eye on Screen