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"
2020-10-05 06:16:34 +02:00 · 2020-10-05 06:16:34 +02:00 · 1f6e615ec0
commit 1f6e615ec0
parent 715f0dbbcc
1 changed files with 1 additions and 1 deletions
--- a/effects/thumbnailaside/thumbnailaside_config.desktop
+++ b/effects/thumbnailaside/thumbnailaside_config.desktop
@ -43,7 +43,7 @@ Name[ja]=サムネイルをわきに表示
 Name[kk]=Нобайды шеттеу
 Name[km]=រូបភាពតូចនៅខាង
 Name[kn]=ಸೂಚ್ಯಚಿತ್ರ ಬದಿಯಲ್ಲಿ
-Name[ko]=미리 보기 그림
+Name[ko]=옆쪽에 축소판
 Name[lt]=Miniatiūra šone
 Name[lv]=Sīktēli malā
 Name[mai]=लघुछवि बाजू मे