Commit f56a0fe1 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 366ea669
......@@ -70,6 +70,7 @@ X-KDE-Keywords[de]=accounts, online, zugang
X-KDE-Keywords[el]=λογαριασμοί, διαδικτυακοί
X-KDE-Keywords[en_GB]=accounts, online
X-KDE-Keywords[es]=cuentas, en línea
X-KDE-Keywords[fi]=tilit, verkko
X-KDE-Keywords[fr]=comptes, en ligne
X-KDE-Keywords[gl]=contas, internet
X-KDE-Keywords[it]=account, online
......
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