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 · 92aec503f5
parent fd5b4e53ec
commit 92aec503f5
2 changed files with 2 additions and 0 deletions
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -14,6 +14,7 @@ Name[ko]=Latte 컨테이너
 Name[nl]=Latte-container
 Name[pl]=Pojemnik Latte
 Name[pt]=Contentor do Latte
+Name[pt_BR]=Contêiner do Latte
 Name[sl]=Latte zadrževalnik
 Name[sv]=Latte-omgivning
 Name[uk]=контейнер Латте
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -14,6 +14,7 @@ Name[ko]=Latte 컨테이너
 Name[nl]=Latte-container
 Name[pl]=Pojemnik Latte
 Name[pt]=Contentor do Latte
+Name[pt_BR]=Contêiner do Latte
 Name[sl]=Latte zadrževalnik
 Name[sv]=Latte-omgivning
 Name[uk]=контейнер Латте