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 2017-03-22 05:00:58 +01:00
parent 74d0a19a8a
commit 3836e04881
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/eyeonscreen/package/metadata.desktop
View file

@ -2,6 +2,7 @@
Name=eye On Screen
Name[ca]=Ull a la pantalla
Name[ca@valencia]=Ull a la pantalla
Name[cs]=oko na obrazovce
Name[da]=øjet på skærmen
Name[de]=Ansicht der Arbeitsfläche
Name[el]=μάτι Στην Οθόνη