Commit 3671b4e0 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 f37e6775
Pipeline #95955 skipped
......@@ -92,6 +92,9 @@ Name[es]=Estadísticas
Name[fr]=Statistiques
Name[ia]=Statistica
Name[nl]=Statistieken
Name[pt]=Estatísticas
Name[pt_BR]=Estatísticas
Name[sl]=Statistika
Name[sv]=Statistik
Name[uk]=Статистика
Name[x-test]=xxStatisticsxx
......@@ -106,6 +109,8 @@ Name[es]=Certificados sanitarios
Name[fr]=Certificats de santé
Name[ia]=Certificatos de Sanitate
Name[nl]=Gezondheidscertificaten
Name[pt_BR]=Certificados de saúde
Name[sl]=Zdravstvena potrdila
Name[sv]=Hälsocertifikat
Name[uk]=Сертифікати здоров'я
Name[x-test]=xxHealth Certificatesxx
......
......@@ -9,6 +9,7 @@ Name[ia]=Billetes e carts de imbarcar
Name[it]=Biglietti e carte d'imbarco
Name[nl]=Tickets en boardingpassen
Name[pl]=Bilety i karty pokładowe
Name[pt_BR]=Passagens e cartões de embarque
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