Commit 6504533f 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 8f88d2f1
[Desktop Entry]
......@@ -29,6 +30,7 @@ Name[x-test]=xxNextcloudxx
Comment=Use Nextcloud with KAccounts
Comment[az]=Nextcloud'u KAccounts ilə istifadə etmək
Comment[ca]=Usa Nextcloud amb KAccounts
Comment[ca@valencia]=Usa Nextcloud amb KAccounts
Comment[cs]=Použít NextCloud s KAccounts
[Desktop Entry]
Name=OwnCloud KAccounts QML plugin
Name[az]=OwnCloud KAccounts QML qoşması
Name[ca]=Connector OwnCloud en QML per a KAccounts
Name[ca@valencia]=Connector OwnCloud en QML per a KAccounts
Name[cs]=QML modul KAccounts pro OwnCloud
......@@ -38,6 +39,7 @@ Name[x-test]=xxOwnCloud KAccounts QML pluginxx
Name[zh_CN]=OwnCloud KAccounts QML 插件
Name[zh_TW]=OwnCloud KAccounts QML 外掛程式
Comment=Use OwnCloud with KAccounts
Comment[az]=OwnCloud'u KAccounts ilə istifadə etmək
Comment[ca]=Usa OwnCloud amb KAccounts
Comment[ca@valencia]=Usa OwnCloud amb KAccounts
Comment[cs]=Použít ownCloud s 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