Merge branch 'gtkapp-opening-str' into 'master'

Use commas to differentiate between text and filename

See merge request GNOME/gtk!1013
This commit is contained in:
Matthias Clasen 2019-07-24 13:51:22 +00:00
commit 717c55c9aa

View File

@ -289,7 +289,7 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
files_count = g_list_length (files); files_count = g_list_length (files);
if (files_count == 0) if (files_count == 0)
{ {
description = g_strdup_printf (_("Starting %s"), g_app_info_get_name (info)); description = g_strdup_printf (_("Starting %s"), g_app_info_get_name (info));
} }
else if (files_count == 1) else if (files_count == 1)
{ {
@ -302,7 +302,7 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
0, NULL, NULL); 0, NULL, NULL);
display_name = get_display_name (files->data, fileinfo); display_name = get_display_name (files->data, fileinfo);
description = g_strdup_printf (_("Opening %s"), display_name); description = g_strdup_printf (_("Opening %s"), display_name);
g_free (display_name); g_free (display_name);
} }
else else