Commit d0df69d6 authored by Script Kiddy's avatar Script Kiddy

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 3d60d7e2
Pipeline #23688 passed with stage
in 8 minutes and 58 seconds
......@@ -10,6 +10,7 @@ Name[it]=Phone Book
Name[lt]=Telefonų knyga
Name[pt]=Lista Telefónica
Name[pt_BR]=Lista Telefônica
Name[sk]=Telefónny zoznam
......@@ -29,6 +30,7 @@ Comment[it]=Modifica e visualizza i contatti
Comment[ko]=연락처 보기 및 편집
Comment[lt]=Taisyti ir rodyti adresatus
Comment[nl]=Contactpersonen bewerken en bekijken
Comment[nn]=Vis og rediger kontaktar
Comment[pt]=Editar e ver contactos
Comment[pt_BR]=Editar e visualizar contatos
Comment[sk]=Upraviť a zobraziť kontakty
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