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"

resources/linux/org.kde.ghostwriter.desktop

@@ -23,6 +23,7 @@ Name[pl]=ghostwriter
 Name[pt]=ghostwriter
 Name[pt_BR]=ghostwriter
 Name[ru]=ghostwriter
+Name[sa]=भूतलेखकः
 Name[sk]=ghostwriter
 Name[sl]=ghostwriter
 Name[sv]=ghostwriter
@@ -54,6 +55,7 @@ GenericName[pl]=Edytor markdown
 GenericName[pt]=Editor de Markdown
 GenericName[pt_BR]=Editor markdown
 GenericName[ru]=Редактор Markdown
+GenericName[sa]=मार्कडाउन सम्पादक
 GenericName[sl]=Urejevalnik Markdown
 GenericName[sv]=Markdown-editor
 GenericName[tr]=Markdown Düzenleyicisi
@@ -83,6 +85,7 @@ Comment[pl]=Nierozpraszający edytor tekstowy do Markdown
 Comment[pt]=Editor de texto em Markdown sem distracções
 Comment[pt_BR]=Editor de texto livre de distrações para Markdown
 Comment[ru]=Редактор Markdown для сосредоточенной работы
+Comment[sa]=Markdown कृते विक्षेप-रहितः पाठसम्पादकः
 Comment[sl]=Urejevalnik besedil brez motenj za Markdown
 Comment[sv]=Störningsfri texteditor för Markdown
 Comment[tr]=Dikkat dağıtmayan bir Markdown metin düzenleyicisi
@@ -117,6 +120,7 @@ Keywords[pl]=Markdown;edytor;dokument;pełny ekran;rozpraszanie;koncentracja;sku
 Keywords[pt]=Markdown;editor;documento;ecrã completo;distracção;concentração;focado;escrita;
 Keywords[pt_BR]=Markdown;editor;documento;tela cheia;distração;concentração;focado;escrita;
 Keywords[ru]=Markdown;редактор;документ;полноэкранный;отвлекающий фактор;концентрация;сосредоточенность;написание;
+Keywords[sa]=Markdown;सम्पादक;दस्तावेज;पूर्णपर्दे;विक्षेप; एकाग्रता;केन्द्रित;लेखन;
 Keywords[sl]=Markdown;urejevalnik;dokument;celotni zaslon;motnje;koncentracija;osredotočeno;pisanje;
 Keywords[sv]=Markdown;editor;dokument;fullskärm;störning;koncentration;fokus;skriva;
 Keywords[tr]=markdown;düzenleyici;editör;belge;tam ekran;dikkat;odak;yazım;yazma;