Commit d518d055 authored by Script Kiddy's avatar Script Kiddy

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 899ccc41
......@@ -84,7 +84,7 @@ Name[tr]=Hazırlama tamamlandı
Name[uk]=Обробку завершено
Name[x-test]=xxRendering finishedxx
Name[zh_CN]=渲染结束
Name[zh_TW]=已完成
Name[zh_TW]=已完成
Comment=Rendering is over
Comment[ar]=قد انتهى التّصيير
Comment[bs]=Iscrtavanje je gotovo
......@@ -124,7 +124,7 @@ Comment[tr]=Hazırlama bitti
Comment[uk]=Виконання обробки завершено
Comment[x-test]=xxRendering is overxx
Comment[zh_CN]=渲染结束
Comment[zh_TW]=出已結束
Comment[zh_TW]=出已結束
Action=Popup
[Event/RenderStarted]
......@@ -167,7 +167,7 @@ Name[tr]=Hazırlama başladı
Name[uk]=Обробку розпочато
Name[x-test]=xxRendering startedxx
Name[zh_CN]=渲染开始
Name[zh_TW]=出已開始
Name[zh_TW]=出已開始
Comment=Rendering was started
Comment[ar]=قد بدأ التّصيير
Comment[bs]=Iscrtavanje je započelo
......@@ -207,7 +207,7 @@ Comment[tr]=Hazırlama başlatıldı
Comment[uk]=Було розпочато обробку
Comment[x-test]=xxRendering was startedxx
Comment[zh_CN]=渲染开始
Comment[zh_TW]=出已開始
Comment[zh_TW]=出已開始
Action=Popup
[Event/FrameCaptured]
......
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