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"
4 years ago · 945ba0cc71
parent f2b81df652
commit 945ba0cc71
1 changed files with 1 additions and 0 deletions
--- a/colors/BreezeClassic.colors
+++ b/colors/BreezeClassic.colors
@ -117,6 +117,7 @@ Name[fr]=Breeze classique
 Name[hi]=ब्रीज़ क्लासिक
 Name[hu]=Breeze Classic
 Name[ia]=Brisa Classic
+Name[it]=Brezza classico
 Name[nl]=Breeze Classic
 Name[pl]=Klasyczna Bryza
 Name[pt_BR]=Breeze Classic