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 13:28:09 +00:00
parent e511f26782
commit 97e4b852e5
2 changed files with 2 additions and 2 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[bs]=Animacija kocke površi
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[csb]=Animacëjô Szescanu pùltu
Name[da]=Animeret skrivebordsterning

2
kcmkwin/kwindecoration/kwindecoration.desktop
View file

@ -30,7 +30,7 @@ Name[fi]=Ikkunoiden kehykset
Name[fr]=Décorations de fenêtres
Name[ga]=Maisiúcháin Fhuinneog
Name[gl]=Decoración da xanela
Name[he]=קישוטי חלון
Name[he]=מסגרת חלון
Name[hi]=विंडो सजावट
Name[hr]=Ukrasi prozora
Name[hu]=Ablakdekorációk