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"
7 years ago · f75e1d18a9
parent fc0c4a378c
commit f75e1d18a9
2 changed files with 2 additions and 0 deletions
--- a/lookandfeel/metadata.desktop
+++ b/lookandfeel/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
+Comment[ca@valencia]=Brisa pel VDG del KDE
 Comment[es]=Brisa por KDE VDG
 Comment[gl]=Breeze de KDE VDG
 Comment[id]=Breeze oleh KDE VDG
--- a/sddm-theme/metadata.desktop
+++ b/sddm-theme/metadata.desktop
@ -45,6 +45,7 @@ Name[zh_CN]=微风
 Name[zh_TW]=微風
 Description=Breeze
 Description[ca]=Brisa
+Description[ca@valencia]=Brisa
 Description[es]=Brisa
 Description[gl]=Breeze
 Description[id]=Breeze