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 2016-07-25 09:56:15 +00:00
parent e3921a9a53
commit 81961f65c6
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/cube/cubeslide_config.desktop
View file

@ -10,7 +10,7 @@ Name[ast]=Animación del cubu d'escritoriu
Name[bg]=Кубична анимация върху работен плот Name[bg]=Кубична анимация върху работен плот
Name[bs]=Animacija kocke površi Name[bs]=Animacija kocke površi
Name[ca]=Animació de cub per a l'escriptori Name[ca]=Animació de cub per a l'escriptori
Name[ca@valencia]=Animació del cub d'escriptori Name[ca@valencia]=Animació de cub per a l'escriptori
Name[cs]=Animace kostky plochy Name[cs]=Animace kostky plochy
Name[csb]=Animacëjô Szescanu pùltu Name[csb]=Animacëjô Szescanu pùltu
Name[da]=Animeret skrivebordsterning Name[da]=Animeret skrivebordsterning