Commit 35208092 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 d8ec1390
......@@ -16,6 +16,7 @@ Description=The cleaning of the Earth begins
Description[ca]=Ha començat la neteja de la Terra
Description[en_GB]=The cleaning of the Earth begins
Description[es]=La limpieza de la Tierra comienza
Description[fi]=Maapallon puhdistaminen alkaa
Description[fr]=Le nettoyage de la Terre commence
Description[it]=Inizia la pulizia della Terra
Description[nl]=Het schoonmaken van de Aarde begint
......
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