Commit 0c52d341 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 2d5bbe0a
Pipeline #98955 skipped
......@@ -92,11 +92,13 @@ Name[cs]=Statistika
Name[es]=Estadísticas
Name[fr]=Statistiques
Name[ia]=Statistica
Name[it]=Statistiche
Name[ko]=통계
Name[nl]=Statistieken
Name[pl]=Statystyki
Name[pt]=Estatísticas
Name[pt_BR]=Estatísticas
Name[sk]=Štatistika
Name[sl]=Statistika
Name[sv]=Statistik
Name[uk]=Статистика
......@@ -111,10 +113,12 @@ Name[ca@valencia]=Certificats de salut
Name[es]=Certificados sanitarios
Name[fr]=Certificats de santé
Name[ia]=Certificatos de Sanitate
Name[it]=Certificati medici
Name[ko]=건강 증명서
Name[nl]=Gezondheidscertificaten
Name[pl]=Certyfikaty zdrowia
Name[pt_BR]=Certificados de saúde
Name[sk]=Zdravotné certifikáty
Name[sl]=Zdravstvena potrdila
Name[sv]=Hälsocertifikat
Name[uk]=Сертифікати здоров'я
......
......@@ -11,6 +11,7 @@ Name[ko]=입장권, 승차권, 탑승권
Name[nl]=Tickets en boardingpassen
Name[pl]=Bilety i karty pokładowe
Name[pt_BR]=Passagens e cartões de embarque
Name[sk]=Lístky a palubné vstupenky
Name[sl]=Vozovnice in vstopni kuponi
Name[sv]=Biljetter och boardingkort
Name[uk]=Квитки та посадкові талони
......
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