Commit 84d48028 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 bb69e0d5
......@@ -112,6 +112,7 @@ GenericName[fi]=Ohjekeskus
GenericName[gl]=Centro de axuda
GenericName[it]=Centro documentazione
GenericName[nl]=Helpcentrum
GenericName[nn]=Hjelpesenter
GenericName[pl]=Ośrodek Pomocy
GenericName[pt]=Centro de Ajuda
GenericName[pt_BR]=Centro de ajuda
......@@ -138,6 +139,7 @@ Comment[fi]=Selaa dokumentaatiota ja etsi sieltä
Comment[gl]=Explorar e buscar na documentación
Comment[it]=Sfoglia e cerca nella documentazione
Comment[nl]=Blader in en doorzoek documentatie
Comment[nn]=Søk og bla gjennom hjelpetekstar
Comment[pl]=Przeglądarka i wyszukiwarka dokumentacji
Comment[pt]=Navegar e pesquisar a documentação
Comment[pt_BR]=Navegue e pesquise na documentação
......
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