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 29, 2018 · c78094c · c78094c
1 parent a330e27
commit c78094c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/datasources/its/kstdata_itssource.desktop b/src/datasources/its/kstdata_itssource.desktop
@@ -6,6 +6,8 @@ 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[en_GB]=Indexed Thumbnail Stream Reader
+Name[nl]=Streamleesprogramma van geïndexeerde miniaturen
 Name[pt]=Leitor de Sequências de Miniaturas Indexadas
 Name[uk]=Засіб читання Indexed Thumbnail Stream
 Name[x-test]=xxIndexed Thumbnail Stream Readerxx