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"
3 years ago · 30fce4b6b9
parent e026957be5
commit 30fce4b6b9
1 changed files with 1 additions and 1 deletions
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@ -70,7 +70,7 @@ Comment[zh_TW]=給大眾使用的 Dock
 GenericName=Dock
 GenericName[az]=Dok
 GenericName[ca]=Acobla
-GenericName[ca@valencia]=Acobla
+GenericName[ca@valencia]=Acopla
 GenericName[cs]=Dok
 GenericName[da]=Dok
 GenericName[de]=Dock