Commit d4908f43 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 8166171c
......@@ -94,6 +94,7 @@ Comment=Help for applications
Comment[ca]=Ajuda per les aplicacions
Comment[ca@valencia]=Ajuda per les aplicacions
Comment[de]=Handbücher für Anwendungen
Comment[el]=Βοήθεια για τις εφαρμογές
Comment[es]=Ayuda de las aplicaciones
Comment[fi]=Ohjeita sovellusten käyttöön
Comment[it]=Guida per le applicazioni
......
......@@ -5,6 +5,7 @@ Name=Fundamentals
Name[ca]=Fonaments
Name[ca@valencia]=Fonaments
Name[de]=Grundlagen
Name[el]=Βασικά
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