Commit 8ddeff3d 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 56607655
Pipeline #94143 skipped
......@@ -89,6 +89,7 @@ Name=Statistics
Name[ca]=Estadístiques
Name[ca@valencia]=Estadístiques
Name[es]=Estadísticas
Name[fr]=Statistiques
Name[ia]=Statistica
Name[nl]=Statistieken
Name[sv]=Statistik
......@@ -102,6 +103,7 @@ Name=Health Certificates
Name[ca]=Certificats de salut
Name[ca@valencia]=Certificats de salut
Name[es]=Certificados sanitarios
Name[fr]=Certificats de santé
Name[ia]=Certificatos de Sanitate
Name[nl]=Gezondheidscertificaten
Name[sv]=Hälsocertifikat
......
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