Commit b99956b8 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 c6fe1d17
......@@ -74,8 +74,8 @@ Comment[ast]=Monitoriza la carpeta «Documetos d'apocayá» por camudancies
Comment[bg]=Следене за промени в скорошните документи
Comment[bn]=সম্প্রতি ব্যবহৃত নথীর ফোল্ডার "Recent Documents"-এ কোন পরিবর্তন হচ্ছে কি না লক্ষ্য রাখে
Comment[bs]=Prati direktorij s posljednjim dokumentima
Comment[ca]=Controla els canvis en la carpeta «Documents recents»
Comment[ca@valencia]=Controla els canvis en la carpeta «Documents recents»
Comment[ca]=Controla els canvis a la carpeta «Documents recents»
Comment[ca@valencia]=Controla els canvis a la carpeta «Documents recents»
Comment[cs]=Monitoruje změny ve složce nedávných dokumentů
Comment[da]=Overvåger mappen med "nylige dokumenter" for ændringer
Comment[de]=Überwacht den Ordner „Zuletzt geöffnete Dokumente“ auf Änderungen
......
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