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-11-05 05:34:25 +01:00
parent 0369011c23
commit cd04a6c901
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/sessionquit/package/metadata.desktop
View file

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Session Quit
Name[ca]=Sortida de la sessió
Name[cs]=Sezení bylo ukončeno
Name[en_GB]=Session Quit
Name[es]=Cierre de sesión
Name[eu]=Saiotik irtetea