Commit e3dab9eb authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 29d0073b
......@@ -7,7 +7,7 @@ Comment[ast]=Plugin pal remanamientu de formatos d'archivu pa la biblioteca Kerf
Comment[bg]=Приствка за работа с архиви за Kerfuffle
Comment[bs]=Priključak za rukovanje formatima arhiva za biblioteku Kerfafl
Comment[ca]=Connector per a gestionar els formats d'arxiu per a la biblioteca Kerfuffle
Comment[ca@valencia]=Connector per gestionar els formats d'arxiu per la biblioteca Kerfuffle
Comment[ca@valencia]=Connector per a gestionar els formats d'arxiu per a la biblioteca Kerfuffle
Comment[cs]=Modul pro správu formátů archivů pro knihovnu Kerfuffle
Comment[da]=Plugin til håndtering af arkivformater til Kerfuffle-biblioteket
Comment[de]=Modul zum Umgang mit Archivformaten der Kerfuffle-Bibliothek
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment