Commit a628db7a 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 619bd90e
......@@ -15,6 +15,7 @@ Name[fi]=Nextcloud
......@@ -45,6 +46,7 @@ Comment[fi]=Käytä Nextcloudia KAccountsissa
Comment[fr]=Utiliser Nextcloud avec KAccounts
Comment[gl]=Usar Nextcloud con KAccounts
Comment[hi]=KAccounts के साथ Nextcloud प्रयोग करें
Comment[ia]=Usa NextCloud con KAccounts
Comment[it]=Usa Nextcloud con KAccounts
Comment[ko]=KAccounts에서 Nextcloud 사용하기
Comment[lt]=Naudoti Nextcoud su KAccounts
......@@ -55,6 +55,7 @@ Comment[fr]=Utiliser Owncloud avec KAccounts
Comment[gl]=Usar OwnCloud con KAccounts.
Comment[hi]=KAccounts के साथOwnCloud प्रयोग करें
Comment[hu]=OwnCloud használata a KAccountson keresztül
Comment[ia]=Usa OwnCloud con KAccounts
Comment[it]=Usa OwnCloud con KAccounts
Comment[ko]=KAccounts에서 OwnCloud 사용하기
Comment[lt]=Naudoti OwnCloud su 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