diff --git a/ChangeLog b/ChangeLog index 4fb8bc9b8d..cbb6e27fed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ connected or not, so it's easier to just not try getting the volume name for them. See the bug report for discussion. + Make volume name display formats translatable. + Fix for #163702, from Ivan Wong: * gdk/win32/gdkprivate-win32.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4fb8bc9b8d..cbb6e27fed 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -16,6 +16,8 @@ connected or not, so it's easier to just not try getting the volume name for them. See the bug report for discussion. + Make volume name display formats translatable. + Fix for #163702, from Ivan Wong: * gdk/win32/gdkprivate-win32.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4fb8bc9b8d..cbb6e27fed 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -16,6 +16,8 @@ connected or not, so it's easier to just not try getting the volume name for them. See the bug report for discussion. + Make volume name display formats translatable. + Fix for #163702, from Ivan Wong: * gdk/win32/gdkprivate-win32.h diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index 4555299d91..7821b4b21d 100644 --- a/gtk/gtkfilesystemwin32.c +++ b/gtk/gtkfilesystemwin32.c @@ -608,7 +608,7 @@ gtk_file_system_win32_volume_get_display_name (GtkFileSystem *file_system, if (filename_is_drive_root (volume->drive) && volume->drive_type == DRIVE_REMOTE) - real_display_name = g_strdup (volume->drive); + real_display_name = g_strdup_printf (_("Network Drive (%s)"), volume->drive); else if ((filename_is_drive_root (volume->drive) && volume->drive[0] >= 'C') || volume->drive_type != DRIVE_REMOVABLE) { @@ -623,7 +623,7 @@ gtk_file_system_win32_volume_get_display_name (GtkFileSystem *file_system, wname[0]) { gchar *name = g_utf16_to_utf8 (wname, -1, NULL, NULL, NULL); - real_display_name = g_strconcat (name, " (", volume->drive, ")", NULL); + real_display_name = g_strdup_printf (_("%s (%s)"), name, volume->drive); g_free (name); } else