Make volume name display formats translatable.

2005-01-23  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkfilesystemwin32.c (gtk_file_system_win32_volume_get_display_name):
	Make volume name display formats translatable.

diff --git a/ChangeLog b/ChangeLog
index 4fb8bc9b8d9fa8bcce1e823c65acefd734e1b26c..cbb6e27fedc27192b3e5b48603738ba31825d731 100644 (file)
--- 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 4fb8bc9b8d9fa8bcce1e823c65acefd734e1b26c..cbb6e27fedc27192b3e5b48603738ba31825d731 100644 (file)
--- 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 4fb8bc9b8d9fa8bcce1e823c65acefd734e1b26c..cbb6e27fedc27192b3e5b48603738ba31825d731 100644 (file)
--- 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 4555299d91fa1b913221fe4fb901cfc92260b6ef..7821b4b21d265c94b3a60d59808b74f983d52135 100644 (file)
--- 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