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 · Jul 15, 2019 · e09cb50 · e09cb50
1 parent 3893db2
commit e09cb50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/datasources/hdf5/kstdata_hdf5.desktop b/src/datasources/hdf5/kstdata_hdf5.desktop
@@ -12,6 +12,7 @@ Name[es]=Lector HDF5
 Name[gl]=Cabeceira de HDF5
 Name[it]=Lettore HDF5
 Name[nl]=Leesprogramma DirFile
+Name[pl]=Czytnik HDF5
 Name[pt]=Leitor de HDF5
 Name[pt_BR]=Leitor HDF5
 Name[sv]=HDF5-läsare
@@ -25,6 +26,7 @@ Comment[es]=Complemento para leer archivos HDF5
 Comment[gl]=Complemento que le ficheiros HDF5
 Comment[it]=Estensione che legge i file HDF5
 Comment[nl]=Plug-in voor het lezen van HDF5-bestanden.
+Comment[pl]=Wtyczka do odczytywania plików HDF5
 Comment[pt]=Um 'plugin' para ler ficheiros em HDF5
 Comment[pt_BR]=Plugin para ler arquivos HDF5
 Comment[sv]=Insticksprogram som läser HDF5-filer.

diff --git a/src/datasources/its/kstdata_itssource.desktop b/src/datasources/its/kstdata_itssource.desktop
@@ -12,6 +12,7 @@ Name[es]=Lector de flujos de miniaturas indexadas
 Name[gl]=Lector de fluxo de miniatura indexada
 Name[it]=Lettore di flusso di miniature indicizzate
 Name[nl]=Streamleesprogramma van geïndexeerde miniaturen
+Name[pl]=Czytnik strumienia zaindeksowanych miniatur
 Name[pt]=Leitor de Sequências de Miniaturas Indexadas
 Name[pt_BR]=Leitor de fontes de miniaturas indexadas
 Name[sv]=Strömläsare av indexerade miniatyrbilder