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"
7 years ago · d69048cf2f
parent 4212d57ca7
commit d69048cf2f
1 changed files with 1 additions and 0 deletions
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@ -3,6 +3,7 @@ Name=Latte Layouts
 Name[ca]=Disposicions del Latte
 Name[ca@valencia]=Disposicions del Latte
 Name[de]=Latte-Profile
+Name[es]=Distribuciones de Latte
 Name[it]=Disposizioni di Latte
 Name[nl]=Latte-indelingen
 Name[pl]=Układy Latte