gvfs r1223 - in trunk: . daemon hal
- From: alexl svn gnome org
- To: svn-commits-list gnome org
- Subject: gvfs r1223 - in trunk: . daemon hal
- Date: Mon, 4 Feb 2008 10:54:47 +0000 (GMT)
Author: alexl
Date: Mon Feb 4 10:54:47 2008
New Revision: 1223
URL: http://svn.gnome.org/viewvc/gvfs?rev=1223&view=rev
Log:
2008-02-04 Alexander Larsson <alexl redhat com>
* daemon/gvfsbackendsftp.c:
* daemon/gvfsdaemonutils.c:
* hal/ghalvolume.c:
Cleanup i18n strings (#510192)
Modified:
trunk/ChangeLog
trunk/daemon/gvfsbackendsftp.c
trunk/daemon/gvfsdaemonutils.c
trunk/hal/ghalvolume.c
Modified: trunk/daemon/gvfsbackendsftp.c
==============================================================================
--- trunk/daemon/gvfsbackendsftp.c (original)
+++ trunk/daemon/gvfsbackendsftp.c Mon Feb 4 10:54:47 2008
@@ -1625,7 +1625,7 @@
if (reply_type != SSH_FXP_HANDLE)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -1687,7 +1687,7 @@
if (reply_type != SSH_FXP_DATA)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -1698,7 +1698,7 @@
NULL, NULL, NULL))
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -1756,7 +1756,7 @@
if (reply_type != SSH_FXP_ATTRS)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -1846,7 +1846,7 @@
result_from_status (job, reply, -1, -1);
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
/* On failure, don't remove tempfile, since we removed the new original file */
sftp_handle_free (handle);
@@ -1875,7 +1875,7 @@
res = error_from_status (job, reply, -1, -1, &error);
else
g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
if (res)
{
@@ -1923,7 +1923,7 @@
res = error_from_status (job, reply, -1, -1, &error);
else
g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
if (res)
{
@@ -2002,7 +2002,7 @@
res = error_from_status (job, reply, -1, -1, &error);
else
g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
if (res)
{
@@ -2113,7 +2113,7 @@
result_from_status (job, reply, -1, -1);
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
sftp_handle_free (handle);
}
@@ -2154,7 +2154,7 @@
if (reply_type != SSH_FXP_HANDLE)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -2206,7 +2206,7 @@
if (reply_type != SSH_FXP_HANDLE)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -2277,7 +2277,7 @@
if (error_from_status (job, reply, G_IO_ERROR_EXISTS, -1, &error))
/* Open should not return OK */
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
else if (error->code == G_IO_ERROR_EXISTS)
{
/* It was *probably* the EXCL flag failing. I wish we had
@@ -2297,7 +2297,7 @@
if (reply_type != SSH_FXP_HANDLE)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -2451,7 +2451,7 @@
if (error_from_status (job, reply, G_IO_ERROR_EXISTS, -1, &error))
/* Open should not return OK */
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
else if (error->code == G_IO_ERROR_EXISTS)
{
/* It was *probably* the EXCL flag failing. I wish we had
@@ -2477,7 +2477,7 @@
if (reply_type != SSH_FXP_HANDLE)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -2534,7 +2534,7 @@
}
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
}
static gboolean
@@ -2593,7 +2593,7 @@
if (reply_type != SSH_FXP_ATTRS)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -2875,7 +2875,7 @@
if (reply_type != SSH_FXP_HANDLE)
{
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
return;
}
@@ -3004,7 +3004,7 @@
error_from_status (job, reply, -1, -1, &data->stat_error);
else if (reply_type != SSH_FXP_ATTRS)
g_set_error (&data->stat_error, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
else
{
data->stat_info = g_file_info_new ();
@@ -3035,7 +3035,7 @@
error_from_status (job, reply, -1, -1, &data->lstat_error);
else if (reply_type != SSH_FXP_ATTRS)
g_set_error (&data->lstat_error, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
else
{
data->lstat_info = g_file_info_new ();
@@ -3134,7 +3134,7 @@
result_from_status (job, reply, G_IO_ERROR_NOT_SUPPORTED, -1);
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
}
static gboolean
@@ -3175,7 +3175,7 @@
result_from_status (job, reply, -1, -1);
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
}
static gboolean
@@ -3228,7 +3228,7 @@
result_from_status (job, reply, -1, -1);
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
}
static gboolean
@@ -3264,7 +3264,7 @@
result_from_status (job, reply, -1, -1);
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
}
static gboolean
@@ -3298,7 +3298,7 @@
result_from_status (job, reply, -1, -1);
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
}
static void
@@ -3313,7 +3313,7 @@
result_from_status (job, reply, G_IO_ERROR_NOT_EMPTY, -1);
else
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
}
static void
@@ -3332,7 +3332,7 @@
result_from_status (job, reply, -1, -1);
else if (reply_type != SSH_FXP_ATTRS)
g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Invalid reply recieved"));
+ _("Invalid reply received"));
else
{
info = g_file_info_new ();
Modified: trunk/daemon/gvfsdaemonutils.c
==============================================================================
--- trunk/daemon/gvfsdaemonutils.c (original)
+++ trunk/daemon/gvfsdaemonutils.c Mon Feb 4 10:54:47 2008
@@ -89,7 +89,7 @@
{
g_set_error (error, G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("No fd passing socket available"));
+ _("Internal Error (%s)"), "No fd passing socket available");
return FALSE;
}
Modified: trunk/hal/ghalvolume.c
==============================================================================
--- trunk/hal/ghalvolume.c (original)
+++ trunk/hal/ghalvolume.c Mon Feb 4 10:54:47 2008
@@ -245,6 +245,7 @@
if (strcmp (volume_fsusage, "crypto") == 0 && strcmp (volume_fstype, "crypto_LUKS") == 0)
{
size = format_size_for_display (volume_size);
+ /* Translators: %s is the size of the volume (e.g. 512 MB) */
name = g_strdup_printf (_("%s Encrypted Data"), size);
g_free (size);
}
@@ -267,6 +268,7 @@
else
{
size = format_size_for_display (volume_size);
+ /* Translators: %s is the size of the volume (e.g. 512 MB) */
name = g_strdup_printf (_("%s Media"), size);
g_free (size);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]