Commit f78bac87 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 3fdc3e39
......@@ -47,6 +47,7 @@ Comment[ia]=Monstra le scriptorio per mover fenestra a latere
Comment[nl]=Toont het bureaublad door vensters opzij te schuiven
Comment[pl]=Pokaż pulpit rozsuwając okna na bok
Comment[pt]=Mostra o ecrã, deslocando as janelas para o lado
Comment[sk]=Zobrazí pracovnú plochu posunutím okien nabok
Comment[sl]=Prikaže namizje s pomikom vseh oken na stran
Comment[sv]=Visar skrivbordet genom flytta undan fönster
Comment[uk]=Показує стільницю, прибравши вікна
......
Supports Markdown
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