Commit 5a47d9b2 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 aa1c9382
......@@ -45,6 +45,7 @@ Comment[de]=OwnCloud mit KAccounts benutzen
Comment[el]=Χρήση OwnCloud με KAccounts
Comment[en_GB]=Use OwnCloud with KAccounts
Comment[es]=Usar OwnCloud con KAccounts
Comment[et]=OwnCloudi kasutamine KAccountsiga
Comment[eu]=Erabili OwnCloud KAccounts-ekin
Comment[fi]=Käytä Owncloudia KAccounts-ohjelmassa
Comment[fr]=Utiliser Owncloud avec KAccounts
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