Commit 403514e4 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 c62076c8
......@@ -106,6 +106,7 @@ Comment[nn]=Hjelp for program
Comment[pl]=Pomoc dla programów
Comment[pt]=Ajuda das aplicações
Comment[pt_BR]=Ajuda para aplicativos
Comment[ru]=Руководства пользователя для приложений
Comment[sk]=Pomocník pre aplikácie
Comment[sl]=Pomoč za programe
Comment[sr]=Помоћ за програме
......@@ -112,6 +112,7 @@ GenericName[nl]=Helpcentrum
GenericName[pl]=Ośrodek Pomocy
GenericName[pt]=Centro de Ajuda
GenericName[pt_BR]=Centro de ajuda
GenericName[ru]=Центр справки
GenericName[sk]=Pomocník KDE
GenericName[sl]=Središče za pomoč
GenericName[sr]=Центар помоћи
......@@ -132,6 +133,7 @@ Comment[nl]=Blader in en doorzoek documentatie
Comment[pl]=Przeglądarka i wyszukiwarka dokumentacji
Comment[pt]=Navegar e pesquisar a documentação
Comment[pt_BR]=Navegue e pesquise na documentação
Comment[ru]=Просмотр и поиск документации
Comment[sk]=Prehliadať a hľadať dokumentáciu
Comment[sl]=Brskajte in iščite po dokumentaciji
Comment[sr]=Прегледајте и претражујте документацију
......@@ -16,6 +16,7 @@ Name[nn]=Det grunnleggjande
Name[ru]=Основы KDE
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