Commit fc71e0d2 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 a7719d64
......@@ -95,6 +95,7 @@ Comment[ca]=Ajuda per les aplicacions
Comment[ca@valencia]=Ajuda per les aplicacions
Comment[de]=Handbücher für Anwendungen
Comment[el]=Βοήθεια για τις εφαρμογές
Comment[en_GB]=Help for applications
Comment[es]=Ayuda de las aplicaciones
Comment[fi]=Ohjeita sovellusten käyttöön
Comment[it]=Guida per le applicazioni
......
......@@ -102,22 +102,28 @@ Name[zh_TW]=求助
GenericName=Help Center
GenericName[ca]=Centre d'ajuda
GenericName[de]=Hilfezentrum
GenericName[en_GB]=Help Centre
GenericName[es]=Centro de ayuda
GenericName[nl]=Helpcentrum
GenericName[pl]=Ośrodek Pomocy
GenericName[pt]=Centro de Ajuda
GenericName[pt_BR]=Centro de ajuda
GenericName[sk]=Pomocník KDE
GenericName[sl]=Središče za pomoč
GenericName[sv]=Hjälpcentral
GenericName[uk]=Центр довідки
GenericName[x-test]=xxHelp Centerxx
Comment=Browse and search documentation
Comment[ca]=Explora i cerca documentació
Comment[de]=Dokumentation lesen und durchsuchen
Comment[en_GB]=Browse and search documentation
Comment[es]=Explorar y buscar documentación
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[sk]=Prehliadať a hľadať dokumentáciu
Comment[sl]=Brskajte in iščite po dokumentaciji
Comment[sv]=Bläddra och sök i dokumentation
Comment[uk]=Перегляд документації та пошук у ній
Comment[x-test]=xxBrowse and search documentationxx
......
......@@ -6,6 +6,7 @@ Name[ca]=Fonaments
Name[ca@valencia]=Fonaments
Name[de]=Grundlagen
Name[el]=Βασικά
Name[en_GB]=Fundamentals
Name[es]=Fundamentos
Name[fi]=Perusasiat
Name[it]=Fondamentali
......
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