Commit 68853aae 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 0cafa174
Pipeline #96556 skipped
......@@ -88,9 +88,11 @@ Actions=statistics;healthCert;
Name=Statistics
Name[ca]=Estadístiques
Name[ca@valencia]=Estadístiques
Name[cs]=Statistika
Name[es]=Estadísticas
Name[fr]=Statistiques
Name[ia]=Statistica
Name[ko]=통계
Name[nl]=Statistieken
Name[pt]=Estatísticas
Name[pt_BR]=Estatísticas
......@@ -108,6 +110,7 @@ Name[ca@valencia]=Certificats de salut
Name[es]=Certificados sanitarios
Name[fr]=Certificats de santé
Name[ia]=Certificatos de Sanitate
Name[ko]=건강 증명서
Name[nl]=Gezondheidscertificaten
Name[pt_BR]=Certificados de saúde
Name[sl]=Zdravstvena potrdila
......
......@@ -7,6 +7,7 @@ Name[es]=Billetes y tarjetas de embarque
Name[fr]=Billets et cartes d'embarquement
Name[ia]=Billetes e carts de imbarcar
Name[it]=Biglietti e carte d'imbarco
Name[ko]=입장권, 승차권, 탑승권
Name[nl]=Tickets en boardingpassen
Name[pl]=Bilety i karty pokładowe
Name[pt_BR]=Passagens e cartões de embarque
......
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