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"
5 years ago · 22e7a1aa3d
parent 4227a7bccb
commit 22e7a1aa3d
2 changed files with 2 additions and 2 deletions
--- a/desktop/konsolepart.desktop
+++ b/desktop/konsolepart.desktop
@ -89,7 +89,7 @@ Name[sr@ijekavian]=Емулатор терминала
 Name[sr@ijekavianlatin]=Emulator terminala
 Name[sr@latin]=Emulator terminala
 Name[sv]=Terminalemulator
-Name[ta]=கடைசி போட்டியாளர்
+Name[ta]=முனையக் கருவி
 Name[te]=టెర్మినల్ ఎములేటర్
 Name[tg]=Тақлидгари терминал
 Name[th]=โปรแกรมจำลองเทอร์มินัล
--- a/desktop/terminalemulator.desktop
+++ b/desktop/terminalemulator.desktop
@ -80,7 +80,7 @@ Name[sr@ijekavian]=Емулатор терминала
 Name[sr@ijekavianlatin]=Emulator terminala
 Name[sr@latin]=Emulator terminala
 Name[sv]=Terminalemulator
-Name[ta]=கடைசி போட்டியாளர்
+Name[ta]=முனையக் கருவி
 Name[te]=టెర్మినల్ ఎములేటర్
 Name[tg]=Тақлидгари терминал
 Name[th]=โปรแกรมจำลองเทอร์มินัล