Commit 3a500ecc 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 7a4e0b81
Pipeline #24936 skipped
......@@ -4,6 +4,7 @@ Name[ca]=Llibreta de telèfons
Name[ca@valencia]=Llibreta de telèfons
Name[es]=Guía telefónica
Name[fr]=Agenda téléphonique
Name[id]=Buku Telepon
Name[it]=Phone Book
......@@ -24,6 +25,7 @@ Comment[ca]=Visualitza i edita els contactes
Comment[ca@valencia]=Visualitza i edita els contactes
Comment[es]=Edite y vea contactos
Comment[et]=Kontaktide näitamine ja muutmine
Comment[eu]=Editatu eta ikusi kontaktuak
Comment[fr]=Modifier et afficher les contacts
Comment[id]=Edit dan tilik Kontak
Comment[it]=Modifica e visualizza i contatti
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