vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours 

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"
icc-effect-5.14.5
l10n daemon script 2016-07-23 13:39:58 +00:00
parent 710b5fb068
commit e511f26782
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

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