Commit 9b6e42ea authored by Script Kiddy's avatar Script Kiddy

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 6ac112ef
......@@ -67,7 +67,7 @@ Comment[ar]=المنتهى الخلفي PDF لأوكلار
Comment[ast]=Motor PDF pa Okular qu'usa Poppler
Comment[bg]=Ядро на Okular за PDF, използващо poppler
Comment[bs]=Pozadina PDF-a za Okular koristeći Poppler
Comment[ca]=Dorsal de PDF per a l'Okular emprant el poppler
Comment[ca]=Dorsal de PDF per a l'Okular que empra el «poppler»
Comment[ca@valencia]=Dorsal de PDF per a l'Okular emprant el poppler
Comment[cs]=Implementace PDF pro Okular používající poppler
Comment[da]=PDF-motor til Okular som bruger poppler
......
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