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"
Kst-plot · Apr 27, 2018 · a330e27 · a330e27
1 parent 2d55838
commit a330e27
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/datasources/its/kstdata_itssource.desktop b/src/datasources/its/kstdata_itssource.desktop
@@ -5,4 +5,8 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=itssource
 X-Kst-Plugin-Author=C. Barth Netterfield
 Name=Indexed Thumbnail Stream Reader
+Name[ca]=Lector de fluxos de miniatures indexades
+Name[pt]=Leitor de Sequências de Miniaturas Indexadas
+Name[uk]=Засіб читання Indexed Thumbnail Stream
+Name[x-test]=xxIndexed Thumbnail Stream Readerxx