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 · 8202d420f5
parent ff2d6245f9
commit 8202d420f5
2 changed files with 2 additions and 1 deletions
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@ -3,6 +3,7 @@ Name=Latte Layouts
 Name[ca]=Disposicions del Latte
 Name[ca@valencia]=Disposicions del Latte
 Name[de]=Latte-Profile
+Name[it]=Disposizioni di Latte
 Name[nl]=Latte-indelingen
 Name[pl]=Układy Latte
 Name[pt]=Disposições do Latte
--- 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