gvfs r1843 - in trunk: . daemon
- From: matthiasc svn gnome org
- To: svn-commits-list gnome org
- Subject: gvfs r1843 - in trunk: . daemon
- Date: Tue, 29 Jul 2008 02:24:37 +0000 (UTC)
Author: matthiasc
Date: Tue Jul 29 02:24:37 2008
New Revision: 1843
URL: http://svn.gnome.org/viewvc/gvfs?rev=1843&view=rev
Log:
2008-07-28 Matthias Clasen <mclasen redhat com>
Bug 518284 â need to add i18n on module branching
* daemon/gvfsbackendcdda.c:
* daemon/gvfsbackendgphoto2.c:
* daemon/gvfsbackendobexftp.c: Now is later.
Remove the I18N_LATER hack.
Modified:
trunk/ChangeLog
trunk/daemon/gvfsbackendcdda.c
trunk/daemon/gvfsbackendgphoto2.c
trunk/daemon/gvfsbackendobexftp.c
Modified: trunk/daemon/gvfsbackendcdda.c
==============================================================================
--- trunk/daemon/gvfsbackendcdda.c (original)
+++ trunk/daemon/gvfsbackendcdda.c Tue Jul 29 02:24:37 2008
@@ -47,9 +47,6 @@
#include "gvfsjobqueryinfo.h"
#include "gvfsjobenumerate.h"
-/* see this bug http://bugzilla.gnome.org/show_bug.cgi?id=518284 */
-#define _I18N_LATER(x) x
-
#define DO_NOT_WANT_PARANOIA_COMPATIBILITY
#include <cdio/paranoia.h>
@@ -221,7 +218,7 @@
{
release_device (cdda_backend);
dbus_error_free (&dbus_error);
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("Cannot connect to the system bus"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Cannot connect to the system bus"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
return;
@@ -231,7 +228,7 @@
if (cdda_backend->hal_ctx == NULL)
{
release_device (cdda_backend);
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("Cannot create libhal context"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Cannot create libhal context"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
return;
@@ -244,7 +241,7 @@
{
release_device (cdda_backend);
dbus_error_free (&dbus_error);
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("Cannot initialize libhal"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Cannot initialize libhal"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
return;
Modified: trunk/daemon/gvfsbackendgphoto2.c
==============================================================================
--- trunk/daemon/gvfsbackendgphoto2.c (original)
+++ trunk/daemon/gvfsbackendgphoto2.c Tue Jul 29 02:24:37 2008
@@ -72,9 +72,6 @@
#define DEBUG_NO_CACHING 1
#endif
-/* see this bug http://bugzilla.gnome.org/show_bug.cgi?id=518284 */
-#define _I18N_LATER(x) x
-
/*--------------------------------------------------------------------------------------------------------------*/
/* TODO:
@@ -501,26 +498,26 @@
case GP_ERROR_DIRECTORY_EXISTS:
/* Translator: %s represents a more specific error message and %d the specific error code */
error = g_error_new (G_IO_ERROR,
- G_IO_ERROR_EXISTS, _I18N_LATER("%s: %d: Directory or file exists"), message, rc);
+ G_IO_ERROR_EXISTS, _("%s: %d: Directory or file exists"), message, rc);
break;
case GP_ERROR_FILE_NOT_FOUND:
case GP_ERROR_DIRECTORY_NOT_FOUND:
/* Translator: %s represents a more specific error message and %d the specific error code */
error = g_error_new (G_IO_ERROR,
- G_IO_ERROR_NOT_FOUND, _I18N_LATER("%s: %d: No such file or directory"), message, rc);
+ G_IO_ERROR_NOT_FOUND, _("%s: %d: No such file or directory"), message, rc);
break;
case GP_ERROR_PATH_NOT_ABSOLUTE:
/* Translator: %s represents a more specific error message and %d the specific error code */
error = g_error_new (G_IO_ERROR,
- G_IO_ERROR_INVALID_FILENAME, _I18N_LATER("%s: %d: Invalid filename"), message, rc);
+ G_IO_ERROR_INVALID_FILENAME, _("%s: %d: Invalid filename"), message, rc);
break;
case GP_ERROR_NOT_SUPPORTED:
/* Translator: %s represents a more specific error message and %d the specific error code */
error = g_error_new (G_IO_ERROR,
- G_IO_ERROR_NOT_SUPPORTED, _I18N_LATER("%s: %d: Not Supported"), message, rc);
+ G_IO_ERROR_NOT_SUPPORTED, _("%s: %d: Not Supported"), message, rc);
break;
default:
@@ -1083,7 +1080,7 @@
{
*error = g_error_new (G_IO_ERROR,
G_IO_ERROR_NOT_FOUND,
- _I18N_LATER("No such file or directory"));
+ _("No such file or directory"));
}
goto out;
}
@@ -1310,7 +1307,7 @@
gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error listing folders to figure out ignore prefix"), rc);
+ error = get_error_from_gphoto2 (_("Error listing folders to figure out ignore prefix"), rc);
g_vfs_job_failed_from_error (job, error);
return FALSE;
}
@@ -1387,7 +1384,7 @@
{
release_device (gphoto2_backend);
dbus_error_free (&dbus_error);
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("Cannot connect to the system bus"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Cannot connect to the system bus"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
return;
@@ -1399,7 +1396,7 @@
if (gphoto2_backend->hal_ctx == NULL)
{
release_device (gphoto2_backend);
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("Cannot create libhal context"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Cannot create libhal context"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
return;
@@ -1412,7 +1409,7 @@
{
release_device (gphoto2_backend);
dbus_error_free (&dbus_error);
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("Cannot initialize libhal"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Cannot initialize libhal"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
return;
@@ -1427,7 +1424,7 @@
DEBUG (" host='%s'", host);
if (host == NULL || strlen (host) < 3 || host[0] != '[' || host[strlen (host) - 1] != ']')
{
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("No device specified"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("No device specified"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1444,7 +1441,7 @@
gphoto2_backend->context = gp_context_new ();
if (gphoto2_backend->context == NULL)
{
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("Cannot create gphoto2 context"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Cannot create gphoto2 context"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1454,7 +1451,7 @@
rc = gp_camera_new (&(gphoto2_backend->camera));
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error creating camera"), rc);
+ error = get_error_from_gphoto2 (_("Error creating camera"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1467,7 +1464,7 @@
rc = gp_port_info_list_new (&il);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error creating port info list"), rc);
+ error = get_error_from_gphoto2 (_("Error creating port info list"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1477,7 +1474,7 @@
rc = gp_port_info_list_load (il);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error loading info list"), rc);
+ error = get_error_from_gphoto2 (_("Error loading info list"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1489,7 +1486,7 @@
n = gp_port_info_list_lookup_path (il, gphoto2_backend->gphoto2_port);
if (n == GP_ERROR_UNKNOWN_PORT)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error looking up port info from port info list"), rc);
+ error = get_error_from_gphoto2 (_("Error looking up port info from port info list"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1499,7 +1496,7 @@
rc = gp_port_info_list_get_info (il, n, &info);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error getting port info from port info list"), rc);
+ error = get_error_from_gphoto2 (_("Error getting port info from port info list"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1512,7 +1509,7 @@
rc = gp_camera_set_port_info (gphoto2_backend->camera, info);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error setting port info"), rc);
+ error = get_error_from_gphoto2 (_("Error setting port info"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1523,7 +1520,7 @@
rc = gp_camera_init (gphoto2_backend->camera, gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error initializing camera"), rc);
+ error = get_error_from_gphoto2 (_("Error initializing camera"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
release_device (gphoto2_backend);
@@ -1612,7 +1609,7 @@
DEBUG (" host=%s", host);
if (host == NULL)
{
- g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _I18N_LATER("No camera specified"));
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("No camera specified"));
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_error_free (error);
return TRUE;
@@ -1640,7 +1637,7 @@
if (num_open_files > 0)
{
error = g_error_new (G_IO_ERROR, G_IO_ERROR_BUSY,
- _I18N_LATER("File system is busy: %d open files"), num_open_files);
+ _("File system is busy: %d open files"), num_open_files);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
return;
}
@@ -1701,7 +1698,7 @@
rc = gp_file_new (&read_handle->file);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error creating file object"), rc);
+ error = get_error_from_gphoto2 (_("Error creating file object"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
free_read_handle (read_handle);
goto out;
@@ -1715,7 +1712,7 @@
gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error getting file"), rc);
+ error = get_error_from_gphoto2 (_("Error getting file"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
free_read_handle (read_handle);
goto out;
@@ -1724,7 +1721,7 @@
rc = gp_file_get_data_and_size (read_handle->file, &read_handle->data, &read_handle->size);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error getting data from file"), rc);
+ error = get_error_from_gphoto2 (_("Error getting data from file"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
free_read_handle (read_handle);
goto out;
@@ -1818,7 +1815,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_FAILED,
- _I18N_LATER("Error seeking in stream on camera %s"), gphoto2_backend->gphoto2_port);
+ _("Error seeking in stream on camera %s"), gphoto2_backend->gphoto2_port);
}
else
{
@@ -1957,13 +1954,13 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_DIRECTORY,
- _I18N_LATER("Not a directory"));
+ _("Not a directory"));
}
else
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_FOUND,
- _I18N_LATER("No such file or directory"));
+ _("No such file or directory"));
}
g_free (as_dir);
g_free (as_name);
@@ -1990,7 +1987,7 @@
gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error listing folders"), rc);
+ error = get_error_from_gphoto2 (_("Error listing folders"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_free (filename);
return;
@@ -2053,7 +2050,7 @@
gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error listing files in folder"), rc);
+ error = get_error_from_gphoto2 (_("Error listing files in folder"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
g_free (filename);
return;
@@ -2330,7 +2327,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Not supported"));
+ _("Not supported"));
goto out;
}
@@ -2342,7 +2339,7 @@
gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error creating directory"), rc);
+ error = get_error_from_gphoto2 (_("Error creating directory"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
goto out;
}
@@ -2538,7 +2535,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Not supported"));
+ _("Not supported"));
goto out;
}
@@ -2550,7 +2547,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_EXISTS,
- _I18N_LATER("Name already exists"));
+ _("Name already exists"));
goto out;
}
@@ -2561,7 +2558,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("New name too long"));
+ _("New name too long"));
goto out;
}
@@ -2571,7 +2568,7 @@
rc = do_dir_rename_in_same_dir (gphoto2_backend, dir, name, display_name);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error renaming dir"), rc);
+ error = get_error_from_gphoto2 (_("Error renaming dir"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
goto out;
}
@@ -2583,7 +2580,7 @@
rc = do_file_rename_in_same_dir (gphoto2_backend, dir, name, display_name, FALSE);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error renaming file"), rc);
+ error = get_error_from_gphoto2 (_("Error renaming file"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
goto out;
}
@@ -2633,7 +2630,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Not supported"));
+ _("Not supported"));
goto out;
}
@@ -2646,7 +2643,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_EMPTY,
- _I18N_LATER("Directory '%s' is not empty"), filename);
+ _("Directory '%s' is not empty"), filename);
goto out;
}
else
@@ -2657,7 +2654,7 @@
gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error deleting directory"), rc);
+ error = get_error_from_gphoto2 (_("Error deleting directory"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
goto out;
}
@@ -2672,7 +2669,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_FOUND,
- _I18N_LATER("No such file or directory"));
+ _("No such file or directory"));
goto out;
}
@@ -2682,7 +2679,7 @@
gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error deleting file"), rc);
+ error = get_error_from_gphoto2 (_("Error deleting file"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
goto out;
}
@@ -2724,7 +2721,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Not supported"));
+ _("Not supported"));
goto out;
}
@@ -2734,7 +2731,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_IS_DIRECTORY,
- _I18N_LATER("Can't write to directory"));
+ _("Can't write to directory"));
goto out;
}
@@ -2745,7 +2742,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_EXISTS,
- _I18N_LATER("File exists"));
+ _("File exists"));
goto out;
}
}
@@ -2781,7 +2778,7 @@
rc = gp_file_new (&file);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Cannot allocate new file to append to"), rc);
+ error = get_error_from_gphoto2 (_("Cannot allocate new file to append to"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
write_handle_free (handle);
goto out;
@@ -2795,7 +2792,7 @@
gphoto2_backend->context);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Cannot read file to append to"), rc);
+ error = get_error_from_gphoto2 (_("Cannot read file to append to"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
write_handle_free (handle);
gp_file_unref (file);
@@ -2805,7 +2802,7 @@
rc = gp_file_get_data_and_size (file, &data, &size);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Cannot get data of file to append to"), rc);
+ error = get_error_from_gphoto2 (_("Cannot get data of file to append to"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
write_handle_free (handle);
gp_file_unref (file);
@@ -2992,7 +2989,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_FAILED,
- _I18N_LATER("Error seeking in stream on camera %s"), gphoto2_backend->gphoto2_port);
+ _("Error seeking in stream on camera %s"), gphoto2_backend->gphoto2_port);
}
else
{
@@ -3091,7 +3088,7 @@
rc = commit_write_handle (gphoto2_backend, write_handle);
if (rc != 0)
{
- error = get_error_from_gphoto2 (_I18N_LATER("Error writing file"), rc);
+ error = get_error_from_gphoto2 (_("Error writing file"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
goto out;
}
@@ -3138,7 +3135,7 @@
DEBUG (" not supported (not same directory)");
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Not supported (not same directory)"));
+ _("Not supported (not same directory)"));
goto out;
}
@@ -3150,7 +3147,7 @@
DEBUG (" not supported (src is dir; dst is dir)");
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Not supported (src is dir, dst is dir)"));
+ _("Not supported (src is dir, dst is dir)"));
goto out;
}
else if (is_regular (gphoto2_backend, dst_dir, dst_name))
@@ -3158,7 +3155,7 @@
DEBUG (" not supported (src is dir; dst is existing file)");
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Not supported (src is dir, dst is existing file)"));
+ _("Not supported (src is dir, dst is existing file)"));
goto out;
}
mv_dir = TRUE;
@@ -3170,7 +3167,7 @@
DEBUG (" not supported (src is file; dst is dir)");
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Not supported (src is file, dst is dir)"));
+ _("Not supported (src is file, dst is dir)"));
goto out;
}
}
@@ -3182,7 +3179,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("New name too long"));
+ _("New name too long"));
goto out;
}
@@ -3193,7 +3190,7 @@
if (rc != 0)
{
DEBUG (" error renaming dir");
- error = get_error_from_gphoto2 (_I18N_LATER("Error renaming dir"), rc);
+ error = get_error_from_gphoto2 (_("Error renaming dir"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
goto out;
}
@@ -3205,7 +3202,7 @@
if (rc != 0)
{
DEBUG (" error renaming file");
- error = get_error_from_gphoto2 (_I18N_LATER("Error renaming file"), rc);
+ error = get_error_from_gphoto2 (_("Error renaming file"), rc);
g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
goto out;
}
Modified: trunk/daemon/gvfsbackendobexftp.c
==============================================================================
--- trunk/daemon/gvfsbackendobexftp.c (original)
+++ trunk/daemon/gvfsbackendobexftp.c Tue Jul 29 02:24:37 2008
@@ -63,8 +63,6 @@
#define CACHE_LIFESPAN 3
-#define _I18N_LATER(x) x
-
struct _GVfsBackendObexftp
{
GVfsBackend parent_instance;
@@ -698,7 +696,7 @@
g_vfs_job_failed (G_VFS_JOB (job),
G_IO_ERROR, G_IO_ERROR_BUSY,
- _I18N_LATER("Connection to the device lost"));
+ _("Connection to the device lost"));
return;
}
@@ -1193,7 +1191,7 @@
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
- _I18N_LATER("Device requires a software update"));
+ _("Device requires a software update"));
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]