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-09-29 06:08:11 +02:00
parent fbab964e98
commit cd9acd2e41
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/fullscreen/package/metadata.desktop
View file

@ -19,6 +19,7 @@ Icon=preferences-system-windows-effect-fullscreen
Name=Full Screen
Name[ca]=Pantalla completa
Name[cs]=Celá obrazovka
Name[de]=Vollbild
Name[en_GB]=Full Screen
Name[es]=Pantalla completa
Name[fr]=Plein écran