Commit bec11dbf 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 68853aae
Pipeline #97707 skipped
......@@ -94,6 +94,7 @@ Name[fr]=Statistiques
Name[ia]=Statistica
Name[ko]=통계
Name[nl]=Statistieken
Name[pl]=Statystyki
Name[pt]=Estatísticas
Name[pt_BR]=Estatísticas
Name[sl]=Statistika
......@@ -112,6 +113,7 @@ Name[fr]=Certificats de santé
Name[ia]=Certificatos de Sanitate
Name[ko]=건강 증명서
Name[nl]=Gezondheidscertificaten
Name[pl]=Certyfikaty zdrowia
Name[pt_BR]=Certificados de saúde
Name[sl]=Zdravstvena potrdila
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