Commit afe5d453 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 6b18e83a
......@@ -17,6 +17,7 @@ Name[en_GB]=KGeography
Name[eo]=KGeography
Name[es]=KGeography
Name[et]=KGeography
Name[eu]=KGeography
Name[fi]=KGeography
Name[fr]=KGeography
Name[ga]=KGeography
......@@ -78,6 +79,7 @@ GenericName[en_GB]=Geography Trainer
GenericName[eo]=Geografia ekzercilo
GenericName[es]=Tutor de geografía
GenericName[et]=Geograafia õpiprogramm
GenericName[eu]=Geografia entrenatzailea
GenericName[fa]=مربی جغرافیا
GenericName[fi]=Maantieteen harjoitteluohjelma
GenericName[fr]=Apprentissage de la géographie
......@@ -138,6 +140,7 @@ Comment[en_GB]=A Geography Learning Program
Comment[eo]=Programo por lerni la geografion
Comment[es]=Un programa para aprender geografía
Comment[et]=Geograafia õpiprogramm
Comment[eu]=Geografia ikasteko programa
Comment[fa]=برنامه یادگیری جغرافیا
Comment[fi]=Maantieteen oppimisohjelma
Comment[fr]=Un programme d'apprentissage de la géographie
......
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