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"
2020-03-02 05:46:53 +01:00 · 2020-03-02 05:46:53 +01:00 · 7eee223dfc
commit 7eee223dfc
parent a39a2d562d
5 changed files with 5 additions and 0 deletions
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@ -23,6 +23,7 @@ Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
 Name[lt]=KDE Connect
+Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
 Name[nl]=KDE Connect
 Name[nn]=KDE Connect
 Name[pl]=KDE Connect
--- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake
+++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
@ -33,6 +33,7 @@ Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
 Name[lt]=KDE Connect
+Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
 Name[nl]=KDE Connect
 Name[nn]=KDE Connect
 Name[pl]=KDE Connect
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@ -34,6 +34,7 @@ Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
 Name[lt]=KDE Connect
+Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
 Name[nl]=KDE Connect
 Name[nn]=KDE Connect
 Name[pl]=KDE Connect
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@ -23,6 +23,7 @@ Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
 Name[lt]=KDE Connect
+Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
 Name[nl]=KDE Connect
 Name[nn]=KDE Connect
 Name[pl]=KDE Connect
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@ -24,6 +24,7 @@ Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
 Name[lt]=KDE Connect
+Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
 Name[nl]=KDE Connect
 Name[nn]=KDE Connect
 Name[pl]=KDE Connect