summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gio/ChangeLog10
-rw-r--r--gio/gfile.c7
-rw-r--r--gio/ginputstream.c8
-rw-r--r--gio/glocalfile.c30
-rw-r--r--gio/gmount.c17
-rw-r--r--gio/goutputstream.c8
6 files changed, 46 insertions, 34 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog
index 90c29e8d7..257e45ebd 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,6 +1,16 @@
2008-02-25 Wouter Bolsterlee <wbolster@svn.gnome.org>
* gfile.c (g_file_find_enclosing_mount):
+ * ginputstream.c (g_input_stream_set_pending):
+ * glocalfile.c (g_local_file_find_enclosing_mount):
+ * gmount.c (g_mount_unmount), (g_mount_eject), (g_mount_remount):
+ * goutputstream.c (g_output_stream_set_pending):
+
+ Fixup translator comments (#518578).
+
+2008-02-25 Wouter Bolsterlee <wbolster@svn.gnome.org>
+
+ * gfile.c (g_file_find_enclosing_mount):
* giomodule.c:
* glocalfile.c (g_local_file_find_enclosing_mount):
* goutputstream.c:
diff --git a/gio/gfile.c b/gio/gfile.c
index 95c0a422f..be387bd84 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -1256,10 +1256,9 @@ g_file_find_enclosing_mount (GFile *file,
if (iface->find_enclosing_mount == NULL)
{
- /* Translators: This is an error message when trying to find the
- enclosing (user visible) mount of a file, but none exists. */
- g_set_error (error, G_IO_ERROR,
- G_IO_ERROR_NOT_FOUND,
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+ /* Translators: This is an error message when trying to find the
+ * enclosing (user visible) mount of a file, but none exists. */
_("Containing mount does not exist"));
return NULL;
}
diff --git a/gio/ginputstream.c b/gio/ginputstream.c
index fd48f7a8e..ec8b71fb8 100644
--- a/gio/ginputstream.c
+++ b/gio/ginputstream.c
@@ -897,11 +897,11 @@ g_input_stream_set_pending (GInputStream *stream, GError **error)
if (stream->priv->pending)
{
- /* Translators: This is an error you get if there is already
- an operation running against this stream when you try to
- start one */
g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING,
- _("Stream has outstanding operation"));
+ /* Translators: This is an error you get if there is already an
+ * operation running against this stream when you try to start
+ * one */
+ _("Stream has outstanding operation"));
return FALSE;
}
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 394b832bd..ec15104d6 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -1031,22 +1031,22 @@ g_local_file_find_enclosing_mount (GFile *file,
if (g_lstat (local->filename, &buf) != 0)
{
- /* Translators: This is an error message when trying to find the
- enclosing (user visible) mount of a file, but none exists. */
- g_set_error (error, G_IO_ERROR,
- G_IO_ERROR_NOT_FOUND,
- _("Containing mount does not exist"));
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+ /* Translators: This is an error message when trying to
+ * find the enclosing (user visible) mount of a file, but
+ * none exists. */
+ _("Containing mount does not exist"));
return NULL;
}
mountpoint = find_mountpoint_for (local->filename, buf.st_dev);
if (mountpoint == NULL)
{
- /* Translators: This is an error message when trying to find the
- enclosing (user visible) mount of a file, but none exists. */
- g_set_error (error, G_IO_ERROR,
- G_IO_ERROR_NOT_FOUND,
- _("Containing mount does not exist"));
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+ /* Translators: This is an error message when trying to
+ * find the enclosing (user visible) mount of a file, but
+ * none exists. */
+ _("Containing mount does not exist"));
return NULL;
}
@@ -1055,11 +1055,11 @@ g_local_file_find_enclosing_mount (GFile *file,
if (mount)
return mount;
- /* Translators: This is an error message when trying to find the
- enclosing (user visible) mount of a file, but none exists. */
- g_set_error (error, G_IO_ERROR,
- G_IO_ERROR_NOT_FOUND,
- _("Containing mount does not exist"));
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+ /* Translators: This is an error message when trying to find
+ * the enclosing (user visible) mount of a file, but none
+ * exists. */
+ _("Containing mount does not exist"));
return NULL;
}
diff --git a/gio/gmount.c b/gio/gmount.c
index 7217f6737..f2bec5135 100644
--- a/gio/gmount.c
+++ b/gio/gmount.c
@@ -335,13 +335,14 @@ g_mount_unmount (GMount *mount,
if (iface->unmount == NULL)
{
- /* Translators: This is an error message for mount objects
- that don't implement unmount. */
g_simple_async_report_error_in_idle (G_OBJECT (mount),
callback, user_data,
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ /* Translators: This is an error
+ * message for mount objects that
+ * don't implement unmount. */
_("mount doesn't implement unmount"));
-
+
return;
}
@@ -409,11 +410,12 @@ g_mount_eject (GMount *mount,
if (iface->eject == NULL)
{
- /* Translators: This is an error message for mount objects
- that don't implement eject. */
g_simple_async_report_error_in_idle (G_OBJECT (mount),
callback, user_data,
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ /* Translators: This is an error
+ * message for mount objects that
+ * don't implement eject. */
_("mount doesn't implement eject"));
return;
@@ -490,11 +492,12 @@ g_mount_remount (GMount *mount,
if (iface->remount == NULL)
{
- /* Translators: This is an error message for mount objects
- that don't implement remount. */
g_simple_async_report_error_in_idle (G_OBJECT (mount),
callback, user_data,
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ /* Translators: This is an error
+ * message for mount objects that
+ * don't implement remount. */
_("mount doesn't implement remount"));
return;
diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index d9a672f4b..c302f2814 100644
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -1079,11 +1079,11 @@ g_output_stream_set_pending (GOutputStream *stream,
if (stream->priv->pending)
{
- /* Translators: This is an error you get if there is already
- an operation running against this stream when you try to
- start one */
g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING,
- _("Stream has outstanding operation"));
+ /* Translators: This is an error you get if there is
+ * already an operation running against this stream when
+ * you try to start one */
+ _("Stream has outstanding operation"));
return FALSE;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 00:02:39 +0000