Commit 55f83de0 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 a1341fde
......@@ -106,6 +106,7 @@ Comment[fi]=Ohjeita sovellusten käyttöön
Comment[gl]=Axuda de programas
Comment[ia]=Adjuta pro applicationes
Comment[it]=Guida per le applicazioni
Comment[ko]=프로그램 도움말
Comment[nl]=Hulp voor toepassingen
Comment[nn]=Hjelp for program
Comment[pl]=Pomoc dla programów
......
......@@ -114,6 +114,7 @@ GenericName[fi]=Ohjekeskus
GenericName[gl]=Centro de axuda
GenericName[ia]=Centro de Adjuta
GenericName[it]=Centro documentazione
GenericName[ko]=도움말 센터
GenericName[nl]=Helpcentrum
GenericName[nn]=Hjelpesenter
GenericName[pl]=Ośrodek Pomocy
......@@ -145,6 +146,7 @@ Comment[fi]=Selaa dokumentaatiota ja etsi sieltä
Comment[gl]=Explorar e buscar na documentación
Comment[ia]=Naviga e cerca in le documentation
Comment[it]=Sfoglia e cerca nella documentazione
Comment[ko]=문서 찾아보기
Comment[nl]=Blader in en doorzoek documentatie
Comment[nn]=Søk og bla gjennom hjelpetekstar
Comment[pl]=Przeglądarka i wyszukiwarka dokumentacji
......
......@@ -15,6 +15,7 @@ Name[fi]=Perusasiat
Name[gl]=Esenciais
Name[ia]=Essentiales
Name[it]=Fondamentali
Name[ko]=기초
Name[nl]=Fundamentals
Name[nn]=Det grunnleggjande
Name[pl]=Podstawy
......
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