Commit 22e7a1aa authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 4227a7bc
......@@ -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]=โปรแกรมจำลองเทอร์มินัล
......
......@@ -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]=โปรแกรมจำลองเทอร์มินัล
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment