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"
5 years ago · ad4fba5243
parent e67298b021
commit ad4fba5243
2 changed files with 2 additions and 0 deletions
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -39,6 +39,7 @@ Comment[en_GB]=Containment provided for the Latte Dock
 Comment[es]=Contención proporcionada para Latte Dock
 Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
 Comment[fi]=Latte-telakalla tarjottu sisällytys
+Comment[fr]=Confinement fourni par le panneau « Latte »
 Comment[gl]=Contedor fornecido para a doca Latte.
 Comment[id]=Kontainmen disediakan untuk Dock Latte
 Comment[it]=Contenitore fornito per Latte Dock
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -39,6 +39,7 @@ Comment[en_GB]=Containment provided for the Latte Dock
 Comment[es]=Contención proporcionada para Latte Dock
 Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
 Comment[fi]=Latte-telakalla tarjottu sisällytys
+Comment[fr]=Confinement fourni par le panneau « Latte »
 Comment[gl]=Contedor fornecido para a doca Latte.
 Comment[id]=Kontainmen disediakan untuk Dock Latte
 Comment[it]=Contenitore fornito per Latte Dock