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"
4 years ago · 6095b4bf83
parent c139c299f4
commit 6095b4bf83
2 changed files with 2 additions and 2 deletions
--- a/desktop/konsolepart.desktop
+++ b/desktop/konsolepart.desktop
@ -93,7 +93,7 @@ Name[ta]=முனைய செயலி
 Name[te]=టెర్మినల్ ఎములేటర్
 Name[tg]=Тақлидгари терминал
 Name[th]=โปรแกรมจำลองเทอร์มินัล
-Name[tr]=Uçbirim Öykünücüsü
+Name[tr]=Uçbirim Öykünücü
 Name[ug]=تېرمىنال تەقلىدلەشتۈرگۈچ
 Name[uk]=Емулятор термінала
 Name[uz]=Terminal emulyatori
--- a/desktop/terminalemulator.desktop
+++ b/desktop/terminalemulator.desktop
@ -84,7 +84,7 @@ Name[ta]=முனைய செயலி
 Name[te]=టెర్మినల్ ఎములేటర్
 Name[tg]=Тақлидгари терминал
 Name[th]=โปรแกรมจำลองเทอร์มินัล
-Name[tr]=Uçbirim Öykünücüsü
+Name[tr]=Uçbirim Öykünücü
 Name[ug]=تېرمىنال تەقلىدلەشتۈرگۈچ
 Name[uk]=Емулятор термінала
 Name[uz]=Terminal emulyatori