Commit 8f42cefc 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 aaea36eb
Pipeline #22585 passed with stage
in 12 minutes and 56 seconds
......@@ -13,6 +13,7 @@ Name[nl]=Telefoonboek
Name[pt]=Lista Telefónica
Name[pt_BR]=Lista Telefônica
Name[sk]=Telefónny zoznam
Name[sl]=Phone Book
Name[sv]=Telefonkatalog
Name[uk]=Телефонна книга
Name[x-test]=xxPhone Bookxx
......@@ -31,6 +32,7 @@ Comment[nl]=Contactpersonen bewerken en bekijken
Comment[pt]=Editar e ver contactos
Comment[pt_BR]=Editar e visualizar contatos
Comment[sk]=Upraviť a zobraziť kontakty
Comment[sl]=Uredi in poglej stike
Comment[sv]=Redigera och visa kontakter
Comment[uk]=Перегляд і редагування контактів
Comment[x-test]=xxEdit and view Contactsxx
......
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