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 · 1f191516ff
parent 217d07b605
commit 1f191516ff
2 changed files with 2 additions and 0 deletions
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -6,6 +6,7 @@ Name[ca]=Contenidor del Latte
 Name[ca@valencia]=Contenidor del Latte
 Name[es]=Contenedor de Latte
 Name[nl]=Latte-container
+Name[sl]=Latte zadrževalnik
 Name[sv]=Latte-omgivning
 Name[uk]=контейнер Латте
 Name[x-test]=xxLatte Containmentxx
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -6,6 +6,7 @@ Name[ca]=Contenidor del Latte
 Name[ca@valencia]=Contenidor del Latte
 Name[es]=Contenedor de Latte
 Name[nl]=Latte-container
+Name[sl]=Latte zadrževalnik
 Name[sv]=Latte-omgivning
 Name[uk]=контейнер Латте
 Name[x-test]=xxLatte Containmentxx