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"
6 years ago · 3ed6f04ad2
parent d1a0835bee
commit 3ed6f04ad2
1 changed files with 1 additions and 1 deletions
--- a/klipper/klipperrc.desktop
+++ b/klipper/klipperrc.desktop
@ -145,7 +145,7 @@ Description[ja]=Gwenview を起動(&G)
 Description[kk]=&Gwenview-ді жегу
 Description[km]=បើកដំណើរការ Gwenview
 Description[kn]=ಗ್ವೆನ್ ವ್ಯೂ &ವನ್ನು ಪ್ರಕ್ಷೇಪಿಸು
-Description[ko]=Gwenview 실행(&V)
+Description[ko]=Gwenview 실행(&G)
 Description[ku]=Dest bi &Gwenview bike
 Description[lt]=Paleisti &Gwenview
 Description[lv]=Palaist &Gwenview