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 · 6b7c558cff
parent da50ca7147
commit 6b7c558cff
2 changed files with 2 additions and 0 deletions
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -16,6 +16,7 @@ Name[sl]=Latte zadrževalnik
 Name[sv]=Latte-omgivning
 Name[uk]=контейнер Латте
 Name[x-test]=xxLatte Containmentxx
+Name[zh_CN]=Latte 容器
 Comment=Containment provided for the Latte Dock
 Comment[az]=Latte Dok paneli üçün təmin edilən qoruma
 Comment[ca]=Contenidor proporcionat per l'acoblador Latte
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -16,6 +16,7 @@ Name[sl]=Latte zadrževalnik
 Name[sv]=Latte-omgivning
 Name[uk]=контейнер Латте
 Name[x-test]=xxLatte Containmentxx
+Name[zh_CN]=Latte 容器
 Comment=Containment provided for the Latte Dock
 Comment[az]=Latte Dok paneli üçün təmin edilən qoruma
 Comment[ca]=Contenidor proporcionat per l'acoblador Latte