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"
10 years ago · f868d0f78e
parent 2c485bb3a6
commit f868d0f78e
1 changed files with 1 additions and 0 deletions
--- a/src/data/kmail_config_plugins.desktop
+++ b/src/data/kmail_config_plugins.desktop
@ -86,6 +86,7 @@ Name[zh_TW]=外掛程式
 Comment=Settings Plugins
 Comment[ca]=Arranjament dels connectors
 Comment[ca@valencia]=Arranjament dels connectors
+Comment[de]=Einstellungsmodul
 Comment[en_GB]=Settings Plugins
 Comment[es]=Preferencias de complementos
 Comment[et]=Seadistusplugin