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"
3 years ago · eb95f2ef13
parent 25e05070bb
commit eb95f2ef13
2 changed files with 2 additions and 0 deletions
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -11,6 +11,7 @@ Name[fi]=Latte-säilö
 Name[fr]=Conteneur pour Latte
 Name[it]=Contenitore di Latte
 Name[ko]=Latte 컨테이너
+Name[lt]=Latte suvaržymas
 Name[nl]=Latte-container
 Name[pl]=Pojemnik Latte
 Name[pt]=Contentor do Latte
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -11,6 +11,7 @@ Name[fi]=Latte-säilö
 Name[fr]=Conteneur pour Latte
 Name[it]=Contenitore di Latte
 Name[ko]=Latte 컨테이너
+Name[lt]=Latte suvaržymas
 Name[nl]=Latte-container
 Name[pl]=Pojemnik Latte
 Name[pt]=Contentor do Latte