Commit 6561ca63 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 86c9685c
......@@ -101,6 +101,7 @@ Comment[el]=Βοήθεια για τις εφαρμογές
Comment[en_GB]=Help for applications
Comment[es]=Ayuda de las aplicaciones
Comment[fi]=Ohjeita sovellusten käyttöön
Comment[gl]=Axuda de programas
Comment[it]=Guida per le applicazioni
Comment[nl]=Hulp voor toepassingen
Comment[nn]=Hjelp for program
......
......@@ -109,6 +109,7 @@ GenericName[el]=Κέντρο αρωγής
GenericName[en_GB]=Help Centre
GenericName[es]=Centro de ayuda
GenericName[fi]=Ohjekeskus
GenericName[gl]=Centro de axuda
GenericName[it]=Centro documentazione
GenericName[nl]=Helpcentrum
GenericName[pl]=Ośrodek Pomocy
......@@ -134,6 +135,7 @@ Comment[el]=Περιήγηση και αναζήτηση στην τεκμηρί
Comment[en_GB]=Browse and search documentation
Comment[es]=Explorar y buscar documentación
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[pl]=Przeglądarka i wyszukiwarka dokumentacji
......
......@@ -10,6 +10,7 @@ Name[el]=Βασικά
Name[en_GB]=Fundamentals
Name[es]=Fundamentos
Name[fi]=Perusasiat
Name[gl]=Esenciais
Name[it]=Fondamentali
Name[nl]=Fundamentals
Name[nn]=Det grunnleggjande
......
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