Skip to content

Commit

Permalink
SVN_SILENT made messages (.desktop file) - always resolve ours
Browse files Browse the repository at this point in the history
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"
  • Loading branch information
l10n daemon script committed Mar 3, 2019
1 parent bd7f94c commit d10e6b0
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/datasources/hdf5/kstdata_hdf5.desktop
Expand Up @@ -8,6 +8,7 @@ Name=HDF5 Reader
Name[ca]=Lector de HDF5
Name[ca@valencia]=Lector de HDF5
Name[gl]=Cabeceira de HDF5
Name[it]=Lettore HDF5
Name[nl]=Leesprogramma DirFile
Name[pt]=Leitor de HDF5
Name[sv]=HDF5-läsare
Expand All @@ -17,6 +18,7 @@ Comment=Plugin that reads HDF5 files
Comment[ca]=Connector per llegir fitxers HDF5
Comment[ca@valencia]=Connector per llegir fitxers 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[pt]=Um 'plugin' para ler ficheiros em HDF5
Comment[sv]=Insticksprogram som läser HDF5-filer.
Expand Down

0 comments on commit d10e6b0

Please sign in to comment.