Commit 039aaed1 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 65c594b0
Pipeline #24115 passed with stage
in 10 minutes and 57 seconds
......@@ -17,7 +17,6 @@ Name[sk]=Telefónny zoznam
Name[sl]=Phone Book
Name[uk]=Телефонна книга
Name[x-test]=xxPhone Bookxx
Comment=Edit and view Contacts
Comment[ca]=Visualitza i edita els contactes
......@@ -37,7 +36,6 @@ 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