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"
7 years ago · 1b93cbaa8c
parent dadba11572
commit 1b93cbaa8c
2 changed files with 2 additions and 2 deletions
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@ -41,7 +41,7 @@ GenericName[de]=Dock
 GenericName[el]=Πίνακας
 GenericName[en_GB]=Dock
 GenericName[es]=Dock
-GenericName[it]=Aggancia
+GenericName[it]=Aggancio
 GenericName[nl]=Dock
 GenericName[pl]=Dok
 GenericName[pt]=Área Acoplável
--- a/shell/package/contents/controls/latte-separator.desktop
+++ b/shell/package/contents/controls/latte-separator.desktop
@ -41,7 +41,7 @@ GenericName[de]=Dock
 GenericName[el]=Πίνακας
 GenericName[en_GB]=Dock
 GenericName[es]=Dock
-GenericName[it]=Aggancia
+GenericName[it]=Aggancio
 GenericName[nl]=Dock
 GenericName[pl]=Dok
 GenericName[pt]=Área Acoplável