Commit aa8389d6 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 e957e2aa
Pipeline #93663 skipped
......@@ -86,10 +86,26 @@ Actions=statistics;healthCert;
[Desktop Action statistics]
Name=Statistics
Name[ca]=Estadístiques
Name[ca@valencia]=Estadístiques
Name[es]=Estadísticas
Name[ia]=Statistica
Name[nl]=Statistieken
Name[sv]=Statistik
Name[uk]=Статистика
Name[x-test]=xxStatisticsxx
Icon=view-statistics
Exec=itinerary --page stats
[Desktop Action healthCert]
Name=Health Certificates
Name[ca]=Certificats de salut
Name[ca@valencia]=Certificats de salut
Name[es]=Certificados sanitarios
Name[ia]=Certificatos de Sanitate
Name[nl]=Gezondheidscertificaten
Name[sv]=Hälsocertifikat
Name[uk]=Сертифікати здоров'я
Name[x-test]=xxHealth Certificatesxx
Icon=cross-shape
Exec=itinerary --page healthCert
Supports Markdown
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