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"
4 years ago · e6d3aa5935
parent 9d50cb8944
commit e6d3aa5935
2 changed files with 2 additions and 0 deletions
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -34,6 +34,7 @@ Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat per l'acoblador Latte
+Comment[cs]=Kontejner pro Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
 Comment[el]=Περιέκτης της εφαρμογής Latte
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -34,6 +34,7 @@ Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat per l'acoblador Latte
+Comment[cs]=Kontejner pro Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
 Comment[el]=Περιέκτης της εφαρμογής Latte