Commit a766aa05 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 45df3b28
......@@ -29,6 +29,7 @@ Name[x-test]=xxUser Feedbackxx
X-KDE-Keywords=kaddressbook, configure, settings, userfeedback
X-KDE-Keywords[ca]=kaddressbook, configura, arranjament, comentaris de l'usuari
X-KDE-Keywords[ca@valencia]=kaddressbook, configura, arranjament, comentaris de l'usuari
X-KDE-Keywords[cs]=kaddressbook, nastavit, nastavení, zpětnávazba
X-KDE-Keywords[de]=KAddressbook,Konfigurieren,Einstellungen,feedback
X-KDE-Keywords[en_GB]=kaddressbook, configure, settings, userfeedback
X-KDE-Keywords[es]=kaddressbook, configurar, preferencias, comentarios del usuario
......
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