Commit 882b4d34 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 c1633b63
......@@ -95,6 +95,7 @@ Comment[nn]=Set opp vising av feilsøkingsdata for Qt-program
Comment[pl]=Ustawienia wyjścia diagnostycznego ze wszystkich aplikacji Qt
Comment[pt]=Configurar o resultado de depuração das aplicações do Qt
Comment[sk]=Nastaviť výstup ladenia z Qt aplikácií
Comment[sl]=Nastavite razhroščevalni izpis iz programov Qt
Comment[sr]=Подешавање исправљачког излаза КуТ програма
Comment[sr@ijekavian]=Подешавање исправљачког излаза КуТ програма
Comment[sr@ijekavianlatin]=Podešavanje ispravljačkog izlaza Qt programa
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