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"
5 years ago · a2905823e5
parent 93550163a7
commit a2905823e5
2 changed files with 2 additions and 2 deletions
--- a/src/kontactplugin/kmail/kmailplugin.desktop
+++ b/src/kontactplugin/kmail/kmailplugin.desktop
@ -60,7 +60,7 @@ Comment[nb]=Kontact programtillegg for KMail
 Comment[nds]=KMail-Moduul för Kontact
 Comment[ne]=केडीई मेल प्लगइन सम्पर्क गर्नुहोस्
 Comment[nl]=Kontact KMail-plug-in
-Comment[nn]=Kontakt-programtillegg for KMail
+Comment[nn]=Kontact-programtillegg for KMail
 Comment[pa]=ਸੰਪਰਕ ਕੇਮੇਲ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Kontact do współpracy z KMail
 Comment[pt]='Plugin' do KMail para o Kontact
--- a/src/kontactplugin/summary/summaryplugin.desktop
+++ b/src/kontactplugin/summary/summaryplugin.desktop
@ -51,7 +51,7 @@ Comment[nb]=Kontact programtillegg for sammendragsvisning
 Comment[nds]=Översichtansicht-Moduul för Kontact
 Comment[ne]=सारांश दृश्य प्लगइनमा सम्पर्क गर्नुहोस्
 Comment[nl]=Kontact SummaryView-plug-in
-Comment[nn]=Kontakt-tillegg for samandragsvising
+Comment[nn]=Kontact-tillegg for samandragsvising
 Comment[pl]=Wtyczka Kontact do wyświetlania podsumowania
 Comment[pt]='Plugin' do SummaryView do Kontact
 Comment[pt_BR]=Plugin de Visualização do resumo do Kontact