Merge branch 'master' into python-renderer

This commit is contained in:
2020-02-10 23:06:40 +01:00
27 changed files with 1092 additions and 635 deletions

View File

@@ -551,7 +551,7 @@ static void on_convert_clicked(gpointer button, gpointer user)
g_signal_connect(render_engine, "async-finished", G_CALLBACK(async_rendering_finished_callback),
self);
activity_bar_set_busy(self->activity_status_bar, "Rendering cell...");
activity_bar_set_busy(self->activity_status_bar, _("Rendering cell..."));
g_signal_connect(render_engine, "progress-changed",
G_CALLBACK(async_rendering_status_update_callback), self);