[maemo-commits] [maemo-commits] r8239 - in projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge: . daemon debian libgnomevfs modules po
From: martyn at stage.maemo.org martyn at stage.maemo.orgDate: Tue Nov 21 18:04:30 EET 2006
- Previous message: [maemo-commits] r8238 - projects/haf/trunk/gazpacho-hildon/resources
- Next message: [maemo-commits] r8240 - projects/haf/trunk/maemo-theme-default
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: martyn Date: 2006-11-21 18:04:24 +0200 (Tue, 21 Nov 2006) New Revision: 8239 Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/ChangeLog projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/NEWS projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/configure.in projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/daemon/daemon-connection.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/daemon/vfs-daemon.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-daemon-method.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-dbus-utils.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-mime-handlers.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-module-callback-marshall.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-module-callback.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-monitor.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-volume-monitor-client.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-xfer.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/caseless-file-method.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/dns-sd-method.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/file-method.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/http-neon-method.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-kernel.h projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-path.h projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/sftp-method.c projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/ChangeLog projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/LINGUAS projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/ar.po projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/he.po projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/pl.po Log: Merged changes from GnomeVFS 2.16.1 --> 2.16.3. Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/ChangeLog =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/ChangeLog 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/ChangeLog 2006-11-21 16:04:24 UTC (rev 8239) @@ -1,5 +1,145 @@ +2006-11-20 Alexander Larsson <alexl at redhat.com> + + * NEWS: + Update for release + +2006-11-20 Daniel Drake <dsd at gentoo.org> + + * modules/http-neon-method.c: + Support HTTP redirects in do_create + Fixes #372603 + +2006-11-19 Vincent Untz <vincent at vuntz.net> + + * libgnomevfs/gnome-vfs-mime-handlers.c: + (gnome_vfs_mime_application_copy): + (gnome_vfs_mime_application_launch_with_e): + (gnome_vfs_mime_application_new_from_desk): respect Path key in + desktop files to launch the application from the specified directory + Fix bug #375427 + Based on patch by Brian Harring + +2006-11-10 Alexander Larsson <alexl at redhat.com> + + * daemon/daemon-connection.c: + * libgnomevfs/gnome-vfs-daemon-method.c: + * libgnomevfs/gnome-vfs-module-callback-marshall.c: + Don't use deprecated dbus_message_iter_get_array_len function. + +2006-11-07 Alexander Larsson <alexl at redhat.com> + + * libgnomevfs/gnome-vfs-module-callback.c (stack_table_destroy): + Protect against reordering of atexit handlers and thread exit + handlers. Don't know if this is possible, but could be the cause + of bug #359655. + +2006-11-07 Christian Kellner <gicmo at gnome.org> + + * configure.in: + Post-release version bump + +=== gnome-vfs 2.16.2 === + +2006-11-07 Christian Kellner <gicmo at gnome.org> + + * NEWS: + Update for release + +2006-11-06 Alexander Larsson <alexl at redhat.com> + + * libgnomevfs/gnome-vfs-xfer.c: (copy_items): + Don't always cancel on EFILEEXISTS unless we're trying to + generate unique filenames. This fixes a silent abort + when copying "file.txt" and "FILE.TXT" to a case insensitive + filesystem (like FAT). (#144726) + +2006-11-06 Alexander Larsson <alexl at redhat.com> + + * daemon/vfs-daemon.c (main): + Call setlocale() in daemon to get translations. (#359875) + Patch from Martin Pitt + +2006-11-02 Alexander Larsson <alexl at redhat.com> + + * libgnomevfs/gnome-vfs-monitor.c: + Avoid ending up in a loop via timeouts spending 100% cpu if + a monitor is cancelled when there are outstanding callbacks. + Fixes #357704 + +2006-11-02 Alexander Larsson <alexl at redhat.com> + + * daemon/daemon-connection.c (connection_handle_close): + Allow operations on file handles that were created in another + DaemonConnection. This can happen if another thread in the client + than the one that called open does an operation. + + This fixes (amongs other things) the random failure of displaying + workgroups and computers when browsing smb. + +2006-11-02 Alexander Larsson <alexl at redhat.com> + + * daemon/vfs-daemon.c: + Allow --replace argument to gnome-vfs-daemon to replace the + current daemon. Useful for debugging. + +2006-11-02 Alexander Larsson <alexl at redhat.com> + + * libgnomevfs/gnome-vfs-job-queue.c: + Remove debug spew + +2006-11-02 Alexander Larsson <alexl at redhat.com> + + * libgnomevfs/gnome-vfs-daemon-method.c: + Handle error case where we don't get a reply. + +2006-10-30 Alexander Larsson <alexl at redhat.com> + + * modules/dns-sd-method.c: + Handle IPv6 addresses when creating dav uris. + Patch from Matthias Clasen + +2006-10-26 Alexander Larsson <alexl at redhat.com> + + * modules/sftp-method.c: + Support sun ssh version (#362535) + Patch from jedy.wang at sun.com + +2006-10-18 Alexander Larsson <alexl at redhat.com> + + * libgnomevfs/gnome-vfs-monitor.c: + Performance enhancements. We now avoid constantly going through + the pending lists as much as we can. + +2006-10-18 John McCutchan <john at johnmccutchan.com> + + * modules/inotify-kernel.c: Relicense: GPL->LGPL + * modules/inotify-kernel.h: Relicense: GPL->LGPL + * modules/inotify-path.h: Relicense: GPL->LGPL + +2006-10-17 Alexander Larsson <alexl at redhat.com> + + * libgnomevfs/gnome-vfs-dbus-utils.c: + Remove warning spew + + * libgnomevfs/gnome-vfs-volume-monitor-client.c: + Don't crash if there is no session dbus (#354823) + Patch from Frederic Crozat + +2006-10-17 Alexander Larsson <alexl at redhat.com> + + * modules/file-method.c (do_get_file_info): + Don't fail getting selinux context. This causes us + to return e.g. no-such-file on broken symlinks. + 2006-10-02 Alexander Larsson <alexl at redhat.com> + * configure.in: + Post-release version bump + +=== gnome-vfs 2.16.1 === + +2006-10-02 Alexander Larsson <alexl at redhat.com> + * NEWS: Update for release Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/NEWS =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/NEWS 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/NEWS 2006-11-21 16:04:24 UTC (rev 8239) @@ -1,3 +1,21 @@ +gnome-vfs 2.16.3 + * http: Fix crash on HTTP redirects + * Support Path key in desktop files + * Don't use deprecated dbus functions + * Fix possible crash on shutdown + +gnome-vfs 2.16.2 + * Add a "--replace" commandline argument to gnome-vfs-daemon + to replace the current daemon. (Mostly for debugging use) + * Make translations work in gnome-vfs-daemon + * Handle IPv6 addresses when creating dav uris (DNS-SD) + * Don't crash if there is no session dbus + * Support sun ssh server + * Don't fail getting selinux context + * Allow operations on file handles that were created in another + DaemonConnection. (This fixes e.g. smb browsing) + * Fixes to gnome_vfs_xfer and monitoring + gnome-vfs 2.16.1 * Fix some leaks * Upgrade to latest xdgmime version Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/configure.in =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/configure.in 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/configure.in 2006-11-21 16:04:24 UTC (rev 8239) @@ -9,8 +9,8 @@ # LIBGNOMEVFS_MAJOR_VERSION=2 LIBGNOMEVFS_MINOR_VERSION=16 -LIBGNOMEVFS_MICRO_VERSION=1 -LIBGNOMEVFS_INTERFACE_AGE=1 +LIBGNOMEVFS_MICRO_VERSION=3 +LIBGNOMEVFS_INTERFACE_AGE=3 # If you need a modifier for the version number. # Normally empty, but can be used to make "fixup" releases. LIBGNOMEVFS_EXTRAVERSION=0 Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/daemon/daemon-connection.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/daemon/daemon-connection.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/daemon/daemon-connection.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -47,12 +47,6 @@ GMainContext *main_context; GMainLoop *main_loop; - - /* ID for directory and file handles. */ - guint next_id; - - GHashTable *directory_handles; - GHashTable *file_handles; }; typedef struct { @@ -62,18 +56,28 @@ } CancellationHandle; typedef struct { + DaemonConnection *last_connection; GnomeVFSDirectoryHandle *vfs_handle; gint32 id; } DirectoryHandle; typedef struct { - GnomeVFSHandle *vfs_handle; - gint32 id; + DaemonConnection *last_connection; + GnomeVFSHandle *vfs_handle; + gint32 id; } FileHandle; static GStaticMutex cancellations_lock = G_STATIC_MUTEX_INIT; static GHashTable *cancellations; +static GStaticMutex directory_handles_lock = G_STATIC_MUTEX_INIT; +static GHashTable *directory_handles; +static guint next_directory_id = 1; + +static GStaticMutex file_handles_lock = G_STATIC_MUTEX_INIT; +static GHashTable *file_handles; +static guint next_file_id = 1; + static DaemonConnection * connection_new (DBusConnection *dbus_conn, gint32 conn_id); static void connection_destroy (DaemonConnection *conn); @@ -84,23 +88,23 @@ gint id); static void connection_remove_cancellation (DaemonConnection *conn, CancellationHandle *handle); -static DirectoryHandle * directory_handle_new (GnomeVFSDirectoryHandle *vfs_handle, +static DirectoryHandle * directory_handle_new (DaemonConnection *daemon_connection, + GnomeVFSDirectoryHandle *vfs_handle, gint32 handle_id); static void directory_handle_free (DirectoryHandle *handle); -static DirectoryHandle * connection_add_directory_handle (DaemonConnection *conn, +static DirectoryHandle * add_directory_handle (DaemonConnection *conn, GnomeVFSDirectoryHandle *vfs_handle); -static void connection_remove_directory_handle (DaemonConnection *conn, - DirectoryHandle *handle); -static DirectoryHandle * connection_get_directory_handle (DaemonConnection *conn, +static void remove_directory_handle (DirectoryHandle *handle); +static DirectoryHandle * get_directory_handle (DaemonConnection *conn, gint32 id); -static FileHandle * file_handle_new (GnomeVFSHandle *vfs_handle, +static FileHandle * file_handle_new (DaemonConnection *daemon_connection, + GnomeVFSHandle *vfs_handle, gint32 handle_id); static void file_handle_free (FileHandle *handle); -static FileHandle * connection_add_file_handle (DaemonConnection *conn, +static FileHandle * add_file_handle (DaemonConnection *conn, GnomeVFSHandle *vfs_handle); -static void connection_remove_file_handle (DaemonConnection *conn, - FileHandle *handle); -static FileHandle * connection_get_file_handle (DaemonConnection *conn, +static void remove_file_handle (FileHandle *handle); +static FileHandle * get_file_handle (DaemonConnection *conn, gint32 id); static void connection_reply_ok (DaemonConnection *conn, DBusMessage *message); @@ -147,19 +151,10 @@ conn->conn_id = conn_id; conn->conn = dbus_conn; - conn->next_id = 1; conn->main_context = g_main_context_new (); conn->main_loop = g_main_loop_new (conn->main_context, FALSE); - conn->directory_handles = g_hash_table_new_full ( - g_direct_hash, g_direct_equal, - NULL, (GDestroyNotify) directory_handle_free); - - conn->file_handles = g_hash_table_new_full ( - g_direct_hash, g_direct_equal, - NULL, (GDestroyNotify) file_handle_free); - if (!dbus_connection_register_object_path (dbus_conn, DVD_DAEMON_OBJECT, &connection_vtable, @@ -212,6 +207,28 @@ g_main_loop_quit (conn->main_loop); } +static gboolean +directory_handle_last_conn_is (gpointer key, + gpointer value, + gpointer user_data) +{ + DaemonConnection *conn = user_data; + DirectoryHandle *handle = value; + + return handle->last_connection == conn; +} + +static gboolean +file_handle_last_conn_is (gpointer key, + gpointer value, + gpointer user_data) +{ + DaemonConnection *conn = user_data; + FileHandle *handle = value; + + return handle->last_connection == conn; +} + static void connection_destroy (DaemonConnection *conn) { @@ -222,9 +239,22 @@ } dbus_connection_unref (conn->conn); - g_hash_table_destroy (conn->directory_handles); - g_hash_table_destroy (conn->file_handles); - + g_static_mutex_lock (&directory_handles_lock); + if (directory_handles) { + g_hash_table_foreach_remove (directory_handles, + directory_handle_last_conn_is, + conn); + } + g_static_mutex_unlock (&directory_handles_lock); + + g_static_mutex_lock (&file_handles_lock); + if (file_handles) { + g_hash_table_foreach_remove (file_handles, + file_handle_last_conn_is, + conn); + } + g_static_mutex_unlock (&file_handles_lock); + g_assert (!g_main_loop_is_running (conn->main_loop)); g_main_loop_unref (conn->main_loop); @@ -347,12 +377,14 @@ */ static DirectoryHandle * -directory_handle_new (GnomeVFSDirectoryHandle *vfs_handle, +directory_handle_new (DaemonConnection *daemon_connection, + GnomeVFSDirectoryHandle *vfs_handle, gint32 handle_id) { DirectoryHandle *handle; handle = g_new0 (DirectoryHandle, 1); + handle->last_connection = daemon_connection; handle->vfs_handle = vfs_handle; handle->id = handle_id; @@ -371,37 +403,52 @@ } static DirectoryHandle * -connection_add_directory_handle (DaemonConnection *conn, - GnomeVFSDirectoryHandle *vfs_handle) +add_directory_handle (DaemonConnection *conn, + GnomeVFSDirectoryHandle *vfs_handle) { DirectoryHandle *handle; - handle = directory_handle_new (vfs_handle, conn->next_id++); + g_static_mutex_lock (&directory_handles_lock); + handle = directory_handle_new (conn, vfs_handle, next_directory_id++); - g_hash_table_insert (conn->directory_handles, + if (directory_handles == NULL) { + directory_handles = g_hash_table_new_full (g_direct_hash, g_direct_equal, + NULL, (GDestroyNotify) directory_handle_free); + } + + g_hash_table_insert (directory_handles, GINT_TO_POINTER (handle->id), handle); + g_static_mutex_unlock (&directory_handles_lock); return handle; } static void -connection_remove_directory_handle (DaemonConnection *conn, - DirectoryHandle *handle) +remove_directory_handle (DirectoryHandle *handle) { - if (!g_hash_table_remove (conn->directory_handles, + g_static_mutex_lock (&directory_handles_lock); + if (!g_hash_table_remove (directory_handles, GINT_TO_POINTER (handle->id))) { g_warning ("Couldn't remove directory handle %d\n", handle->id); - return; } + g_static_mutex_unlock (&directory_handles_lock); } static DirectoryHandle * -connection_get_directory_handle (DaemonConnection *conn, - gint32 id) +get_directory_handle (DaemonConnection *conn, + gint32 id) { - return g_hash_table_lookup (conn->directory_handles, - GINT_TO_POINTER (id)); + DirectoryHandle *handle; + + g_static_mutex_lock (&directory_handles_lock); + handle = g_hash_table_lookup (directory_handles, + GINT_TO_POINTER (id)); + if (handle) { + handle->last_connection = conn; + } + g_static_mutex_unlock (&directory_handles_lock); + return handle; } /* @@ -409,12 +456,14 @@ */ static FileHandle * -file_handle_new (GnomeVFSHandle *vfs_handle, - gint32 handle_id) +file_handle_new (DaemonConnection *daemon_connection, + GnomeVFSHandle *vfs_handle, + gint32 handle_id) { FileHandle *handle; handle = g_new0 (FileHandle, 1); + handle->last_connection = daemon_connection; handle->vfs_handle = vfs_handle; handle->id = handle_id; @@ -433,39 +482,51 @@ } static FileHandle * -connection_add_file_handle (DaemonConnection *conn, - GnomeVFSHandle *vfs_handle) +add_file_handle (DaemonConnection *conn, + GnomeVFSHandle *vfs_handle) { FileHandle *handle; - handle = file_handle_new (vfs_handle, conn->next_id++); + g_static_mutex_lock (&file_handles_lock); + handle = file_handle_new (conn, vfs_handle, next_file_id++); - g_hash_table_insert (conn->file_handles, + if (file_handles == NULL) { + file_handles = g_hash_table_new_full (g_direct_hash, g_direct_equal, + NULL, (GDestroyNotify) file_handle_free); + } + + g_hash_table_insert (file_handles, GINT_TO_POINTER (handle->id), handle); + g_static_mutex_unlock (&file_handles_lock); return handle; } static void -connection_remove_file_handle (DaemonConnection *conn, - FileHandle *handle) +remove_file_handle (FileHandle *handle) { - if (!g_hash_table_remove (conn->file_handles, + g_static_mutex_lock (&file_handles_lock); + if (!g_hash_table_remove (file_handles, GINT_TO_POINTER (handle->id))) { g_warning ("Couldn't remove file handle %d\n", handle->id); - return; } + g_static_mutex_unlock (&file_handles_lock); } static FileHandle * -connection_get_file_handle (DaemonConnection *conn, - gint32 id) +get_file_handle (DaemonConnection *conn, + gint32 id) { FileHandle *handle; - handle = g_hash_table_lookup (conn->file_handles, + g_static_mutex_lock (&file_handles_lock); + handle = g_hash_table_lookup (file_handles, GINT_TO_POINTER (id)); - + if (handle) { + handle->last_connection = conn; + } + g_static_mutex_unlock (&file_handles_lock); + return handle; } @@ -618,7 +679,7 @@ return; } - handle = connection_add_file_handle (conn, vfs_handle); + handle = add_file_handle (conn, vfs_handle); connection_reply_id (conn, message, handle->id); } @@ -680,7 +741,7 @@ return; } - handle = connection_add_file_handle (conn, vfs_handle); + handle = add_file_handle (conn, vfs_handle); connection_reply_id (conn, message, handle->id); } @@ -707,7 +768,7 @@ d(g_print ("close: %d (%d)\n", handle_id, cancellation_id)); - handle = connection_get_file_handle (conn, handle_id); + handle = get_file_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -738,7 +799,7 @@ /* Clear the handle so we don't close it twice. */ handle->vfs_handle = NULL; - connection_remove_file_handle (conn, handle); + remove_file_handle (handle); connection_reply_ok (conn, message); } @@ -773,7 +834,7 @@ d(g_print ("read: %d, %llu, (%d)\n", handle_id, num_bytes, cancellation_id)); - handle = connection_get_file_handle (conn, handle_id); + handle = get_file_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -864,7 +925,7 @@ d(g_print ("write: %d, %d (%d)\n", handle_id, len, cancellation_id)); - handle = connection_get_file_handle (conn, handle_id); + handle = get_file_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -937,7 +998,7 @@ d(g_print ("seek: %d, %d, %llu\n", handle_id, whence, offset)); - handle = connection_get_file_handle (conn, handle_id); + handle = get_file_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -989,7 +1050,7 @@ d(g_print ("tell: %d\n", handle_id)); - handle = connection_get_file_handle (conn, handle_id); + handle = get_file_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -1043,7 +1104,7 @@ d(g_print ("truncate_handle: %d, %llu\n", handle_id, where)); - handle = connection_get_file_handle (conn, handle_id); + handle = get_file_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -1122,7 +1183,7 @@ return; } - handle = connection_add_directory_handle (conn, vfs_handle); + handle = add_directory_handle (conn, vfs_handle); connection_reply_id (conn, message, handle->id); } @@ -1148,7 +1209,7 @@ d(g_print ("close_directory: %d\n", handle_id)); - handle = connection_get_directory_handle (conn, handle_id); + handle = get_directory_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -1162,7 +1223,7 @@ if (result == GNOME_VFS_OK) { /* Clear the handle so we don't close it twice. */ handle->vfs_handle = NULL; - connection_remove_directory_handle (conn, handle); + remove_directory_handle (handle); } connection_reply_result (conn, message, result); @@ -1195,7 +1256,7 @@ d(g_print ("read_directory: %d (%d)\n", handle_id, cancellation_id)); - handle = connection_get_directory_handle (conn, handle_id); + handle = get_directory_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, @@ -1351,7 +1412,7 @@ d(g_print ("get_file_info_from_handle: %d (%d)\n", handle_id, cancellation_id)); - handle = connection_get_file_handle (conn, handle_id); + handle = get_file_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -1928,7 +1989,7 @@ d(g_print ("forget cache: %d, %lld, %llu, (%d)\n", handle_id, offset, size, cancellation_id)); - handle = connection_get_file_handle (conn, handle_id); + handle = get_file_handle (conn, handle_id); if (!handle) { connection_reply_result (conn, message, GNOME_VFS_ERROR_INTERNAL); @@ -2254,13 +2315,9 @@ ret_len = va_arg (args, gint *); dbus_message_iter_recurse (&iter, &array_iter); - if (dbus_message_iter_get_array_len (&array_iter) > 0) { - dbus_message_iter_get_fixed_array (&array_iter, - ret_data, - ret_len); - } else { - *ret_len = 0; - } + dbus_message_iter_get_fixed_array (&array_iter, + ret_data, + ret_len); break; } case DVD_TYPE_LAST: Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/daemon/vfs-daemon.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/daemon/vfs-daemon.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/daemon/vfs-daemon.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -23,6 +23,8 @@ #include <stdlib.h> #include <unistd.h> #include <errno.h> +#include <string.h> +#include <locale.h> #include <glib.h> #include <glib/gstdio.h> @@ -52,6 +54,8 @@ void *data); +static gboolean replace_daemon = FALSE; + static DBusObjectPathVTable daemon_vtable = { daemon_unregistered_func, daemon_message_func, @@ -83,6 +87,7 @@ static DBusConnection *conn = NULL; DBusError error; gint ret; + int flags; if (conn) { return conn; @@ -103,7 +108,11 @@ return NULL; } - ret = dbus_bus_request_name (conn, DVD_DAEMON_SERVICE, 0, &error); + flags = DBUS_NAME_FLAG_ALLOW_REPLACEMENT; + if (replace_daemon) { + flags |= DBUS_NAME_FLAG_REPLACE_EXISTING; + } + ret = dbus_bus_request_name (conn, DVD_DAEMON_SERVICE, flags, &error); if (dbus_error_is_set (&error)) { g_warning ("Failed to acquire vfs-daemon service: %s", error.message); dbus_error_free (&error); @@ -901,9 +910,20 @@ { GMainLoop *loop; GnomeVFSVolumeMonitor *monitor; + int i; d(g_print ("Starting daemon.\n")); + if (argc > 1) { + for (i = 1; i < argc; i++) { + if (strcmp (argv[i], "--replace") == 0) { + replace_daemon = TRUE; + } + } + } + + setlocale(LC_ALL, ""); + g_type_init (); gnome_vfs_set_is_daemon (GNOME_VFS_TYPE_VOLUME_MONITOR_DAEMON, Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog 2006-11-21 16:04:24 UTC (rev 8239) @@ -1,3 +1,10 @@ +osso-gnome-vfs2 (2.16.3-1osso1) unstable; urgency=low + + * UNRELEASED! + * Merged changes from GnomeVFS 2.16.1 --> 2.16.3. + + -- Martyn Russell <martyn at imendio.com> Fri, 24 Nov 2006 16:03:24 +0000 + osso-gnome-vfs2 (2.16.1-1osso1) unstable; urgency=low * Initial release of 2.16 version Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-daemon-method.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-daemon-method.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-daemon-method.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -972,9 +972,8 @@ } dbus_message_iter_recurse (&iter, &array_iter); - if (dbus_message_iter_get_array_len (&array_iter) > 0) { - dbus_message_iter_get_fixed_array (&array_iter, &data, &size); - + dbus_message_iter_get_fixed_array (&array_iter, &data, &size); + if (size > 0) { memcpy (buffer, data, size); } @@ -1780,6 +1779,10 @@ -1, NULL); dbus_message_unref (message); + + if (reply == NULL) { + return GNOME_VFS_ERROR_INTERNAL; + } if (check_if_reply_is_error (reply, &result)) { return result; @@ -1838,6 +1841,10 @@ dbus_message_unref (message); + if (reply == NULL) { + return GNOME_VFS_ERROR_INTERNAL; + } + if (check_if_reply_is_error (reply, &result)) { return result; } Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-dbus-utils.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-dbus-utils.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-dbus-utils.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -150,8 +150,8 @@ dbus_error_init (&error); main_dbus = dbus_bus_get (DBUS_BUS_SESSION, &error); if (dbus_error_is_set (&error)) { - g_warning ("Failed to open session DBUS connection: %s\n" - "Volume monitoring will not work.", error.message); + /*g_warning ("Failed to open session DBUS connection: %s\n" + "Volume monitoring will not work.", error.message);*/ dbus_error_free (&error); main_dbus = NULL; return NULL; Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-mime-handlers.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-mime-handlers.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-mime-handlers.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -50,6 +50,7 @@ char *icon; char *exec; char *binary_name; + char *path; gboolean supports_uris; gboolean startup_notification; char *startup_wm_class; @@ -759,6 +760,7 @@ result->priv->icon = g_strdup (application->priv->icon); result->priv->exec = g_strdup (application->priv->exec); result->priv->binary_name = g_strdup (application->priv->binary_name); + result->priv->path = g_strdup (application->priv->path); result->priv->supports_uris = application->priv->supports_uris; result->priv->startup_notification = application->priv->startup_notification; result->priv->startup_wm_class = g_strdup (application->priv->startup_wm_class); @@ -785,6 +787,7 @@ g_free (priv->icon); g_free (priv->exec); g_free (priv->binary_name); + g_free (priv->path); g_free (priv->startup_wm_class); } g_free (priv); @@ -1007,7 +1010,7 @@ } } - if (!g_spawn_async (NULL /* working directory */, + if (!g_spawn_async (app->priv->path, /* working directory */ argv, envp, G_SPAWN_SEARCH_PATH /* flags */, @@ -1417,6 +1420,9 @@ app->priv->binary_name = g_strdup (argv[0]); g_strfreev (argv); + app->priv->path = g_key_file_get_string (key_file, DESKTOP_ENTRY_GROUP, + "Path", NULL); + app->requires_terminal = g_key_file_get_boolean (key_file, DESKTOP_ENTRY_GROUP, "Terminal", &err); if (err) { Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-module-callback-marshall.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-module-callback-marshall.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-module-callback-marshall.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -645,8 +645,20 @@ if (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_ARRAY) { dbus_message_iter_recurse (iter, &array_iter); - question_in->choices = g_new (char *, dbus_message_iter_get_array_len (&array_iter) + 1); + cnt = 0; + while (dbus_message_iter_get_arg_type (&array_iter) == DBUS_TYPE_STRING) { + cnt++; + if (!dbus_message_iter_has_next (&array_iter)) { + break; + } + dbus_message_iter_next (&array_iter); + } + + question_in->choices = g_new (char *, cnt + 1); + + dbus_message_iter_recurse (iter, &array_iter); + cnt = 0; while (dbus_message_iter_get_arg_type (&array_iter) == DBUS_TYPE_STRING) { question_in->choices[cnt++] = utils_get_string_or_null (&array_iter, FALSE); Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-module-callback.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-module-callback.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-module-callback.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -411,11 +411,17 @@ stack_table = specific; g_static_mutex_lock (&callback_table_lock); - g_hash_table_remove (stack_tables_to_free, stack_table); + if (stack_tables_to_free != NULL) { + g_hash_table_remove (stack_tables_to_free, stack_table); + } else { + stack_table = NULL; + } g_static_mutex_unlock (&callback_table_lock); - clear_stack_table (stack_table); - g_hash_table_destroy (stack_table); + if (stack_table) { + clear_stack_table (stack_table); + g_hash_table_destroy (stack_table); + } } static gboolean @@ -440,6 +446,7 @@ g_static_mutex_lock (&callback_table_lock); g_hash_table_foreach_remove (stack_tables_to_free, stack_table_free_hr_func , NULL); g_hash_table_destroy (stack_tables_to_free); + stack_tables_to_free = NULL; g_static_mutex_unlock (&callback_table_lock); } Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-monitor.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-monitor.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-monitor.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -45,9 +45,11 @@ gpointer user_data; /* FIXME - how does this get freed */ gboolean cancelled; + gboolean in_dispatch; - GList *pending_callbacks; /* protected by handle_hash */ + GQueue *pending_callbacks; /* protected by handle_hash */ guint pending_timeout; /* protected by handle_hash */ + time_t min_send_at; }; struct GnomeVFSMonitorCallbackData { @@ -67,7 +69,7 @@ G_LOCK_DEFINE_STATIC (handle_hash); static gint actually_dispatch_callback (gpointer data); -static guint32 get_min_delay (GList *list, gint32 now); +static guint32 get_min_send_at (GQueue *queue); static void init_hash_table (void) @@ -107,6 +109,8 @@ monitor_handle->type = monitor_type; monitor_handle->callback = callback; monitor_handle->user_data = user_data; + monitor_handle->pending_callbacks = g_queue_new (); + monitor_handle->min_send_at = 0; result = uri->method->monitor_add (uri->method, &monitor_handle->method_handle, uri, monitor_type); @@ -135,7 +139,7 @@ GList *l; GnomeVFSMonitorCallbackData *callback_data; - l = monitor_handle->pending_callbacks; + l = monitor_handle->pending_callbacks->head; while (l != NULL) { callback_data = l->data; @@ -155,10 +159,11 @@ { gboolean res; - g_assert (no_live_callbacks (handle)); + if (handle->pending_timeout) + g_source_remove (handle->pending_timeout); - g_list_foreach (handle->pending_callbacks, (GFunc) free_callback_data, NULL); - g_list_free (handle->pending_callbacks); + g_queue_foreach (handle->pending_callbacks, (GFunc) free_callback_data, NULL); + g_queue_free (handle->pending_callbacks); handle->pending_callbacks = NULL; res = g_hash_table_remove (handle_hash, handle->method_handle); @@ -188,12 +193,15 @@ handle->method_handle); if (result == GNOME_VFS_OK) { + G_LOCK (handle_hash); /* mark this monitor as cancelled */ handle->cancelled = TRUE; - /* destroy the handle if there are no outstanding callbacks */ - G_LOCK (handle_hash); - if (no_live_callbacks (handle)) { + /* we might be in the unlocked part of actually_dispatch_callback, + * in that case, don't free the handle now. + * Instead we do it in actually_dispatch_callback. + */ + if (!handle->in_dispatch) { destroy_monitor_handle (handle); } G_UNLOCK (handle_hash); @@ -202,16 +210,17 @@ return result; } +/* Called with handle_hash lock held */ static void install_timeout (GnomeVFSMonitorHandle *monitor_handle, time_t now) { - guint32 delay; + gint delay; if (monitor_handle->pending_timeout) g_source_remove (monitor_handle->pending_timeout); - delay = get_min_delay (monitor_handle->pending_callbacks, now); - if (delay == 0) + delay = monitor_handle->min_send_at - now; + if (delay <= 0) monitor_handle->pending_timeout = g_idle_add (actually_dispatch_callback, monitor_handle); else monitor_handle->pending_timeout = g_timeout_add (delay * 1000, actually_dispatch_callback, monitor_handle); @@ -236,10 +245,14 @@ G_LOCK (handle_hash); + /* Mark this so that do_cancel doesn't free the handle while + * we run without the lock during dispatch */ + monitor_handle->in_dispatch = TRUE; + if (!monitor_handle->cancelled) { /* Find all callbacks that needs to be dispatched */ dispatch = NULL; - l = monitor_handle->pending_callbacks; + l = monitor_handle->pending_callbacks->head; while (l != NULL) { callback_data = l->data; @@ -283,7 +296,7 @@ G_LOCK (handle_hash); - l = monitor_handle->pending_callbacks; + l = monitor_handle->pending_callbacks->head; while (l != NULL) { callback_data = l->data; next = l->next; @@ -296,9 +309,7 @@ /* free the callback_data */ free_callback_data (callback_data); - monitor_handle->pending_callbacks = - g_list_delete_link (monitor_handle->pending_callbacks, - l); + g_queue_delete_link (monitor_handle->pending_callbacks, l); } l = next; @@ -306,17 +317,20 @@ } - if (no_live_callbacks (monitor_handle)) { - /* if we were waiting for this callback to be dispatched - * to free this monitor, then do it now. - */ - if (monitor_handle->cancelled) - destroy_monitor_handle (monitor_handle); - else - monitor_handle->pending_timeout = 0; - } else + monitor_handle->in_dispatch = FALSE; + + /* if we were waiting for this callback to be dispatched + * to free this monitor, then do it now. */ + if (monitor_handle->cancelled) { + destroy_monitor_handle (monitor_handle); + } else if (no_live_callbacks (monitor_handle)) { + monitor_handle->pending_timeout = 0; + monitor_handle->min_send_at = 0; + } else { /* pending callbacks left, install another timeout */ + monitor_handle->min_send_at = get_min_send_at (monitor_handle->pending_callbacks); install_timeout (monitor_handle, now); + } G_UNLOCK (handle_hash); @@ -331,8 +345,8 @@ { GList *l; GnomeVFSMonitorCallbackData *callback_data; - - l = monitor_handle->pending_callbacks; + + l = monitor_handle->pending_callbacks->head; while (l != NULL) { callback_data = l->data; if (callback_data->send_state != CALLBACK_STATE_SENT && @@ -345,13 +359,15 @@ /* Called with handle_hash lock held */ static guint32 -get_min_delay (GList *list, gint32 now) +get_min_send_at (GQueue *queue) { time_t min_send_at; GnomeVFSMonitorCallbackData *callback_data; - + GList *list; + min_send_at = G_MAXINT; + list = queue->head; while (list != NULL) { callback_data = list->data; @@ -362,14 +378,9 @@ list = list->next; } - if (min_send_at < now) { - return 0; - } else { - return min_send_at - now; - } + return min_send_at; } - /** * gnome_vfs_monitor_callback: * @method_handle: Method-specific monitor handle obtained through gnome_vfs_monitor_add(). @@ -416,13 +427,14 @@ uri = gnome_vfs_uri_to_string (info_uri, GNOME_VFS_URI_HIDE_NONE); last_data = NULL; - l = monitor_handle->pending_callbacks; + l = monitor_handle->pending_callbacks->tail; while (l != NULL) { other_data = l->data; if (strcmp (other_data->info_uri, uri) == 0) { last_data = l->data; + break; } - l = l->next; + l = l->prev; } if (last_data == NULL || @@ -444,10 +456,13 @@ } } - monitor_handle->pending_callbacks = - g_list_append(monitor_handle->pending_callbacks, callback_data); - - install_timeout (monitor_handle, now); + g_queue_push_tail (monitor_handle->pending_callbacks, + callback_data); + if (monitor_handle->min_send_at == 0 || + callback_data->send_at < monitor_handle->min_send_at) { + monitor_handle->min_send_at = callback_data->send_at; + install_timeout (monitor_handle, now); + } } g_free (uri); Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-volume-monitor-client.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -95,6 +95,10 @@ DBusMessageIter iter, array_iter; GnomeVFSDrive *drive; + if (dbus_conn == NULL) { + return NULL; + } + message = dbus_message_new_method_call (DVD_DAEMON_SERVICE, DVD_DAEMON_OBJECT, DVD_DAEMON_INTERFACE, @@ -148,6 +152,10 @@ DBusMessageIter iter, array_iter; GnomeVFSVolume *volume; + if (dbus_conn == NULL) { + return NULL; + } + message = dbus_message_new_method_call (DVD_DAEMON_SERVICE, DVD_DAEMON_OBJECT, DVD_DAEMON_INTERFACE, Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-xfer.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-xfer.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/libgnomevfs/gnome-vfs-xfer.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -1813,9 +1813,13 @@ result = GNOME_VFS_ERROR_INTERRUPTED; } - overwrite_mode_abort = GNOME_VFS_XFER_OVERWRITE_MODE_ABORT; + /* If we're creating unique names, always abort on overwrite and + * calculate a new name */ + overwrite_mode_abort = overwrite_mode; + if ((xfer_options & GNOME_VFS_XFER_USE_UNIQUE_NAMES) != 0) { + overwrite_mode_abort = GNOME_VFS_XFER_OVERWRITE_MODE_ABORT; + } - if (info->type == GNOME_VFS_FILE_TYPE_REGULAR) { result = copy_file (info, target_dir_info, source_uri, target_uri, @@ -1846,8 +1850,7 @@ break; } - if (overwrite_mode != GNOME_VFS_XFER_OVERWRITE_MODE_QUERY - || (xfer_options & GNOME_VFS_XFER_USE_UNIQUE_NAMES) == 0) { + if ((xfer_options & GNOME_VFS_XFER_USE_UNIQUE_NAMES) == 0) { gnome_vfs_uri_unref (target_uri); break; } Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/caseless-file-method.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/caseless-file-method.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/caseless-file-method.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -1367,11 +1367,7 @@ } if (options & GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT) { - result = get_selinux_context_from_handle (file_info, file_handle); - if (result != GNOME_VFS_OK) { - g_free (full_name); - return result; - } + get_selinux_context (file_info, full_name, options); } if (options & GNOME_VFS_FILE_INFO_GET_MIME_TYPE) { Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/dns-sd-method.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/dns-sd-method.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/dns-sd-method.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -635,10 +635,17 @@ } - link_uri = g_strdup_printf ("%s://%s%s:%d%s", - dns_sd_types[i].method, - user_and_pwd?user_and_pwd:"", - host, port, path); + if (strchr (host, ':')) + /* must be an ipv6 address, follow rfc2732 */ + link_uri = g_strdup_printf ("%s://%s[%s]:%d%s", + dns_sd_types[i].method, + user_and_pwd?user_and_pwd:"", + host, port, path); + else + link_uri = g_strdup_printf ("%s://%s%s:%d%s", + dns_sd_types[i].method, + user_and_pwd?user_and_pwd:"", + host, port, path); g_free (user_and_pwd); /* TODO: Escape / in name */ Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/file-method.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/file-method.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/file-method.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -1171,11 +1171,7 @@ } if (options & GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT) { - result = get_selinux_context (file_info, full_name, options); - if (result != GNOME_VFS_OK) { - g_free (full_name); - return result; - } + get_selinux_context (file_info, full_name, options); } if (options & GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS) { Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/http-neon-method.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/http-neon-method.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/http-neon-method.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -2451,6 +2451,7 @@ hctx = handle->context; +put_start: req = ne_request_create (hctx->session, "PUT", hctx->path); /* Apache seems to not handle "If-None-Match: *" correctly @@ -2473,6 +2474,20 @@ ne_set_request_body_buffer (req, NULL, 0); res = ne_request_dispatch (req); + + if (res == NE_REDIRECT) { + ne_request_destroy (req); + req = NULL; + + result = http_follow_redirect (hctx); + + if (result == GNOME_VFS_OK) { + goto put_start; + } else { + return result; + } + } + result = resolve_result (res, req); ne_request_destroy (req); Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-kernel.h =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-kernel.h 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-kernel.h 2006-11-21 16:04:24 UTC (rev 8239) @@ -1,23 +1,17 @@ /* - Copyright (C) 2005 John McCutchan + Copyright (C) 2006 John McCutchan <john at johnmccutchan.com> - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2. - The Gnome Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors:. - John McCutchan <john at johnmccutchan.com> + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License version 2 for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef __INOTIFY_KERNEL_H Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-path.h =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-path.h 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-path.h 2006-11-21 16:04:24 UTC (rev 8239) @@ -1,23 +1,17 @@ /* - Copyright (C) 2005 John McCutchan + Copyright (C) 2006 John McCutchan <john at johnmccutchan.com> - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2. - The Gnome Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors:. - John McCutchan <john at johnmccutchan.com> + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License version 2 for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef __INOTIFY_PATH_H Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/sftp-method.c =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/sftp-method.c 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/sftp-method.c 2006-11-21 16:04:24 UTC (rev 8239) @@ -1060,7 +1060,7 @@ &ssh_exitcode, NULL)) { if (ssh_stderr == NULL) res = SFTP_VENDOR_INVALID; - else if (strstr (ssh_stderr, "OpenSSH") != NULL) + else if ((strstr (ssh_stderr, "OpenSSH") != NULL) || (strstr (ssh_stderr, "Sun_SSH") != NULL)) res = SFTP_VENDOR_OPENSSH; else if (strstr (ssh_stderr, "SSH Secure Shell") != NULL) res = SFTP_VENDOR_SSH; Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/ChangeLog =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/ChangeLog 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/ChangeLog 2006-11-21 16:04:24 UTC (rev 8239) @@ -1,3 +1,26 @@ +2006-11-18 Djihed Afifi <djihed at gmail.com> + + * ar.po: Updated Arabic Translation. + +2006-11-18 Matic Zgur <mr.zgur at gmail.com> + + * pl.po: Updated Polish translation by GNOME PL Team. + +2006-11-11 Djihed Afifi <djihed at gmail.com> + + * ar.po: Updated Arabic Translation. + +2006-11-01 Yair Hershkovitz <yairhr at gmail.com> + + * he.po: Updated Hebrew translation. + +2006-10-20 Thierry Randrianiriana <randrianiriana at gmail.com> + + * mg.po: Added Malagasy translation. + * LINGUAS: Added 'mg'. + +=== gnome-vfs 2.16.1 === + 2006-09-28 Ignacio Casal Quinteiro <nacho.resa at gmail.com> * gl.po: Updated Galician Translation. @@ -32,7 +55,7 @@ * nn.po: Updated Norwegian Nynorsk translation. 2006-08-31 Nikos Charonitakis <nikosx at gmail.com> - + * el.po: Updated Greek translation. 2006-08-31 Ani Peter <peter.ani at gmail.com> @@ -99,7 +122,7 @@ 2006-08-16 Daniel Nylander <po at danielnylander.se> * sv.po: Updated Swedish translation. - + 2006-08-16 Gabor Kelemen <kelemeng at gnome.hu> * hu.po: Translation updated. @@ -252,7 +275,7 @@ * hi.po: Updated Hindi Translation. === gnome-vfs 2.15.2 === - + 2006-06-10 Changwoo Ryu <cwryu at debian.org> * ko.po: Updated Korean translation. @@ -291,7 +314,7 @@ * ja.po: Updated Japanese translation. === gnome-vfs 2.15.1 === - + 2006-05-16 Ignacio Casal Quinteiro <nacho.resa at gmail.com> * gl.po: Updated Galician Translation. @@ -368,10 +391,10 @@ * gl.po: Updated Galician Translation. === gnome-vfs 2.14.1 === - + 2006-04-02 Vladimer Sichinava <vlsichinava at gmail.com> - * ka.po: Added Georgian translation + * ka.po: Added Georgian translation by Gia Shervashidze <giasher at telenet.ge> 2006-03-29 Gora Mohanty <gmohanty at cvs.gnome.org> @@ -397,9 +420,9 @@ 2006-03-14 Baris Cicek <baris at teamforce.name.tr> * tr.po: Updated Turkish Translation - + === gnome-vfs 2.14.0 === - + 2006-03-13 Mugurel Tudor <mugurelu at gnome.ro> * ro.po: Updated Romanian translation by @@ -436,7 +459,7 @@ Carbery. === gnome-vfs 2.13.92 === - + 2006-02-25 Benoît Dejean <benoit at placenet.org> * fr.po: Updated French translation. @@ -467,7 +490,7 @@ * uk.po: Updated Ukrainian translation. === gnome-vfs 2.13.91 === - + 2006-02-12 Josep Puigdemont i Casamajó <josep.puigdemont at gmail.com> * ca.po: Updated Catalan translation with @@ -647,7 +670,7 @@ * be.po: Updated Belarusian translation by Vital Khilko === gnome-vfs 2.13.1 === - + 2005-10-27 Dan Damian <dand at gnome.ro> * ro.po: Updated Romanian translation by Misu Moldovan. @@ -685,7 +708,7 @@ * zh_CN.po: Updated Simplified Chinese translation. === gnome-vfs 2.12.1 === - + 2005-10-01 Runa Bhattacharjee <runa at bengalinux.org> * bn.po: Updated Bengali (bn) translation. Translation by Mahay Alam Khan <makl10n at yahoo.com> @@ -776,7 +799,7 @@ * eu.po: Updated Basque translation. === gnome-vfs 2.12.0 === - + 2005-09-04 Ignacio Casal Quinteiro <nacho.resa at gmail.com> * gl.po: Updated Galician Translation. @@ -796,7 +819,7 @@ 2005-08-31 Žygimantas Beručka <zygis at gnome.org> * lt.po: Updated Lithuanian translation. - + 2005-08-31 Raphael Higino <raphaelh at cvs.gnome.org> * pt_BR.po: Updated Brazilian Portuguese translation. @@ -804,7 +827,7 @@ 2005-08-30 Mohammad DAMT <mdamt at gnome.org> * id.po: Updated Indonesian translation - + 2005-08-30 Leonid Kanter <leon at asplinux.ru> * ru.po: Updated Russian translation @@ -869,7 +892,7 @@ * nl.po: Translation updated. -2005-07-28 Ilkka Tuohela <hile at iki.fi> +2005-07-28 Ilkka Tuohela <hile at iki.fi> * fi.po: Updated Finnish translation. @@ -1443,7 +1466,7 @@ 2004-09-05 Baris Cicek <baris at teamforce.name.tr> * tr.po: Updated Turkish Translation - + 2004-09-04 Ole Laursen <olau at hardworking.dk> * da.po: Updated Danish translation. @@ -1520,7 +1543,7 @@ * sv.po: Updated Swedish translation. 2004-08-31 Arafat Medini <lumina at silverpen.de> - + * ar.po: Updated Arabic Translation === gnome-vfs 2.7.92 === @@ -1535,7 +1558,7 @@ * ms.po: Updated Malay translation. 2004-08-25 David Lodge <dave at cirt.net> - + * en_GB.po: Updated British translation. 2004-08-25 Christophe Merlet <redfox at redfoxcenter.org> @@ -1684,7 +1707,7 @@ 2004-08-09 Sanlig Badral <badral at openmn.org> * mn.po: Updated Mongolian translation. - + 2004-08-09 Ankit Patel <ankit at redhat.com> * gu.po: Updated Gujarati translation. @@ -1812,7 +1835,7 @@ 2004-07-22 Dave Camp <dave at novell.com> - * POTFILES.in: Updated + * POTFILES.in: Updated 2004-07-21 Duarte Loreto <happyguy_pt at hotmail.com> @@ -1933,7 +1956,7 @@ * da.po: Updated Danish translation. ==== gnome-vfs 2.7.3 ==== - + 2004-07-05 Laurent Dhima <laurenti at alblinux.net> * sq.po: Updated Albanian translation. @@ -1971,14 +1994,14 @@ Goedson Teixeira Paixao <goedson at debian.org>. 2004-06-06 Alexander Shopov <ash at contact.bg> - + * bg.po: Updated Bulgarian translation by Peter "Peshka" Slavov <pslavov at i-space.org> ==== gnome-vfs 2.7.1 ==== - + 2004-05-27 Alexander Shopov <ash at contact.bg> - + * bg.po: Updated Bulgarian translation by Peter "Peshka" Slavov <pslavov at i-space.org> @@ -2028,7 +2051,7 @@ 2004-03-22 Guntupalli Karunakar <karunakar at freedomink.org> - * pa.po: Punjabi translation by + * pa.po: Punjabi translation by Amanpreet Singh Alam <amanlinux at netscape.net>. 2004-03-21 Gustavo Noronha Silva <kov at debian.org> @@ -2290,7 +2313,7 @@ === gnome-vfs 2.5.7 === 2004-02-11 Arafat Medini <lumina at silverpen.de> - + * ar.po: Updated Arabic translation. 2004-02-10 Pauli Virtanen <pauli.virtanen at hut.fi> @@ -2362,7 +2385,7 @@ * nn.po: Updated Norwegian Nynorsk translation. 2004-01-26 Alastair McKinstry <mckinstry at computer.org> - + * ga.po: Make Irish translation consistent with other gnome translations. @@ -2470,7 +2493,7 @@ * no.po: Updated Norwegian translation. 2004.01.09 Arafat Medini <lumina at silverpen.de> - + * ar.po: Updated Arabic translation 2004-01-09 Changwoo Ryu <cwryu at debian.org> @@ -2552,7 +2575,7 @@ * es.po: Updated Spanish translation. 2003-12-20 Arafat Medini <lumina at silverpen.de> - + * ar.po: Updated Arabic translation 2003-12-20 Danilo ?egan <dsegan at gmx.net> @@ -2686,7 +2709,7 @@ * es.po: Updated Spanish translation by Francisco Javier F. Serrador <serrador at arrakis.es>. - + === gnome-vfs 2.5.1 === 2003-11-02 Kostas Papadimas <pkst at gnome.org> @@ -2805,7 +2828,7 @@ 2003-08-25 Guntupalli Karunakar <karunakar at freedomink.org> * hi.po: Updated Hindi translation. - + 2003-08-25 Takeshi AIHANA <aihana at gnome.gr.jp> * ja.po: Updated Japanese translation. @@ -2858,7 +2881,7 @@ 2003-08-14 Danilo ?egan <dsegan at gmx.net> * be.po: Updated Belarusian translation by Ales Nyakhaychyk - <nab at mail.by>. + <nab at mail.by>. 2003-08-14 Artur Flinta <aflinta at cvs.gnome.org> @@ -2931,7 +2954,7 @@ 2003-08-04 Danilo ? egan <dsegan at gmx.net> - * sr.po, sr at Latn.po: Updated Serbian translation by Serbian + * sr.po, sr at Latn.po: Updated Serbian translation by Serbian team (Prevod.org). 2003-08-04 Christian Rose <menthos at menthos.com> @@ -2950,7 +2973,7 @@ 2003-07-22 Danilo ? egan <dsegan at gmx.net> - * sr.po, sr at Latn.po: Updated Serbian translation by Serbian team + * sr.po, sr at Latn.po: Updated Serbian translation by Serbian team (Prevod.org). 2003-07-12 Pablo Saratxaga <pablo at mandrakesoft.com> @@ -3013,7 +3036,7 @@ ==== gnome-vfs 2.3.4 ==== 2003-06-05 Mathieu van Woerkom <mathieu at brabants.org> - + * li.po: Added Limburgish translation ==== gnome-vfs 2.3.3 ==== @@ -3042,7 +3065,7 @@ 2003-05-19 Telsa Gwymnne <hobbit at aloss.ukuu.org.uk> - * cy.po: Updated Welsh translation from + * cy.po: Updated Welsh translation from Dafydd Harries <daf at parnassus.ath.cx> ==== gnome-vfs 2.3.2 ==== @@ -3061,7 +3084,7 @@ * ca.po: Updated Catalan translation. 2003-05-09 Telsa Gwynne <hobbit at aloss.ukuu.org.uk> - + * cy.po: Added Welsh translation from gnome-cy <gnome-cy at pengwyn.linux.org.uk> and Kyfieithu contributors. <http://www.kyfieithu.co.uk/> @@ -3082,7 +3105,7 @@ 2003-05-06 Danilo ? egan <dsegan at gmx.net> - * sr.po, sr at Latn: Added Serbian translation by + * sr.po, sr at Latn: Added Serbian translation by http://Prevod.org/. 2003-05-05 Duarte Loreto <happyguy_pt at hotmail.com> @@ -3134,7 +3157,7 @@ exactly the same in CDE's sys.dtwmrc file of the locale. ==== gnome-vfs 2.2.4 ==== - + 2003-03-26 Christian Rose <menthos at menthos.com> * yi.po: Added Yiddish translation by @@ -3151,7 +3174,7 @@ by Charles Voelger <cvoelger at dweasel.com> ==== gnome-vfs 2.2.3 ==== - + 2003-02-25 Taneem Ahmed <taneem at eyetap.org> * bn.po: Added Bangla/Bengali translation @@ -3176,7 +3199,7 @@ ==== gnome-vfs 2.2.2 ==== ==== gnome-vfs 2.2.1 ==== - + 2003-02-06 Christian Rose <menthos at menthos.com> * id.po: Added Indonesian translation by @@ -3213,7 +3236,7 @@ * zh_TW.po: Updated traditional Chinese translation. ==== gnome-vfs 2.2.0 ==== - + 2003-01-15 Fatih Demir <kabalak at gtranslator.org> * tr.po: Committed updated Turkish translation by Sinan. @@ -3224,7 +3247,7 @@ Anurag Seetha <anuragseetha at yahoo.com> ==== gnome-vfs 2.1.91 ==== - + 2003-01-10 Pablo Gonzalo del Campo <pablodc at bigfoot.com> * es.po: Fixed a couple of strings in Spanish translation. @@ -3232,7 +3255,7 @@ 2003-01-09 Laurent Dhima <laurenti at alblinux.net> * sq.po: Updated Albanian translation. - + 2003-01-09 Dmitry G. Mastrukov <dmitry at taurussoft.org> * ru.po: updated Russian translation @@ -3251,7 +3274,7 @@ * nl.po: Dutch translation updated by Tino Meinen. ==== gnome-vfs 2.1.6 ==== - + 2003-01-05 Pauli Virtanen <pauli.virtanen at hut.fi> * fi.po: Updated Finnish translation. @@ -3302,7 +3325,7 @@ * sv.po: Updated Swedish translation. ==== gnome-vfs 2.1.5 ==== - + 2002-12-15 Hasbullah Bin Pit <sebol at ikhlas.com> * ms.po: Updated Malay Translation. @@ -3318,7 +3341,7 @@ 2002-12-14 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2002-12-13 Daniel Yacob <locales at geez.org> * am.po: Added Amharic translation. @@ -3330,13 +3353,13 @@ 2002-12-11 Laurent Dhima <laurenti at alblinux.net> * sq.po: Updated Albanian translation. - + 2002-12-11 Pauli Virtanen <pauli.virtanen at hut.fi> * fi.po: Updated Finnish translation. ==== gnome-vfs 2.1.4 ==== - + 2002-12-07 Andras Timar <timar at gnome.hu> * hu.po: Updated Hungarian translation. @@ -3356,10 +3379,10 @@ 2002-11-15 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2002-11-12 Laurent Dhima <laurenti at alblinux.net> - * sq.po: Added Albanian translation. + * sq.po: Added Albanian translation. 2002-11-04 Hasbullah Bin Pit <sebol at ikhlas.com> @@ -3500,7 +3523,7 @@ 2002-03-28 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2002-03-27 Seth Nickell <set EMAIL_ADDRESS environment variable> reviewed by: <delete if not using a buddy> @@ -3563,7 +3586,7 @@ 2002-03-03 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2002-02-27 Christian Meyer <chrisime at gnome.org> * de.po: Updated German translation. @@ -3593,11 +3616,11 @@ 2002-02-12 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2002-02-10 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2002-02-09 Pauli Virtanen <ptvirtan at cc.hut.fi> * fi.po: Updated Finnish translation and converted it to UTF-8. @@ -3705,7 +3728,7 @@ 2002-01-28 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2002-01-27 Christian Rose <menthos at menthos.com> * POTFILES.in: Sorted and added missing files. @@ -3760,7 +3783,7 @@ ja.po, ko.po, lt.po, nl.po, nn.po, no.po, pl.po, pt_BR.po, ro.po, ru.po, sk.po, sl.po, sv.po, tr.po, uk.po, wa.po, zh_TW.po: Lose the MIME translations. - + 2001-10-29 Christian Rose <menthos at menthos.com> * sv.po: Updated Swedish translation. @@ -3855,7 +3878,7 @@ 2001-07-15 Kjartan Maraas <kmaraas at gnome.org> * nn.po: Updated Norwegian (nynorsk) translation. - + 2001-07-13 Fatih Demir <kabalak at gtranslator.org> * tr.po: Updated Turkish translation. @@ -3871,7 +3894,7 @@ 2001-06-28 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2001-06-22 Christophe Merlet <christophe at merlet.net> * fr.po: Updated French translation. @@ -3884,7 +3907,7 @@ * es.po: /s/vaciado de memoria/volcado de memoria Thanks Eduardo Ferro <eferro at euskalnet.net> - + 2001-06-10 Ole Laursen <olau at hardworking.dk> * da.po: Updated Danish translation. @@ -3974,7 +3997,7 @@ Merged all changes back here from the gnome-vfs-1 branch. === start of changes from gnome-vfs-1 branch ==== - + 2001-03-06 Stanislav Visnovsky <visnovsky at nenya.ms.mff.cuni.cz> * sk.po: Updated Slovak translation. @@ -4006,7 +4029,7 @@ 2001-03-01 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-27 Simos Xenitellis <simos at hellug.gr> * el.po: Update of Greek translation. @@ -4053,7 +4076,7 @@ Add translations that were formerly in file-types-capplet.desktop to the po files using xml-i18n-prepare - + 2001-02-27 Jarkko Ranta <jjranta at cc.joensuu.fi> * fi.po: Updated Finnish translation by Pauli Virtanen. @@ -4061,7 +4084,7 @@ 2001-02-26 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-26 Pablo Saratxaga <pablo at mandrakesoft.com> * az.po: Added Azeri file @@ -4092,7 +4115,7 @@ 2001-02-24 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-23 Christophe Merlet <christophe at merlet.net> * fr.po: Updated French translation. @@ -4104,7 +4127,7 @@ 2001-02-22 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-21 Gustavo Maciel Dias Vieira <gdvieira at zaz.com.br> * pt_BR.po: Updated Brazilian Portuguese translation. @@ -4112,7 +4135,7 @@ 2001-02-21 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-21 Fatih Demir <kabalak at gtranslator.org> * ko.po: Committed updated Korean translation. @@ -4144,11 +4167,11 @@ 2001-02-16 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-15 Kjartan Maraas <kmaraas at gnome.org> * nn.po: Added Norwegian (nynorsk) translation. - + 2001-02-15 Christopher R. Gabriel <cgabriel at softwarelibero.org> * it.po: Updated italian translation @@ -4156,7 +4179,7 @@ 2001-02-14 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-14 Stanislav Visnovsky <visnovsky at nenya.ms.mff.cuni.cz> * sk.po: Updated Slovak translation. @@ -4180,13 +4203,13 @@ 2001-02-11 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-09 Stanislav Visnovsky <visnovsky at nenya.ms.mff.cuni.cz> * sk.po: Updated Slovak translation. === end of changes from gnome-vfs-1 branch === - + 2001-02-28 Mauricio Araya P. <mauricio at eazel.com> * es.po: Updated Spanish translation. @@ -4242,7 +4265,7 @@ 2001-02-02 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-02-01 Stanislav Visnovsky <visnovsky at nenya.ms.mff.cuni.cz> * sk.po: Updated Slovak translation. @@ -4258,7 +4281,7 @@ 2001-01-29 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2001-01-29 Martin Norbdck <d95mback at dtek.chalmers.se> * sv.po: Updated Swedish translation. @@ -4274,7 +4297,7 @@ 2001-01-24 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-01-24 Szabolcs Ban <shooby at gnome.hu> * hu.po: Tons of fixes by Andras and Emese (spelling, @@ -4315,7 +4338,7 @@ 2001-01-18 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian (bokmel) translation. - + 2001-01-11 Stanislav Visnovsky <visnovsky at nenya.ms.mff.cuni.cz> * sk.po: Updated Slovak translation. @@ -4339,7 +4362,7 @@ 2000-12-31 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2000-12-31 Pauli Virtanen <pauli.virtanen at saunalahti.fi> * fi.po: Updated Finnish translation. @@ -4367,7 +4390,7 @@ 2000-12-11 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2000-12-06 Fatih Demir <kabalak at gmx.net> * ko.po: Committed updated Korean @@ -4376,7 +4399,7 @@ 2000-12-05 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2000-12-03 Kai Lahmann <kl at linuxfaqs.de> * de.po: Updated German translation @@ -4384,7 +4407,7 @@ 2000-11-24 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2000-11-21 Valek Filippov <frob at df.ru> * ru.po: updated russian translation. @@ -4424,7 +4447,7 @@ 2000-11-11 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2000-11-09 Szabolcs BAN <shooby at gnome.hu> * hu.po: Updated. @@ -4457,7 +4480,7 @@ * fi.po: Updated Finnish Translation -2000-10-12 Fatih Demir <kabalak at gmx.net> +2000-10-12 Fatih Demir <kabalak at gmx.net> * tr.po: Updated the Turkish translation ( yes, the update was done with gtranslator ). @@ -4530,7 +4553,7 @@ * update.pl: I don't think that we're building a nautilus translation in the gnome-vfs module ;) - * .cvsignore: Added the "messages" file to the ignored ones. + * .cvsignore: Added the "messages" file to the ignored ones. 2000-07-24 Szabolcs BAN <shooby at gnome.hu> @@ -4548,16 +4571,16 @@ * nl.po: Added Dutch translation from Mendel Mobach <mendel at mobach.nl>. - -2000-07-12 Fatih Demir <kabalak at gmx.net> +2000-07-12 Fatih Demir <kabalak at gmx.net> + * tr.po: Updated the Turkish translation. 2000-07-10 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. -2000-07-10 Fatih Demir <kabalak at gmx.net> +2000-07-10 Fatih Demir <kabalak at gmx.net> * tr.po: Updated the Turkish translation. @@ -4576,7 +4599,7 @@ 2000-06-21 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2000-06-17 Valek Filippov <frob at df.ru> * ru.po: updated russian translation. @@ -4585,11 +4608,11 @@ * POTFILES.in: Added missing files. * no.po: Updated Norwegian translation. - + 2000-04-26 Kjartan Maraas <kmaraas at gnome.org> * no.po: Updated Norwegian translation. - + 2000-06-10 Sung-Hyun Nam <namsh at lgic.co.kr> * ko.po: initial translation from Young-Ho,Cha <ganadist at dacome.co.kr> @@ -4599,7 +4622,7 @@ * ru.po: Updated russian translation. 2000-05-25 Fatih Demir <kabalak at gmx.net> - + * tr.po: Updated the Turkish translation. 2000-05-25 Szabolcs BAN <shooby at gnome.hu> @@ -4622,7 +4645,7 @@ * no.po: Updated Norwegian translation. * POTFILES.in: Added one missing file. - + 2000-04-20 Pablo Saratxaga <pablo at mandrakesoft.com> * lt.po: Updated Lithuanian file @@ -4655,7 +4678,7 @@ 2000-04-10 Kjartan Maraas <kmaraas at online.no> * no.po: Updated Norwegian translation. - + 2000-04-08 Andreas Hyden <a.hyden at cyberpoint.se> * sv.po: Updated Swedish translation. @@ -4708,7 +4731,7 @@ * POTFILES.in: Added missing files. * no.po: Updated accordingly. - + 2000-01-04 Kjartan Maraas <kmaraas at online.no> * update.sh: A little script that lets people @@ -4741,7 +4764,7 @@ 1999-11-19 Kjartan Maraas <kmaraas at online.no> * no.po: Added Norwegian translation. - + 1999-09-29 Rodrigo Stulzer Lopes <rodrigo at conectiva.com.br> * pt_BR.po: Add pt_BR translations Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/LINGUAS =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/LINGUAS 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/LINGUAS 2006-11-21 16:04:24 UTC (rev 8239) @@ -40,6 +40,7 @@ li lt lv +mg mk ml mn Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/ar.po =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/ar.po 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/ar.po 2006-11-21 16:04:24 UTC (rev 8239) @@ -1,518 +1,801 @@ -# translation of gnome-vfs.HEAD.ar.po to -# translation of gnome-vfs.po to Arabic +# translation of gnome-vfs.HEAD.po to Arabic +# translation of gnome-vfs.HEAD.ar.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER. +# # Sayed Jaffer Al-Mosawi <mosawi at arabeyes.org>, 2002. # Isam Bayazidi <bayazidi at arabeyes.org>, 2002. # Arafat Medini <lumina at silverpen.de>, 2003. # Ayman Hourieh <aymanh at gmail.com>, 2004. -# +# Khaled Hosny <khaledhosny at eglug.org>, 2006. msgid "" msgstr "" -"Project-Id-Version: gnome-vfs.HEAD.ar\n" +"Project-Id-Version: gnome-vfs.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-30 12:26+0100\n" -"PO-Revision-Date: 2004-12-30 15:09+0100\n" -"Last-Translator: \n" -"Language-Team: <en at li.org>\n" +"POT-Creation-Date: 2006-11-11 12:42+0000\n" +"PO-Revision-Date: 2006-11-18 13:03+0200\n" +"Last-Translator: Khaled Hosny <khaledhosny at eglug.org>\n" +"Language-Team: Arabic <support at eglug.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n\n" +"\n" +"\n" -#: daemon/gnome-vfs-daemon.c:596 -msgid "Could not initialize Bonobo" -msgstr "لم يمكن تشغيل بونوبو" - -#: daemon/gnome-vfs-daemon.c:603 -msgid "Could not initialize gnome vfs" -msgstr "لم يمكن تشغيل جنوم vfs" - -#: libgnomevfs/gnome-vfs-cdrom.c:210 +#: ../libgnomevfs/gnome-vfs-cdrom.c:237 msgid "ISO 9660 Volume" msgstr "حجم ISO 9660" -#: libgnomevfs/gnome-vfs-configuration.c:227 -#, c-format -msgid "%s:%d contains NUL characters." -msgstr "%s:%d يحوي رموزا مصفّرة." +#: ../libgnomevfs/gnome-vfs-configuration.c:225 +#, fuzzy, c-format +msgid "%s:%u contains NUL characters." +msgstr "الـURI '%s' يحتوي على حروف هربت بطريقة غير سليمة " -#: libgnomevfs/gnome-vfs-configuration.c:244 -#, c-format -msgid "%s:%d contains no method name." -msgstr "%s:%d لا يحوي اسم الطريقة." +#: ../libgnomevfs/gnome-vfs-configuration.c:242 +#, fuzzy, c-format +msgid "%s:%u contains no method name." +msgstr "لم يحدَّد إسم مجلّد." -#: libgnomevfs/gnome-vfs-configuration.c:284 -#, c-format -msgid "%s:%d has no options endmarker." -msgstr "%s:%d·ليس له علامة إنتهاء الخيارات" +#: ../libgnomevfs/gnome-vfs-configuration.c:282 +#, fuzzy, c-format +msgid "%s:%u has no options endmarker." +msgstr "لا خيارات معرفة" -#: libgnomevfs/gnome-vfs-configuration.c:295 -#, c-format -msgid "%s:%d has unknown options %s." -msgstr "%s:%d يحوي خيارات %s. مجهولة " +#: ../libgnomevfs/gnome-vfs-configuration.c:293 +#, fuzzy, c-format +msgid "%s:%u has unknown options %s." +msgstr "يوجد مقدمة moniker غير معروفة في Moniker" -#: libgnomevfs/gnome-vfs-configuration.c:314 -#, c-format -msgid "%s:%d contains no module name." -msgstr "%s:%d لا يحوي اسم الوحدة." +#: ../libgnomevfs/gnome-vfs-configuration.c:312 +#, fuzzy, c-format +msgid "%s:%u contains no module name." +msgstr "لم يحدَّد إسم مجلّد." -#: libgnomevfs/gnome-vfs-configuration.c:368 +#: ../libgnomevfs/gnome-vfs-configuration.c:363 #, c-format msgid "Configuration file `%s' was not found: %s" msgstr "لم يعثر على ملف اﻹعدادات `%s': %s" -#: libgnomevfs/gnome-vfs-filesystem-type.c:37 +#. stop parsing if we failed +#: ../libgnomevfs/gnome-vfs-configuration.c:382 +#, fuzzy, c-format +msgid "%s:%d aborted parsing." +msgstr "خطأ أثناء ترجمة المصفات: %s: %s" + +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:39 msgid "AFFS Volume" msgstr "حجم AFFS" -#: libgnomevfs/gnome-vfs-filesystem-type.c:38 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:40 msgid "AFS Network Volume" msgstr "حجم AFS الشبكي" -#: libgnomevfs/gnome-vfs-filesystem-type.c:39 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:41 msgid "Auto-detected Volume" msgstr "حجم مكشوف آليا" -#: libgnomevfs/gnome-vfs-filesystem-type.c:40 -#: libgnomevfs/gnome-vfs-filesystem-type.c:42 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:42 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:44 msgid "CD-ROM Drive" msgstr "سواقة أقراص مدمجة" -#: libgnomevfs/gnome-vfs-filesystem-type.c:41 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:43 msgid "CD Digital Audio" msgstr "قرص صوت رقمي" -#: libgnomevfs/gnome-vfs-filesystem-type.c:43 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:45 msgid "Hardware Device Volume" msgstr "حجم جهاز آلي" -#: libgnomevfs/gnome-vfs-filesystem-type.c:44 -#: libgnomevfs/gnome-vfs-filesystem-type.c:45 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:46 +#, fuzzy +msgid "EncFS Volume" +msgstr "متحكم شدة الصوت" + +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:47 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:48 msgid "Ext2 Linux Volume" msgstr "حجم لينكس Ext2" -#: libgnomevfs/gnome-vfs-filesystem-type.c:46 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:49 msgid "Ext3 Linux Volume" msgstr "حجم لينكس Ext3" -#: libgnomevfs/gnome-vfs-filesystem-type.c:47 -#: libgnomevfs/gnome-vfs-filesystem-type.c:57 -#: libgnomevfs/gnome-vfs-filesystem-type.c:58 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:50 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:63 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:64 msgid "MSDOS Volume" msgstr "حجم MSDOS" -#: libgnomevfs/gnome-vfs-filesystem-type.c:48 -#: libgnomevfs/gnome-vfs-filesystem-type.c:49 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:51 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:59 +#, fuzzy +msgid "BSD Volume" +msgstr "حجم Solaris/BSD" + +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:52 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:53 msgid "MacOS Volume" msgstr "حجم MacOS" -#: libgnomevfs/gnome-vfs-filesystem-type.c:50 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:54 msgid "CDROM Volume" msgstr "حجم قرص مدمج" -#: libgnomevfs/gnome-vfs-filesystem-type.c:51 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:55 msgid "Hsfs CDROM Volume" msgstr "حجم قرص Hsfs المدمج" -#: libgnomevfs/gnome-vfs-filesystem-type.c:52 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:56 msgid "JFS Volume" msgstr "حجم JFS" -#: libgnomevfs/gnome-vfs-filesystem-type.c:53 -#: libgnomevfs/gnome-vfs-filesystem-type.c:60 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:57 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:66 msgid "Windows NT Volume" msgstr "حجم Windows NT" -#: libgnomevfs/gnome-vfs-filesystem-type.c:54 -#: libgnomevfs/gnome-vfs-filesystem-type.c:62 -#: libgnomevfs/gnome-vfs-filesystem-type.c:63 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:58 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:60 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:68 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:69 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:70 msgid "System Volume" msgstr "حجم النظام" -#: libgnomevfs/gnome-vfs-filesystem-type.c:55 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:61 msgid "Memory Volume" msgstr "حجم الذاكرة" -#: libgnomevfs/gnome-vfs-filesystem-type.c:56 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:62 msgid "Minix Volume" msgstr "حجم مينكس" -#: libgnomevfs/gnome-vfs-filesystem-type.c:59 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:65 msgid "NFS Network Volume" msgstr "حجم NFS الشبكي" -#: libgnomevfs/gnome-vfs-filesystem-type.c:61 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:67 msgid "Netware Volume" msgstr "حجم Netware" -#: libgnomevfs/gnome-vfs-filesystem-type.c:64 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:71 +#, fuzzy +msgid "Reiser4 Linux Volume" +msgstr "حجم لينكس Ext2" + +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:72 msgid "ReiserFS Linux Volume" msgstr "حجم لينكس ReiserFS " -#: libgnomevfs/gnome-vfs-filesystem-type.c:65 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:73 msgid "Windows Shared Volume" -msgstr "فضاء مشارك مع ونداوس" +msgstr "فضاء مشارك مع ويندوز" -#: libgnomevfs/gnome-vfs-filesystem-type.c:66 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:74 msgid "SuperMount Volume" msgstr "حجم SuperMount" -#: libgnomevfs/gnome-vfs-filesystem-type.c:67 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:75 msgid "DVD Volume" msgstr "حجم دي في دي" -#: libgnomevfs/gnome-vfs-filesystem-type.c:68 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:76 msgid "Solaris/BSD Volume" msgstr "حجم Solaris/BSD" -#: libgnomevfs/gnome-vfs-filesystem-type.c:69 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:77 msgid "Udfs Solaris Volume" msgstr "حجم Udfs Solaris" -#: libgnomevfs/gnome-vfs-filesystem-type.c:70 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:78 msgid "Pcfs Solaris Volume" msgstr "حجم Pcfs Solaris" -#: libgnomevfs/gnome-vfs-filesystem-type.c:71 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:79 msgid "Sun SAM-QFS Volume" msgstr "حجم Sun SAM-QFS" -#: libgnomevfs/gnome-vfs-filesystem-type.c:72 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:80 +#, fuzzy +msgid "Temporary Volume" +msgstr "متحكم شدة الصوت" + +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:81 msgid "Enhanced DOS Volume" msgstr "حجم دوس محسّن" -#: libgnomevfs/gnome-vfs-filesystem-type.c:73 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:82 msgid "Windows VFAT Volume" msgstr "حجم Windows VFAT" -#: libgnomevfs/gnome-vfs-filesystem-type.c:74 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:83 msgid "Xenix Volume" msgstr "حجم Xenix" -#: libgnomevfs/gnome-vfs-filesystem-type.c:75 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:84 msgid "XFS Linux Volume" msgstr "حجم XFS Linux" -#: libgnomevfs/gnome-vfs-filesystem-type.c:76 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:85 msgid "XIAFS Volume" msgstr "حجم XIAFS" -#: libgnomevfs/gnome-vfs-filesystem-type.c:104 +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:86 +#, fuzzy +msgid "CIFS Volume" +msgstr "متحكم شدة الصوت" + +#: ../libgnomevfs/gnome-vfs-filesystem-type.c:114 msgid "Unknown" msgstr "مجهول" -#: libgnomevfs/gnome-vfs-job.c:734 +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:354 +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:580 +#, fuzzy, c-format +msgid "%s Volume" +msgstr "شدة الصوت" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:370 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:565 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:623 +msgid "CD-ROM" +msgstr "قرص مدمج" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:372 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:567 +#, fuzzy +msgid "CD-R" +msgstr "CD-R" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:374 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:568 +#, fuzzy +msgid "CD-RW" +msgstr "CD-RW" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:378 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:569 +#, fuzzy +msgid "DVD-ROM" +msgstr "قرص مدمج" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:380 +#, fuzzy +msgid "DVD+R" +msgstr "DVD+R" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:382 +#, fuzzy +msgid "DVD+RW" +msgstr "DVD+RW" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:384 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:571 +#, fuzzy +msgid "DVD-R" +msgstr "DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:386 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:572 +#, fuzzy +msgid "DVD-RW" +msgstr "DVD-RW" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:388 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:570 +#, fuzzy +msgid "DVD-RAM" +msgstr "DVD-RAM" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:391 +#, fuzzy +msgid "DVD±R" +msgstr "قرص فيديو رقمي" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:394 +#, fuzzy +msgid "DVD±RW" +msgstr "قرص DVD-RW" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:397 +#, fuzzy, c-format +msgid "%s/%s Drive" +msgstr "مشغّل" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:399 +#, fuzzy, c-format +msgid "%s Drive" +msgstr "مشغّل" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:404 +#, fuzzy +msgid "Floppy Drive" +msgstr "السواقة مفتوحة" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:407 +#, fuzzy +msgid "Compact Flash Drive" +msgstr "المشغل مشغول" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:409 +#, fuzzy +msgid "Memory Stick Drive" +msgstr "المشغل مشغول" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:411 +#, fuzzy +msgid "Smart Media Drive" +msgstr "المشغل مشغول" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:413 +#, fuzzy +msgid "SD/MMC Drive" +msgstr "المشغل مشغول" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:415 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:594 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:626 +msgid "Zip Drive" +msgstr "قرص Zip" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:418 +#, fuzzy +msgid "Jaz Drive" +msgstr "السواقة مفتوحة" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:421 +#, fuzzy +msgid "Pen Drive" +msgstr "السواقة مفتوحة" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:427 +#, fuzzy, c-format +msgid "%s %s Music Player" +msgstr "" +"اللاعب الأول :\n" +"%s" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:435 +#, fuzzy, c-format +msgid "%s %s Digital Camera" +msgstr "<b>آلة تصوير رقميّة</b>" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:465 +#, fuzzy +msgid "Drive" +msgstr "مشغّل" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:470 +#, fuzzy, c-format +msgid "External %s" +msgstr "أدوات خارجية" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:506 +#, fuzzy +msgid "CD-ROM Disc" +msgstr "سواقة أقراص مدمجة" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:511 +#, fuzzy +msgid "Blank CD-R Disc" +msgstr "قم بإدراج قرص فارغ." + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:513 +#, fuzzy +msgid "CD-R Disc" +msgstr "نسخ القرص للقرص المدمج" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:518 +#, fuzzy +msgid "Blank CD-RW Disc" +msgstr "نسخ القرص للقرص المدمج" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:520 +#, fuzzy +msgid "CD-RW Disc" +msgstr "نسخ القرص للقرص المدمج" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:524 +#, fuzzy +msgid "DVD-ROM Disc" +msgstr "نسخ القرص للقرص DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:529 +#, fuzzy +msgid "Blank DVD-RAM Disc" +msgstr "نسخ القرص للقرص DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:531 +#, fuzzy +msgid "DVD-RAM Disc" +msgstr "DVD-R, أو DVD-RAM" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:536 +#, fuzzy +msgid "Blank DVD-R Disc" +msgstr "قم بإدراج قرص فارغ." + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:538 +#, fuzzy +msgid "DVD-R Disc" +msgstr "نسخ القرص للقرص DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:543 +#, fuzzy +msgid "Blank DVD-RW Disc" +msgstr "نسخ القرص للقرص DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:545 +#, fuzzy +msgid "DVD-RW Disc" +msgstr "نسخ القرص للقرص DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:551 +#, fuzzy +msgid "Blank DVD+R Disc" +msgstr "قم بإدراج قرص فارغ." + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:553 +#, fuzzy +msgid "DVD+R Disc" +msgstr "نسخ القرص للقرص DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:558 +#, fuzzy +msgid "Blank DVD+RW Disc" +msgstr "نسخ القرص للقرص DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:560 +#, fuzzy +msgid "DVD+RW Disc" +msgstr "نسخ القرص للقرص DVD" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:567 +#, fuzzy +msgid "Audio Disc" +msgstr "فتح قرص صوتي %s" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:578 +#, fuzzy, c-format +msgid "%s Removable Volume" +msgstr "متحكم شدة الصوت" + +#: ../libgnomevfs/gnome-vfs-hal-mounts.c:589 +#, fuzzy +msgid "Volume" +msgstr "شدة الصوت" + +#: ../libgnomevfs/gnome-vfs-job.c:734 #, c-format msgid "Unknown operation type %u" msgstr "نوع عمليّة مجهول %u" -#: libgnomevfs/gnome-vfs-job.c:1024 libgnomevfs/gnome-vfs-job.c:1169 +#: ../libgnomevfs/gnome-vfs-job.c:1025 ../libgnomevfs/gnome-vfs-job.c:1176 #, c-format msgid "Cannot create pipe for open GIOChannel: %s" msgstr "لا يمكن إنشاء أنبوب ل GIOChannelالمفتوح : %s" -#: libgnomevfs/gnome-vfs-job.c:1687 +#: ../libgnomevfs/gnome-vfs-job.c:1692 #, c-format msgid "Unknown job kind %u" msgstr "نوع عمليّة مجهول %u" -#: libgnomevfs/gnome-vfs-job.c:1720 +#: ../libgnomevfs/gnome-vfs-job.c:1725 msgid "Operation stopped" msgstr "اوقفت العمليّة" -#: libgnomevfs/gnome-vfs-mime-handlers.c:101 -#: libgnomevfs/gnome-vfs-mime-handlers.c:262 -#: libgnomevfs/gnome-vfs-mime-handlers.c:313 -#: libgnomevfs/gnome-vfs-mime-handlers.c:607 -#: libgnomevfs/gnome-vfs-mime-handlers.c:626 -#: libgnomevfs/gnome-vfs-mime-handlers.c:644 -#: libgnomevfs/gnome-vfs-mime-handlers.c:663 -#: libgnomevfs/gnome-vfs-mime-handlers.c:682 -#: libgnomevfs/gnome-vfs-mime-handlers.c:823 -#: libgnomevfs/gnome-vfs-mime-handlers.c:845 -#: libgnomevfs/gnome-vfs-mime-handlers.c:864 -#: libgnomevfs/gnome-vfs-mime-handlers.c:883 -#: libgnomevfs/gnome-vfs-mime-handlers.c:936 -#: libgnomevfs/gnome-vfs-mime-handlers.c:953 -#: libgnomevfs/gnome-vfs-mime-handlers.c:970 -#: libgnomevfs/gnome-vfs-mime-handlers.c:988 -#: libgnomevfs/gnome-vfs-mime-handlers.c:1006 -#: libgnomevfs/gnome-vfs-mime-info.c:643 libgnomevfs/gnome-vfs-mime-info.c:650 -#: libgnomevfs/gnome-vfs-mime-info.c:658 libgnomevfs/gnome-vfs-mime-info.c:665 -#: libgnomevfs/gnome-vfs-mime-info.c:673 libgnomevfs/gnome-vfs-mime-info.c:690 -#: libgnomevfs/gnome-vfs-mime-info.c:697 libgnomevfs/gnome-vfs-mime-info.c:704 -#: libgnomevfs/gnome-vfs-mime-info.c:711 libgnomevfs/gnome-vfs-mime-info.c:719 -#: libgnomevfs/gnome-vfs-mime-info.c:726 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:102 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:230 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:281 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:364 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:385 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:405 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:426 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:447 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:540 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:564 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:585 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:606 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:627 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:646 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:665 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:685 +#: ../libgnomevfs/gnome-vfs-mime-handlers.c:705 +#: ../libgnomevfs/gnome-vfs-mime-info.c:631 +#: ../libgnomevfs/gnome-vfs-mime-info.c:638 +#: ../libgnomevfs/gnome-vfs-mime-info.c:646 +#: ../libgnomevfs/gnome-vfs-mime-info.c:653 +#: ../libgnomevfs/gnome-vfs-mime-info.c:661 +#: ../libgnomevfs/gnome-vfs-mime-info.c:678 +#: ../libgnomevfs/gnome-vfs-mime-info.c:685 +#: ../libgnomevfs/gnome-vfs-mime-info.c:692 +#: ../libgnomevfs/gnome-vfs-mime-info.c:699 +#: ../libgnomevfs/gnome-vfs-mime-info.c:707 +#: ../libgnomevfs/gnome-vfs-mime-info.c:714 msgid "" "Deprecated function. User modifications to the MIME database are no longer " "supported." msgstr "تابع ملغى، تعديل المستخدم لقاعدة بيانات MIME لم يعد مدعوماً." -#: libgnomevfs/gnome-vfs-parse-ls.c:666 +#: ../libgnomevfs/gnome-vfs-parse-ls.c:708 #, c-format msgid "Could not parse: %s" msgstr "لم يمكن اعراب: %s" -#: libgnomevfs/gnome-vfs-parse-ls.c:668 +#: ../libgnomevfs/gnome-vfs-parse-ls.c:710 msgid "More parsing errors will be ignored." msgstr "سيتمّ تجاهل أخطاء اﻻعراب القادمة." #. GNOME_VFS_OK -#: libgnomevfs/gnome-vfs-result.c:38 +#: ../libgnomevfs/gnome-vfs-result.c:42 msgid "No error" msgstr "لا خطأ" #. GNOME_VFS_ERROR_NOT_FOUND -#: libgnomevfs/gnome-vfs-result.c:39 +#: ../libgnomevfs/gnome-vfs-result.c:43 msgid "File not found" msgstr "الملفّ غير موجود" #. GNOME_VFS_ERROR_GENERIC -#: libgnomevfs/gnome-vfs-result.c:40 +#: ../libgnomevfs/gnome-vfs-result.c:44 msgid "Generic error" msgstr "خطأ عامّ" #. GNOME_VFS_ERROR_INTERNAL -#: libgnomevfs/gnome-vfs-result.c:41 +#: ../libgnomevfs/gnome-vfs-result.c:45 msgid "Internal error" msgstr "خطأ داخلي" #. GNOME_VFS_ERROR_BAD_PARAMETERS -#: libgnomevfs/gnome-vfs-result.c:42 +#: ../libgnomevfs/gnome-vfs-result.c:46 msgid "Invalid parameters" msgstr "عوامل غير صالحة" #. GNOME_VFS_ERROR_NOT_SUPPORTED -#: libgnomevfs/gnome-vfs-result.c:43 +#: ../libgnomevfs/gnome-vfs-result.c:47 msgid "Unsupported operation" msgstr "عمليّة غير مدعومة" #. GNOME_VFS_ERROR_IO -#: libgnomevfs/gnome-vfs-result.c:44 +#: ../libgnomevfs/gnome-vfs-result.c:48 msgid "I/O error" msgstr "خطأ ادخال/اخراج" #. GNOME_VFS_ERROR_CORRUPTED_DATA -#: libgnomevfs/gnome-vfs-result.c:45 +#: ../libgnomevfs/gnome-vfs-result.c:49 msgid "Data corrupted" msgstr "البيانات معطوبة" #. GNOME_VFS_ERROR_WRONG_FORMAT -#: libgnomevfs/gnome-vfs-result.c:46 +#: ../libgnomevfs/gnome-vfs-result.c:50 msgid "Format not valid" msgstr "التهيئة غير سليمة" #. GNOME_VFS_ERROR_BAD_FILE -#: libgnomevfs/gnome-vfs-result.c:47 +#: ../libgnomevfs/gnome-vfs-result.c:51 msgid "Bad file handle" msgstr "معالجة سيئة للملفّ" #. GNOME_VFS_ERROR_TOO_BIG -#: libgnomevfs/gnome-vfs-result.c:48 +#: ../libgnomevfs/gnome-vfs-result.c:52 msgid "File too big" msgstr "الملفّ كبير جدّا" #. GNOME_VFS_ERROR_NO_SPACE -#: libgnomevfs/gnome-vfs-result.c:49 +#: ../libgnomevfs/gnome-vfs-result.c:53 msgid "No space left on device" msgstr "لا توجد مساحة كافية على الجهاز" #. GNOME_VFS_ERROR_READ_ONLY -#: libgnomevfs/gnome-vfs-result.c:50 +#: ../libgnomevfs/gnome-vfs-result.c:54 msgid "Read-only file system" msgstr "نظام ملفّات للقراءة فقط" #. GNOME_VFS_ERROR_INVALID_URI -#: libgnomevfs/gnome-vfs-result.c:51 +#: ../libgnomevfs/gnome-vfs-result.c:55 msgid "Invalid URI" msgstr "URI غير صحيح" #. GNOME_VFS_ERROR_NOT_OPEN -#: libgnomevfs/gnome-vfs-result.c:52 +#: ../libgnomevfs/gnome-vfs-result.c:56 msgid "File not open" msgstr "الملف غير مفتوح" #. GNOME_VFS_ERROR_INVALID_OPEN_MODE -#: libgnomevfs/gnome-vfs-result.c:53 +#: ../libgnomevfs/gnome-vfs-result.c:57 msgid "Open mode not valid" msgstr "نمط الفتح غير سليم" #. GNOME_VFS_ERROR_ACCESS_DENIED -#: libgnomevfs/gnome-vfs-result.c:54 +#: ../libgnomevfs/gnome-vfs-result.c:58 msgid "Access denied" msgstr "منع النفاذ" #. GNOME_VFS_ERROR_TOO_MANY_OPEN_FILES -#: libgnomevfs/gnome-vfs-result.c:55 +#: ../libgnomevfs/gnome-vfs-result.c:59 msgid "Too many open files" msgstr "الملفات المفتوحة كثيرة جدا" #. GNOME_VFS_ERROR_EOF -#: libgnomevfs/gnome-vfs-result.c:56 +#: ../libgnomevfs/gnome-vfs-result.c:60 msgid "End of file" msgstr "نهاية الملفّ" #. GNOME_VFS_ERROR_NOT_A_DIRECTORY -#: libgnomevfs/gnome-vfs-result.c:57 +#: ../libgnomevfs/gnome-vfs-result.c:61 msgid "Not a directory" msgstr "ليس دليلا" #. GNOME_VFS_ERROR_IN_PROGRESS -#: libgnomevfs/gnome-vfs-result.c:58 +#: ../libgnomevfs/gnome-vfs-result.c:62 msgid "Operation in progress" msgstr "العملية في تقدم" #. GNOME_VFS_ERROR_INTERRUPTED -#: libgnomevfs/gnome-vfs-result.c:59 +#: ../libgnomevfs/gnome-vfs-result.c:63 msgid "Operation interrupted" msgstr "اوقفت العملية" #. GNOME_VFS_ERROR_FILE_EXISTS -#: libgnomevfs/gnome-vfs-result.c:60 +#: ../libgnomevfs/gnome-vfs-result.c:64 msgid "File exists" msgstr "الملف موجود" #. GNOME_VFS_ERROR_LOOP -#: libgnomevfs/gnome-vfs-result.c:61 +#: ../libgnomevfs/gnome-vfs-result.c:65 msgid "Looping links encountered" msgstr "ووجهت وصلات دائرية" #. GNOME_VFS_ERROR_NOT_PERMITTED -#: libgnomevfs/gnome-vfs-result.c:62 +#: ../libgnomevfs/gnome-vfs-result.c:66 msgid "Operation not permitted" msgstr "العمليّة غير مسموح بها" #. GNOME_VFS_ERROR_IS_DIRECTORY -#: libgnomevfs/gnome-vfs-result.c:63 +#: ../libgnomevfs/gnome-vfs-result.c:67 msgid "Is a directory" msgstr "دليل" #. GNOME_VFS_ERROR_NO_MEMORY -#: libgnomevfs/gnome-vfs-result.c:64 +#: ../libgnomevfs/gnome-vfs-result.c:68 msgid "Not enough memory" msgstr "الذاكرة غير كافية" #. GNOME_VFS_ERROR_HOST_NOT_FOUND -#: libgnomevfs/gnome-vfs-result.c:65 +#: ../libgnomevfs/gnome-vfs-result.c:69 msgid "Host not found" msgstr "لم يعثر على المضيف" #. GNOME_VFS_ERROR_INVALID_HOST_NAME -#: libgnomevfs/gnome-vfs-result.c:66 +#: ../libgnomevfs/gnome-vfs-result.c:70 msgid "Host name not valid" msgstr "اسم المضيف غير سليم" #. GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS -#: libgnomevfs/gnome-vfs-result.c:67 +#: ../libgnomevfs/gnome-vfs-result.c:71 msgid "Host has no address" msgstr "ليس للمضيف عنوان" #. GNOME_VFS_ERROR_LOGIN_FAILED -#: libgnomevfs/gnome-vfs-result.c:68 +#: ../libgnomevfs/gnome-vfs-result.c:72 msgid "Login failed" msgstr "فشل التسجيل" #. GNOME_VFS_ERROR_CANCELLED -#: libgnomevfs/gnome-vfs-result.c:69 +#: ../libgnomevfs/gnome-vfs-result.c:73 msgid "Operation cancelled" msgstr "الغيت العملية" #. GNOME_VFS_ERROR_DIRECTORY_BUSY -#: libgnomevfs/gnome-vfs-result.c:70 +#: ../libgnomevfs/gnome-vfs-result.c:74 msgid "Directory busy" msgstr "الدليل مشغول" #. GNOME_VFS_ERROR_DIRECTORY_NOT_EMPTY -#: libgnomevfs/gnome-vfs-result.c:71 +#: ../libgnomevfs/gnome-vfs-result.c:75 msgid "Directory not empty" msgstr "الدليل غير فارغ" #. GNOME_VFS_ERROR_TOO_MANY_LINKS -#: libgnomevfs/gnome-vfs-result.c:72 +#: ../libgnomevfs/gnome-vfs-result.c:76 msgid "Too many links" msgstr "وصلات كثيرة جدا" #. GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM -#: libgnomevfs/gnome-vfs-result.c:73 +#: ../libgnomevfs/gnome-vfs-result.c:77 msgid "Read only file system" msgstr "نظام ملفات للقراءة فقط" #. GNOME_VFS_ERROR_NOT_SAME_FILE_SYSTEM -#: libgnomevfs/gnome-vfs-result.c:74 +#: ../libgnomevfs/gnome-vfs-result.c:78 msgid "Not on the same file system" msgstr "ليس على نفس نظام الملفات" #. GNOME_VFS_ERROR_NAME_TOO_LONG -#: libgnomevfs/gnome-vfs-result.c:75 +#: ../libgnomevfs/gnome-vfs-result.c:79 msgid "Name too long" msgstr "الاسم طويل جدا" #. GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE -#: libgnomevfs/gnome-vfs-result.c:76 +#: ../libgnomevfs/gnome-vfs-result.c:80 msgid "Service not available" msgstr "الخدمة غير متوفرة" #. GNOME_VFS_ERROR_SERVICE_OBSOLETE -#: libgnomevfs/gnome-vfs-result.c:77 +#: ../libgnomevfs/gnome-vfs-result.c:81 msgid "Request obsoletes service's data" msgstr "الطلب ترك بيانات الخدمة" #. GNOME_VFS_ERROR_PROTOCOL_ERROR -#: libgnomevfs/gnome-vfs-result.c:78 +#: ../libgnomevfs/gnome-vfs-result.c:82 msgid "Protocol error" msgstr "خطا في البروتوكول" #. GNOME_VFS_ERROR_NO_MASTER_BROWSER -#: libgnomevfs/gnome-vfs-result.c:79 +#: ../libgnomevfs/gnome-vfs-result.c:83 msgid "Could not find master browser" msgstr "تعذّر إيجاد المتصفح الرئيسي" #. GNOME_VFS_ERROR_NO_DEFAULT -#: libgnomevfs/gnome-vfs-result.c:80 +#: ../libgnomevfs/gnome-vfs-result.c:84 msgid "No default action associated" msgstr "لا عمل إفتراضي مربوط" #. GNOME_VFS_ERROR_NO_HANDLER -#: libgnomevfs/gnome-vfs-result.c:81 +#: ../libgnomevfs/gnome-vfs-result.c:85 msgid "No handler for URL scheme" msgstr "لا معالج لسيمة العنوان (URL)" #. GNOME_VFS_ERROR_PARSE -#: libgnomevfs/gnome-vfs-result.c:82 +#: ../libgnomevfs/gnome-vfs-result.c:86 msgid "Error parsing command line" msgstr "خطأ عند اعراب سطر الأوامر" #. GNOME_VFS_ERROR_LAUNCH -#: libgnomevfs/gnome-vfs-result.c:83 +#: ../libgnomevfs/gnome-vfs-result.c:87 msgid "Error launching command" msgstr "خطأ عند اطلاق الأمر" #. GNOME_VFS_ERROR_TIMEOUT -#: libgnomevfs/gnome-vfs-result.c:84 libgnomevfs/gnome-vfs-result.c:86 +#: ../libgnomevfs/gnome-vfs-result.c:88 msgid "Timeout reached" msgstr "تم الوصول إلى فترة الاستراحة" #. GNOME_VFS_ERROR_NAMESERVER -#: libgnomevfs/gnome-vfs-result.c:85 +#: ../libgnomevfs/gnome-vfs-result.c:89 msgid "Nameserver error" -msgstr "خطأ في نادل التنشيط الاسميّ" +msgstr "خطأ في خادم التنشيط الاسميّ" #. GNOME_VFS_ERROR_LOCKED -#: libgnomevfs/gnome-vfs-result.c:87 +#: ../libgnomevfs/gnome-vfs-result.c:90 msgid "The resource is locked" msgstr "المورد مقفل" #. GNOME_VFS_ERROR_DEPRECATED_FUNCTION -#: libgnomevfs/gnome-vfs-result.c:88 +#: ../libgnomevfs/gnome-vfs-result.c:91 msgid "Function call deprecated" msgstr "استدعاء التابع ملغى" -#: libgnomevfs/gnome-vfs-result.c:203 +#. GNOME_VFS_ERROR_INVALID_FILENAME +#: ../libgnomevfs/gnome-vfs-result.c:92 +#, fuzzy +msgid "Invalid filename" +msgstr "[اسم ملف غير صالح]" + +#. GNOME_VFS_ERROR_NOT_A_SYMBOLIC_LINK +#: ../libgnomevfs/gnome-vfs-result.c:93 +#, fuzzy +msgid "Not a symbolic link" +msgstr "تعذّر إنشاء الخط" + +#: ../libgnomevfs/gnome-vfs-result.c:217 msgid "Unknown error" msgstr "خطأ مجهول" -#: libgnomevfs/gnome-vfs-utils.c:85 +#: ../libgnomevfs/gnome-vfs-utils.c:78 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -521,198 +804,160 @@ msgstr[2] "%u بايتات" msgstr[3] "%u بايت" -#: libgnomevfs/gnome-vfs-utils.c:91 +#: ../libgnomevfs/gnome-vfs-utils.c:84 #, c-format msgid "%.1f KB" msgstr "%.1f كيلوبايت" -#: libgnomevfs/gnome-vfs-utils.c:95 +#: ../libgnomevfs/gnome-vfs-utils.c:88 #, c-format msgid "%.1f MB" -msgstr "%.1f ميغابايت" +msgstr "%.1f ميجابايت" -#: libgnomevfs/gnome-vfs-utils.c:99 +#: ../libgnomevfs/gnome-vfs-utils.c:92 #, c-format msgid "%.1f GB" -msgstr "%.1f جيغابايت" +msgstr "%.1f جيجابايت" -#: libgnomevfs/gnome-vfs-utils.c:1122 -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:369 +#: ../libgnomevfs/gnome-vfs-utils.c:1108 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:382 msgid " (invalid Unicode)" msgstr " (يونوكود غير سليم)" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:551 -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:607 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:564 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:620 msgid "Floppy" msgstr "قرص مرن" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:552 -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:610 -msgid "CD-ROM" -msgstr "قرص مدمج" - -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:554 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:573 #, fuzzy -msgid "CD-R" -msgstr "قرص مدمج" - -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:555 -#, fuzzy -msgid "CD-RW" -msgstr "قرص مدمج" - -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:556 -#, fuzzy -msgid "DVD-ROM" -msgstr "قرص مدمج" - -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:557 -#, fuzzy -msgid "DVD-RAM" -msgstr "قرص DVD-RAM" - -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:558 -#, fuzzy -msgid "DVD-R" -msgstr "قرص فيديو رقمي" - -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:559 -#, fuzzy -msgid "DVD-RW" -msgstr "قرص DVD-RW" - -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:560 -#, fuzzy msgid "CD-ROM/DVD-ROM" -msgstr "قرص مدمج" +msgstr "منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:561 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:574 #, fuzzy msgid "CD-ROM/DVD-RAM" -msgstr "قرص مدمج" +msgstr "فتح منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:562 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:575 #, fuzzy msgid "CD-ROM/DVD-R" -msgstr "قرص مدمج" +msgstr "منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:563 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:576 #, fuzzy msgid "CD-ROM/DVD-RW" -msgstr "قرص مدمج" +msgstr "فتح منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:564 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:577 #, fuzzy msgid "CD-R/DVD-ROM" -msgstr "قرص مدمج" +msgstr "سواقة أقراص مدمجة" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:565 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:578 #, fuzzy msgid "CD-R/DVD-RAM" -msgstr "سجل قرص فيديو رقمي" +msgstr "DVD-R, أو DVD-RAM" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:566 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:579 #, fuzzy msgid "CD-R/DVD-R" -msgstr "سجل قرص فيديو رقمي سجل" +msgstr "منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:567 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:580 #, fuzzy msgid "CD-R/DVD-RW" -msgstr "سجل قرص فيديو رقمي" +msgstr "منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:568 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:581 #, fuzzy msgid "CD-RW/DVD-ROM" -msgstr "قرص مدمج" +msgstr "فتح منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:569 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:582 #, fuzzy msgid "CD-RW/DVD-RAM" -msgstr "قرص فيديو رقمي" +msgstr "فتح منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:570 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:583 #, fuzzy msgid "CD-RW/DVD-R" -msgstr "قرص فيديو رقمي سجل" +msgstr "منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:571 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:584 #, fuzzy msgid "CD-RW/DVD-RW" -msgstr "قرص فيديو رقمي" +msgstr "منشئ الأقراص المدمجة/أقراص الـDVD" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:573 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:586 +#, fuzzy msgid "Disk" -msgstr "" +msgstr "فضاء ال_قرص:" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:574 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:587 #, fuzzy msgid "USB Drive" -msgstr "قرص Zip" +msgstr "السواقة مفتوحة" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:575 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:588 +#, fuzzy msgid "IEEE1394 Drive" -msgstr "" +msgstr "السواقة مفتوحة" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:576 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:589 msgid "CF" msgstr "" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:577 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:590 #, fuzzy msgid "SD/MMC" msgstr "وسيط SD/MMC" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:578 -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:582 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:591 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:595 msgid "Memory Stick" msgstr "إصبع ذاكرة" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:579 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:592 #, fuzzy msgid "Smart Media" -msgstr "وسيط وسيط ذكي" +msgstr "إخراج الوسيط" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:581 -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:613 -msgid "Zip Drive" -msgstr "قرص Zip" - -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:583 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:596 msgid "Camera" msgstr "آلة تصوير" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:584 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:597 msgid "DVD" msgstr "قرص فيديو رقمي" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:807 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:846 msgid "Root Volume" msgstr "الحجم الجذري" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:888 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:927 msgid "Audio CD" msgstr "قرص صوتي" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:921 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:960 msgid "Unknown volume" msgstr "حجم مجهول" -#: libgnomevfs/gnome-vfs-volume-monitor-daemon.c:1109 +#: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:1172 msgid "Network server" -msgstr "نادل شبكة" +msgstr "خادم شبكة" #. Handle floppy case -#: libgnomevfs/gnome-vfs-volume-ops.c:112 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:184 msgid "Unable to mount the floppy drive. There is probably no floppy in the drive." msgstr "لا يمكن تجهيز سواقة الأقراص المرنة. ربما بسبب عدم وجود قرص مرن في السواقة." #. All others -#: libgnomevfs/gnome-vfs-volume-ops.c:116 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:188 msgid "Unable to mount the volume. There is probably no media in the device." msgstr "لا يمكن تجهيز الحجم. ربما لعدم وجود وسيط في السواقة." -#: libgnomevfs/gnome-vfs-volume-ops.c:122 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:194 msgid "" "Unable to mount the floppy drive. The floppy is probably in a format that " "cannot be mounted." @@ -720,64 +965,101 @@ "لا يمكن تجهيز سواقة الأقراص المرنة. ربما بسبب تهيئة القرص المرن التي لا يمكن " "تجهيزها." -#: libgnomevfs/gnome-vfs-volume-ops.c:125 +#. Probably a wrong password +#: ../libgnomevfs/gnome-vfs-volume-ops.c:198 msgid "" +"Unable to mount the volume. If this is an encrypted drive, then the wrong " +"password or key was used." +msgstr "" + +#: ../libgnomevfs/gnome-vfs-volume-ops.c:201 +msgid "" "Unable to mount the selected volume. The volume is probably in a format that " "cannot be mounted." msgstr "لا يمكن تجهيز الحجم المختار. ربما لكون الحجم في تهيئة لا يمكن تجهيزها." -#: libgnomevfs/gnome-vfs-volume-ops.c:130 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:206 msgid "Unable to mount the selected floppy drive." msgstr "لا يمكن تجهيز سواقة الأقراص المرنة المنتقات." -#: libgnomevfs/gnome-vfs-volume-ops.c:132 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:208 msgid "Unable to mount the selected volume." msgstr "لا يمكن تجهيز الحجم المختار." -#: libgnomevfs/gnome-vfs-volume-ops.c:144 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:221 +#, fuzzy +msgid "" +"Unable to unmount the selected volume. The volume is in use by one or more " +"programs." +msgstr "لا يمكن تجهيز الحجم المختار. ربما لكون الحجم في تهيئة لا يمكن تجهيزها." + +#: ../libgnomevfs/gnome-vfs-volume-ops.c:224 msgid "Unable to unmount the selected volume." msgstr "لا يمكن إلغاء تجهيز الحجم المختار." -#: libgnomevfs/gnome-vfs-volume-ops.c:256 -#: libgnomevfs/gnome-vfs-volume-ops.c:302 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:377 +#, fuzzy, c-format +msgid "Failed to read data from child process %d (%s)" +msgstr "فشلت قراءة البيانات من العملية الإبنة" + +#: ../libgnomevfs/gnome-vfs-volume-ops.c:421 +msgid "Couldn't run mount process in a pty" +msgstr "" + +#: ../libgnomevfs/gnome-vfs-volume-ops.c:466 +#, fuzzy, c-format +msgid "Unexpected error in select() reading data from a child process (%s)" +msgstr "خطأ غير متوقع في select() أثناء قراءة البيانات من العملية الإبنة (%s)" + +#: ../libgnomevfs/gnome-vfs-volume-ops.c:520 +msgid "Couldn't send password to mount process." +msgstr "" + +#: ../libgnomevfs/gnome-vfs-volume-ops.c:559 +#, fuzzy, c-format +msgid "Unexpected error in waitpid() (%s)" +msgstr "خطأ غير متوقع في waitpid() (%s)" + +#: ../libgnomevfs/gnome-vfs-volume-ops.c:669 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:755 msgid "Failed to start command" msgstr "فشل تشغيل الأمر" -#: libgnomevfs/gnome-vfs-volume-ops.c:292 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:742 msgid "Unable to eject media" msgstr "لا يمكن طرد الوسيط" -#: libgnomevfs/gnome-vfs-volume-ops.c:481 +#: ../libgnomevfs/gnome-vfs-volume-ops.c:983 msgid "Unable to unmount connected server" -msgstr "لا يمكن إلغاء تجهيز النادل المتصل" +msgstr "لا يمكن إلغاء تجهيز الخادم المتصل" -#: modules/computer-method.c:545 +#: ../modules/computer-method.c:543 msgid "Network" msgstr "الشبكة" -#: modules/computer-method.c:563 +#: ../modules/computer-method.c:561 msgid "Home" msgstr "الدليل المنزلي" -#: modules/computer-method.c:581 +#: ../modules/computer-method.c:579 msgid "Filesystem" msgstr "نظام الملفات" -#: modules/file-method.c:386 +#: ../modules/file-method.c:494 #, c-format msgid "Unknown GnomeVFSSeekPosition %d" msgstr "جنوم VFSSeekPosition مجهول %d" -#: modules/network-method.c:1396 +#: ../modules/network-method.c:1399 msgid "Windows Network" -msgstr "شبكة ونداوس" +msgstr "شبكة ويندوز" -#: modules/sftp-method.c:1346 +#: ../modules/sftp-method.c:1346 #, c-format msgid "The identity of the remote computer (%s) is unknown." msgstr "هويّة الكمبيوتر البعيد (%s) مجهولة." -#: modules/sftp-method.c:1347 +#: ../modules/sftp-method.c:1347 #, c-format msgid "" "This happens when you log in to a computer the first time.\n" @@ -790,54 +1072,72 @@ "الهوية المرسلة للكمبيوتر البعيد هي %s. إذا أردتّ التأكد بشكل مطلق من أنّ " "المتابعة آمنة، اتّصل بمدير النظام." -#: modules/sftp-method.c:1355 +#: ../modules/sftp-method.c:1355 msgid "Log In Anyway" msgstr "تسجيل الدخول بكلّ الأحوال" -#: modules/sftp-method.c:1356 +#: ../modules/sftp-method.c:1356 msgid "Cancel Login" msgstr "إلغاء تسجيل الدخول" #. FIXME: we probably shouldn't use printf to output the message -#: modules/test-method.c:590 +#: ../modules/test-method.c:587 #, c-format msgid "Didn't find a valid settings file at %s\n" msgstr "لم يعثر على ملفّ تعيينات سليم عند %s\n" -#: modules/test-method.c:592 +#: ../modules/test-method.c:589 #, c-format msgid "Use the %s environment variable to specify a different location.\n" msgstr "استخدم المتغيّر البيئي %s لتحديد موقع آخر.\n" -#: monikers/GNOME_VFS_Moniker_std.server.in.in.h:1 -msgid "Standard Moniker factory" -msgstr "مصنع Moniker القياسي" +#: ../programs/authentication.c:106 +#, fuzzy, c-format +msgid "Your HTTP Proxy requires you to log in.\n" +msgstr "بروكسي الـ HTTP يتطلب منك التسجيل.\n" -#: monikers/GNOME_VFS_Moniker_std.server.in.in.h:2 -msgid "file MonikerExtender" -msgstr "ملف MonikerExtender" +#: ../programs/authentication.c:107 +#, fuzzy, c-format +msgid "" +"You must log in to access \"%s\".\n" +"%s" +msgstr "" +"يجب أن تسجل لتنفذ إلى \"%s\".\n" +"%s" -#: monikers/GNOME_VFS_Moniker_std.server.in.in.h:3 -msgid "generic Gnome VFS moniker" -msgstr "VFS moniker عام لجنوم" +#: ../programs/authentication.c:110 +#, fuzzy +msgid "Your password will be transmitted unencrypted." +msgstr "سترسل كلمة سرّك غير مشفّرة." -#: monikers/GNOME_VFS_Moniker_std.server.in.in.h:4 -msgid "generic file moniker" -msgstr "moniker عام للملف" +#: ../programs/authentication.c:111 +#, fuzzy +msgid "Your password will be transmitted encrypted." +msgstr "سترسل كلمة سرّك مشفّرة." -#: schemas/desktop_default_applications.schemas.in.h:1 +#: ../programs/authentication.c:156 +#, fuzzy, c-format +msgid "You must log in to access %s domain %s\n" +msgstr "يجب عليك التسجيل للنفاذ إلى %s النطاق %s\n" + +#: ../programs/authentication.c:158 +#, fuzzy, c-format +msgid "You must log in to access %s\n" +msgstr "يجب عليك التسجيل للنفاذ إلى %s\n" + +#: ../schemas/desktop_default_applications.schemas.in.h:1 msgid "Default component viewer application" msgstr "تطبيق عرض المكونات الإفتراضي" -#: schemas/desktop_default_applications.schemas.in.h:2 +#: ../schemas/desktop_default_applications.schemas.in.h:2 msgid "Default terminal application" msgstr "برنامج الشاشة الطرفية الافتراضي" -#: schemas/desktop_default_applications.schemas.in.h:3 +#: ../schemas/desktop_default_applications.schemas.in.h:3 msgid "Exec argument for default terminal" msgstr "عامل التنفيذ لالشاشة الطرفية الافتراضية" -#: schemas/desktop_default_applications.schemas.in.h:5 +#: ../schemas/desktop_default_applications.schemas.in.h:5 #, no-c-format msgid "" "The application to use for viewing files that require a component to view " @@ -847,101 +1147,101 @@ "التطبيق للاستعمال لعرض الملفات التي تستحق مكونا لعرضها. سيعوض المتغير %s بـ " "URI الملف، كما سيعوض المتغير %c بـ IID المكون." -#: schemas/desktop_default_applications.schemas.in.h:6 +#: ../schemas/desktop_default_applications.schemas.in.h:6 msgid "" "The default terminal application to use for applications that require a " "terminal." msgstr "الشاشة الطرفية الافتراضية التي ستستعمل لالتطبيقات التي تتطلب شاشة طرفية." -#: schemas/desktop_default_applications.schemas.in.h:7 +#: ../schemas/desktop_default_applications.schemas.in.h:7 msgid "The exec argument to use for the default terminal application." msgstr "عمال التنفيذ للاستعمال من طرف الشاشة الطرفية الافتراضية." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:1 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:1 msgid "Run the command in a terminal" msgstr "تشغيل الأمر في شاشة طرفية" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:2 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:2 msgid "The command used to handle \"aim\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"aim\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:3 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:3 msgid "The command used to handle \"callto\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"callto\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:4 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:4 msgid "The command used to handle \"ghelp\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"ghelp\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:5 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:5 msgid "The command used to handle \"h323\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"h323\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:6 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:6 msgid "The command used to handle \"http\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"http\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:7 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:7 msgid "The command used to handle \"https\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"https\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:8 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:8 msgid "The command used to handle \"info\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"info\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:9 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:9 msgid "The command used to handle \"mailto\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"mailto\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:10 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:10 msgid "The command used to handle \"man\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"man\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:11 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:11 msgid "The command used to handle \"trash\" URLs, if enabled." msgstr "الأمر المستخدم لمعالجة عناوين \"trash\"، في حال تمكينها." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:12 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:12 msgid "The handler for \"aim\" URLs" msgstr "معالج عناوين \"aim\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:13 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:13 msgid "The handler for \"callto\" URLs" msgstr "معالج عناوين \"callto\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:14 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:14 msgid "The handler for \"ghelp\" URLs" msgstr "معالج عناوين \"ghelp\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:15 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:15 msgid "The handler for \"h323\" URLs" msgstr "معالج عناوين \"h323\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:16 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:16 msgid "The handler for \"http\" URLs" msgstr "معالج عناوين \"http\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:17 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:17 msgid "The handler for \"https\" URLs" msgstr "معالج عناوين \"https\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:18 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:18 msgid "The handler for \"info\" URLs" msgstr "معالج عناوين \"info\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:19 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:19 msgid "The handler for \"mailto\" URLs" msgstr "معالج عناوين \"mailto\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:20 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:20 msgid "The handler for \"man\" URLs" msgstr "معالج عناوين \"man\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:21 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:21 msgid "The handler for \"trash\" URLs" msgstr "معالج عناوين \"trash\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:22 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:22 msgid "" "True if the command specified in the \"command\" key should handle \"aim\" " "URLs." @@ -949,7 +1249,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"aim\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:23 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:23 msgid "" "True if the command specified in the \"command\" key should handle \"callto" "\" URLs." @@ -957,7 +1257,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"callto\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:24 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:24 msgid "" "True if the command specified in the \"command\" key should handle \"ghelp\" " "URLs." @@ -965,7 +1265,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"ghelp\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:25 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:25 msgid "" "True if the command specified in the \"command\" key should handle \"h323\" " "URLs." @@ -973,7 +1273,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"h323\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:26 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:26 msgid "" "True if the command specified in the \"command\" key should handle \"http\" " "URLs." @@ -981,7 +1281,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"http\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:27 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:27 msgid "" "True if the command specified in the \"command\" key should handle \"https\" " "URLs." @@ -989,7 +1289,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"https\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:28 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:28 msgid "" "True if the command specified in the \"command\" key should handle \"info\" " "URLs." @@ -997,7 +1297,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"info\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:29 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:29 msgid "" "True if the command specified in the \"command\" key should handle \"mailto" "\" URLs." @@ -1005,7 +1305,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"mailto\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:30 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:30 msgid "" "True if the command specified in the \"command\" key should handle \"man\" " "URLs." @@ -1013,7 +1313,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"man\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:31 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:31 msgid "" "True if the command specified in the \"command\" key should handle \"trash\" " "URLs." @@ -1021,7 +1321,7 @@ "إضبط لـtrue إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين " "\"trash\"." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:32 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:32 msgid "" "True if the command used to handle this type of URL should be run in a " "terminal." @@ -1029,187 +1329,190 @@ "إضبط لـtrue إذا كان على الأمر المستخدم لمعالجة هذا النوع من العناوين العمل " "في شاشة طرفية." -#: schemas/desktop_gnome_url_handlers.schemas.in.h:33 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:33 msgid "Whether the specified command should handle \"aim\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"aim\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:34 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:34 msgid "Whether the specified command should handle \"callto\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"callto\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:35 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:35 msgid "Whether the specified command should handle \"ghelp\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"ghelp\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:36 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:36 msgid "Whether the specified command should handle \"h323\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"h323\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:37 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:37 msgid "Whether the specified command should handle \"http\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"http\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:38 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:38 msgid "Whether the specified command should handle \"https\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"https\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:39 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:39 msgid "Whether the specified command should handle \"info\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"info\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:40 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:40 msgid "Whether the specified command should handle \"mailto\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"mailto\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:41 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:41 msgid "Whether the specified command should handle \"man\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"man\"" -#: schemas/desktop_gnome_url_handlers.schemas.in.h:42 +#: ../schemas/desktop_gnome_url_handlers.schemas.in.h:42 msgid "Whether the specified command should handle \"trash\" URLs" msgstr "فيما إذا كان على الأمر المحدّد معالجة عناوين \"trash\"" -#: schemas/system_dns_sd.schemas.in.h:1 +#: ../schemas/system_dns_sd.schemas.in.h:1 +#, fuzzy msgid "" -"Comma separated list of dns-sd domains that should be visible in the network " -"location." +"Comma separated list of DNS-SD domains that should be visible in the " +"\"network:///\" location." msgstr "" "قائمة بأسماء مفصولة بفواصل من ميادين dns-sd التي يجب أن تكون مرئيّة في موقع " "الشبكة." -#: schemas/system_dns_sd.schemas.in.h:2 -msgid "Extra domains to look for dns-sd services in" +#: ../schemas/system_dns_sd.schemas.in.h:2 +#, fuzzy +msgid "Extra domains to look for DNS-SD services in" msgstr "ميادين إضافية للبحث عن خدمات dns-sd فيها" -#: schemas/system_dns_sd.schemas.in.h:3 +#: ../schemas/system_dns_sd.schemas.in.h:3 msgid "How to display local DNS-SD service" msgstr "كيفية عرض خدمة DNS-SD المحلية" -#: schemas/system_dns_sd.schemas.in.h:4 +#: ../schemas/system_dns_sd.schemas.in.h:4 msgid "Possible values are \"merged\", \"separate\" and \"disabled\"." msgstr "القيم الممكنة هي \"merged\"، \"separate\"، و \"disabled\"." -#: schemas/system_http_proxy.schemas.in.h:1 +#: ../schemas/system_http_proxy.schemas.in.h:1 msgid "Authenticate proxy server connections" -msgstr "توثق من الاتصلات لنادل البروكسي" +msgstr "توثق من الاتصلات لخادم البروكسي" -#: schemas/system_http_proxy.schemas.in.h:2 +#: ../schemas/system_http_proxy.schemas.in.h:2 msgid "Automatic proxy configuration URL" msgstr "عنوان الإعداد الآلي للبروكسي" -#: schemas/system_http_proxy.schemas.in.h:3 +#: ../schemas/system_http_proxy.schemas.in.h:3 msgid "Enables the proxy settings when accessing HTTP over the Internet." msgstr "تفعيل تعيينات البروكسي عند النفاذ لـ http عبر الانترنت." -#: schemas/system_http_proxy.schemas.in.h:4 +#: ../schemas/system_http_proxy.schemas.in.h:4 msgid "FTP proxy host name" msgstr "اسم مضيف بروكسي الـ FTP" -#: schemas/system_http_proxy.schemas.in.h:5 +#: ../schemas/system_http_proxy.schemas.in.h:5 msgid "FTP proxy port" msgstr "منفذ بروكسي الـ FTP" -#: schemas/system_http_proxy.schemas.in.h:6 +#: ../schemas/system_http_proxy.schemas.in.h:6 msgid "HTTP proxy host name" msgstr "اسم مضيف بروكسي الـ HTTP" -#: schemas/system_http_proxy.schemas.in.h:7 +#: ../schemas/system_http_proxy.schemas.in.h:7 msgid "HTTP proxy password" msgstr "كلمة سر بروكسي الـ HTTP" -#: schemas/system_http_proxy.schemas.in.h:8 +#: ../schemas/system_http_proxy.schemas.in.h:8 msgid "HTTP proxy port" msgstr "منفذ بروكسي الـ HTTP" -#: schemas/system_http_proxy.schemas.in.h:9 +#: ../schemas/system_http_proxy.schemas.in.h:9 msgid "HTTP proxy username" msgstr "اسم مستخدم بروكسي الـ HTTP" -#: schemas/system_http_proxy.schemas.in.h:10 +#: ../schemas/system_http_proxy.schemas.in.h:10 +#, fuzzy msgid "" "If true, then connections to the proxy server require authentication. The " -"username/password combo defined by \"/system/http_proxy/authentication_user" -"\" and \"/system/http_proxy/authentication_password\"." +"username/password combo is defined by \"/system/http_proxy/" +"authentication_user\" and \"/system/http_proxy/authentication_password\"." msgstr "" -"اذا ضبط لـ true، فستطلب الاتصلات لنادل البروكسي التوثيق. مجموعةالـ username/" +"اذا ضبط لـ true، فستطلب الاتصلات لخادم البروكسي التوثيق. مجموعةالـ username/" "password المعرف بـ \"/system/http_proxy/authentication_user\"·و·\"/system/" "http_proxy/authentication_password\"." -#: schemas/system_http_proxy.schemas.in.h:11 +#: ../schemas/system_http_proxy.schemas.in.h:11 msgid "Non-proxy hosts" msgstr "مضيفين ليسو مضيفي بروكسي" -#: schemas/system_http_proxy.schemas.in.h:12 +#: ../schemas/system_http_proxy.schemas.in.h:12 msgid "Password to pass as authentication when doing HTTP proxying." msgstr "كلمة السر التي ستمرر للتوثق عند القيام ببروكسية الـ http." -#: schemas/system_http_proxy.schemas.in.h:13 +#: ../schemas/system_http_proxy.schemas.in.h:13 msgid "Proxy configuration mode" msgstr "نمط إعداد البروكسي" -#: schemas/system_http_proxy.schemas.in.h:14 +#: ../schemas/system_http_proxy.schemas.in.h:14 msgid "SOCKS proxy host name" msgstr "اسم مضيف بروكسي SOCKS" -#: schemas/system_http_proxy.schemas.in.h:15 +#: ../schemas/system_http_proxy.schemas.in.h:15 msgid "SOCKS proxy port" msgstr "منفذ بروكسي SOCKS" -#: schemas/system_http_proxy.schemas.in.h:16 +#: ../schemas/system_http_proxy.schemas.in.h:16 msgid "Secure HTTP proxy host name" msgstr "اسم مضيف بروكسي HTTP آمن" -#: schemas/system_http_proxy.schemas.in.h:17 +#: ../schemas/system_http_proxy.schemas.in.h:17 msgid "Secure HTTP proxy port" msgstr "منفذ بروكسي HTTP آمن" -#: schemas/system_http_proxy.schemas.in.h:18 +#: ../schemas/system_http_proxy.schemas.in.h:18 msgid "" "Select the proxy configuration mode. Supported values are \"none\", \"manual" "\", \"auto\"." msgstr "اختر نسق إعداد البروكسي. القيم المدعومة هي \"لا شيئ\" و \"يدوي\" و \"آلي\"." -#: schemas/system_http_proxy.schemas.in.h:19 +#: ../schemas/system_http_proxy.schemas.in.h:19 msgid "The machine name to proxy FTP through." msgstr "اسم الجهاز الذي سيقع بروكسية الـ FTP عبره." -#: schemas/system_http_proxy.schemas.in.h:20 +#: ../schemas/system_http_proxy.schemas.in.h:20 msgid "The machine name to proxy HTTP through." msgstr "اسم الجهاز الذي سيقع بروكسية الـ HTTP عبره." -#: schemas/system_http_proxy.schemas.in.h:21 +#: ../schemas/system_http_proxy.schemas.in.h:21 msgid "The machine name to proxy secure HTTP through." msgstr "اسم الجهاز الذي سيقع عبره بروكسية آمنة للـ HTTP." -#: schemas/system_http_proxy.schemas.in.h:22 +#: ../schemas/system_http_proxy.schemas.in.h:22 msgid "The machine name to proxy socks through." msgstr "اسم الجهاز الذي سيقع بركسية socks·عبره." -#: schemas/system_http_proxy.schemas.in.h:23 +#: ../schemas/system_http_proxy.schemas.in.h:23 msgid "" "The port on the machine defined by \"/system/http_proxy/host\" that you " "proxy through." msgstr "منفذ الجهاز المعرف بـ \"/system/http_proxy/host\" و الذي تبروكسي عبره." -#: schemas/system_http_proxy.schemas.in.h:24 +#: ../schemas/system_http_proxy.schemas.in.h:24 msgid "" "The port on the machine defined by \"/system/proxy/ftp_host\" that you proxy " "through." msgstr "منفذ الجهاز المعرف بـ \"/system/proxy/ftp_host\" و الذي تبروكسي عبره." -#: schemas/system_http_proxy.schemas.in.h:25 +#: ../schemas/system_http_proxy.schemas.in.h:25 msgid "" "The port on the machine defined by \"/system/proxy/secure_host\" that you " "proxy through." msgstr "منفذ الحاسوب المعرف بـ \"/system/proxy/secure_host\" والذيتبروكسي عبره." -#: schemas/system_http_proxy.schemas.in.h:26 +#: ../schemas/system_http_proxy.schemas.in.h:26 msgid "" "The port on the machine defined by \"/system/proxy/socks_host\" that you " "proxy through." msgstr "منفذ الجهاز المعرف بـ \"/system/proxy/socks_host\" و الذي تبروكسي عبره." -#: schemas/system_http_proxy.schemas.in.h:27 +#: ../schemas/system_http_proxy.schemas.in.h:27 msgid "" "This key contains a list of hosts which are connected to directly, rather " "than via the proxy (if it is active). The values can be hostnames, domains " @@ -1221,23 +1524,26 @@ "(باستخدام وايلدكارد أولية مثل *.foo.com)، عناوين مضيفي الـ IP(IPv4 و IPv6) " "أو عناوين شبكة (مثل 192.168.0.0/24)." -#: schemas/system_http_proxy.schemas.in.h:28 +#: ../schemas/system_http_proxy.schemas.in.h:28 msgid "URL that provides proxy configuration values." msgstr "العنوان المزود لقيم إعدادات البروكسي." -#: schemas/system_http_proxy.schemas.in.h:29 +#: ../schemas/system_http_proxy.schemas.in.h:29 msgid "Use HTTP proxy" msgstr "استخدم بروكسي HTTP" -#: schemas/system_http_proxy.schemas.in.h:30 +#: ../schemas/system_http_proxy.schemas.in.h:30 msgid "User name to pass as authentication when doing HTTP proxying." msgstr "اسم المستخدم الذي سيمرر عند القيام ببروكسية الـ HTTP." -#: schemas/system_smb.schemas.in.h:1 +#: ../schemas/system_smb.schemas.in.h:1 msgid "SMB workgroup" msgstr "مجموعة عمل SMB (صمبا)" -#: schemas/system_smb.schemas.in.h:2 -msgid "The window workgroup the user is part of" -msgstr "نافذة مجموعة العملالتي لا ينتمي إليها المستخدم" +#: ../schemas/system_smb.schemas.in.h:2 +msgid "" +"The Windows networking workgroup or domain that the user is part of. In " +"order for a new workgroup to fully take effect the user may need to log out " +"and log back in." +msgstr "" Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/he.po =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/he.po 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/he.po 2006-11-21 16:04:24 UTC (rev 8239) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: gnome-vfs.HEAD.he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-16 11:10+0300\n" +"POT-Creation-Date: 2006-11-01 14:06+0200\n" "PO-Revision-Date: 2004-03-25 23:10+0000\n" "Last-Translator: Gil Osher <dolfin at rpg.org.il>\n" "Language-Team: Hebrew <he at li.org>\n" @@ -25,40 +25,40 @@ msgstr "כרך ISO 9660" #: ../libgnomevfs/gnome-vfs-configuration.c:225 -#, fuzzy, c-format +#, c-format msgid "%s:%u contains NUL characters." -msgstr "%s:%d מכיל תווים ריקים." +msgstr "%s:%u contains NUL characters." #: ../libgnomevfs/gnome-vfs-configuration.c:242 -#, fuzzy, c-format +#, c-format msgid "%s:%u contains no method name." -msgstr "%s:%d לא מכיל שם שיטה." +msgstr "%s:%u contains no method name." #: ../libgnomevfs/gnome-vfs-configuration.c:282 #, c-format msgid "%s:%u has no options endmarker." -msgstr "" +msgstr "%s:%u has no options endmarker." #: ../libgnomevfs/gnome-vfs-configuration.c:293 #, c-format msgid "%s:%u has unknown options %s." -msgstr "" +msgstr "%s:%u has unknown options %s." #: ../libgnomevfs/gnome-vfs-configuration.c:312 -#, fuzzy, c-format +#, c-format msgid "%s:%u contains no module name." -msgstr "%s: %d לא מכיל שם מודול." +msgstr "%s:%u contains no module name." #: ../libgnomevfs/gnome-vfs-configuration.c:363 #, c-format msgid "Configuration file `%s' was not found: %s" -msgstr "קובץ ההגדרות '%s' לא נמצא: %s" +msgstr "Configuration file `%s' was not found: %s" #. stop parsing if we failed #: ../libgnomevfs/gnome-vfs-configuration.c:382 #, c-format msgid "%s:%d aborted parsing." -msgstr "" +msgstr "%s:%d aborted parsing." #: ../libgnomevfs/gnome-vfs-filesystem-type.c:39 msgid "AFFS Volume" @@ -86,9 +86,8 @@ msgstr "כרך התקן חומרה" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:46 -#, fuzzy msgid "EncFS Volume" -msgstr "כרך JFS" +msgstr "כרך EncFS" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:47 #: ../libgnomevfs/gnome-vfs-filesystem-type.c:48 @@ -107,9 +106,8 @@ #: ../libgnomevfs/gnome-vfs-filesystem-type.c:51 #: ../libgnomevfs/gnome-vfs-filesystem-type.c:59 -#, fuzzy msgid "BSD Volume" -msgstr "כרך MSDOS" +msgstr "כרך BSD" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:52 #: ../libgnomevfs/gnome-vfs-filesystem-type.c:53 @@ -158,9 +156,8 @@ msgstr "כרך Netware" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:71 -#, fuzzy msgid "Reiser4 Linux Volume" -msgstr "כרך ReiserFS לינוקס" +msgstr "כרך Reiser4 לינוקס" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:72 msgid "ReiserFS Linux Volume" @@ -191,14 +188,12 @@ msgstr "כרך Pcfs סולאריס" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:79 -#, fuzzy msgid "Sun SAM-QFS Volume" -msgstr "כרך AFFS" +msgstr "כרך SAM-QFS" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:80 -#, fuzzy msgid "Temporary Volume" -msgstr "כרך זיכרון" +msgstr "כרך זמני" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:81 msgid "Enhanced DOS Volume" @@ -221,9 +216,8 @@ msgstr "כרך XIAFS" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:86 -#, fuzzy msgid "CIFS Volume" -msgstr "כרך XIAFS" +msgstr "כרך CIFS" #: ../libgnomevfs/gnome-vfs-filesystem-type.c:114 msgid "Unknown" @@ -231,9 +225,9 @@ #: ../libgnomevfs/gnome-vfs-hal-mounts.c:354 #: ../libgnomevfs/gnome-vfs-hal-mounts.c:580 -#, fuzzy, c-format +#, c-format msgid "%s Volume" -msgstr "כרך DVD" +msgstr "כרך %s" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:370 #: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:565 @@ -288,14 +282,14 @@ msgstr "DVD±RW" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:397 -#, fuzzy, c-format +#, c-format msgid "%s/%s Drive" -msgstr "כונן Zip" +msgstr "כונן %s/%s" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:399 -#, fuzzy, c-format +#, c-format msgid "%s Drive" -msgstr "כונן Zip" +msgstr "כונן %s" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:404 msgid "Floppy Drive" @@ -303,17 +297,15 @@ #: ../libgnomevfs/gnome-vfs-hal-mounts.c:407 msgid "Compact Flash Drive" -msgstr "" +msgstr "כונן פלאש קומפקטי" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:409 -#, fuzzy msgid "Memory Stick Drive" -msgstr "מקל זיכרון" +msgstr "כונן מקל זיכרון" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:411 -#, fuzzy msgid "Smart Media Drive" -msgstr "מקל זיכרון" +msgstr "כונן מדיה חכמה" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:413 msgid "SD/MMC Drive" @@ -421,19 +413,18 @@ msgstr "דיסק אודיו" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:578 -#, fuzzy, c-format +#, c-format msgid "%s Removable Volume" -msgstr "כרך מערכת" +msgstr "כרך ניתן להסרה %s" #: ../libgnomevfs/gnome-vfs-hal-mounts.c:589 -#, fuzzy msgid "Volume" -msgstr "כרך JFS" +msgstr "כרך" #: ../libgnomevfs/gnome-vfs-job.c:734 -#, fuzzy, c-format +#, c-format msgid "Unknown operation type %u" -msgstr "סוג op לא ידוע %u" +msgstr "Unknown operation type %u" #: ../libgnomevfs/gnome-vfs-job.c:1025 ../libgnomevfs/gnome-vfs-job.c:1176 #, c-format @@ -726,7 +717,7 @@ #. GNOME_VFS_ERROR_TIMEOUT #: ../libgnomevfs/gnome-vfs-result.c:88 msgid "Timeout reached" -msgstr "" +msgstr "Timeout reached" #. GNOME_VFS_ERROR_NAMESERVER #: ../libgnomevfs/gnome-vfs-result.c:89 @@ -736,7 +727,7 @@ #. GNOME_VFS_ERROR_LOCKED #: ../libgnomevfs/gnome-vfs-result.c:90 msgid "The resource is locked" -msgstr "" +msgstr "The resource is locked" #. GNOME_VFS_ERROR_DEPRECATED_FUNCTION #: ../libgnomevfs/gnome-vfs-result.c:91 @@ -745,11 +736,15 @@ #. GNOME_VFS_ERROR_INVALID_FILENAME #: ../libgnomevfs/gnome-vfs-result.c:92 -#, fuzzy msgid "Invalid filename" -msgstr "פרמטרים לא תקניים" +msgstr "Invalid filename" -#: ../libgnomevfs/gnome-vfs-result.c:216 +#. GNOME_VFS_ERROR_NOT_A_SYMBOLIC_LINK +#: ../libgnomevfs/gnome-vfs-result.c:93 +msgid "Not a symbolic link" +msgstr "Not a symbolic link" + +#: ../libgnomevfs/gnome-vfs-result.c:217 msgid "Unknown error" msgstr "שגיאה לא ידועה" @@ -859,9 +854,8 @@ msgstr "מקל זיכרון" #: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:592 -#, fuzzy msgid "Smart Media" -msgstr "מקל זיכרון" +msgstr "מדיה חכמה" #: ../libgnomevfs/gnome-vfs-volume-monitor-daemon.c:596 msgid "Camera" @@ -911,6 +905,8 @@ "Unable to mount the volume. If this is an encrypted drive, then the wrong " "password or key was used." msgstr "" +"Unable to mount the volume. If this is an encrypted drive, then the wrong " +"password or key was used." #: ../libgnomevfs/gnome-vfs-volume-ops.c:201 msgid "" @@ -927,11 +923,10 @@ msgstr "לא ניתן לחבר את הכרך הנבחר." #: ../libgnomevfs/gnome-vfs-volume-ops.c:221 -#, fuzzy msgid "" "Unable to unmount the selected volume. The volume is in use by one or more " "programs." -msgstr "לא ניתן לחבר את הכרך הנבחר. כנראה הכרך באיתחול שלא יכול להתחבר." +msgstr "לא ניתן לנתק את הכרך הנבחר. הכרך נימצא בשימוש על ידי יישום אחד או יותר.." #: ../libgnomevfs/gnome-vfs-volume-ops.c:224 msgid "Unable to unmount the selected volume." @@ -940,11 +935,11 @@ #: ../libgnomevfs/gnome-vfs-volume-ops.c:377 #, c-format msgid "Failed to read data from child process %d (%s)" -msgstr "" +msgstr "Failed to read data from child process %d (%s)" #: ../libgnomevfs/gnome-vfs-volume-ops.c:421 msgid "Couldn't run mount process in a pty" -msgstr "" +msgstr "Couldn't run mount process in a pty" #: ../libgnomevfs/gnome-vfs-volume-ops.c:466 #, c-format @@ -953,7 +948,7 @@ #: ../libgnomevfs/gnome-vfs-volume-ops.c:520 msgid "Couldn't send password to mount process." -msgstr "" +msgstr "Couldn't send password to mount process." #: ../libgnomevfs/gnome-vfs-volume-ops.c:559 #, c-format @@ -985,7 +980,7 @@ msgid "Filesystem" msgstr "מערכת קבצים" -#: ../modules/file-method.c:491 +#: ../modules/file-method.c:494 #, c-format msgid "Unknown GnomeVFSSeekPosition %d" msgstr "GnomeVFSSeekPosition לא ידוע %d" @@ -997,7 +992,7 @@ #: ../modules/sftp-method.c:1346 #, c-format msgid "The identity of the remote computer (%s) is unknown." -msgstr "" +msgstr "הזהות של המחשב המרוחק (%s) אינה ידועה" #: ../modules/sftp-method.c:1347 #, c-format @@ -1007,6 +1002,9 @@ "The identity sent by the remote computer is %s. If you want to be absolutely " "sure it is safe to continue, contact the system administrator." msgstr "" +"מצב זה קורה כאשר מתחברים למחשב בפעם הראשונה.\n" +"\n" +"הזהות שנשלחה על ידי המחשב המרוחק היא %s. על מנת לדעת האם זה בטוח לחלוטין להמשיך, יש ליצור קשר עם מנהל המערכת." #: ../modules/sftp-method.c:1355 msgid "Log In Anyway" @@ -1030,7 +1028,7 @@ #: ../programs/authentication.c:106 #, c-format msgid "Your HTTP Proxy requires you to log in.\n" -msgstr "" +msgstr "Your HTTP Proxy requires you to log in.\n" #: ../programs/authentication.c:107 #, c-format @@ -1038,24 +1036,26 @@ "You must log in to access \"%s\".\n" "%s" msgstr "" +"You must log in to access \"%s\".\n" +"%s" #: ../programs/authentication.c:110 msgid "Your password will be transmitted unencrypted." -msgstr "" +msgstr "Your password will be transmitted unencrypted." #: ../programs/authentication.c:111 msgid "Your password will be transmitted encrypted." -msgstr "" +msgstr "Your password will be transmitted encrypted." #: ../programs/authentication.c:156 #, c-format msgid "You must log in to access %s domain %s\n" -msgstr "" +msgstr "You must log in to access %s domain %s\n" #: ../programs/authentication.c:158 #, c-format msgid "You must log in to access %s\n" -msgstr "" +msgstr "You must log in to access %s\n" #: ../schemas/desktop_default_applications.schemas.in.h:1 msgid "Default component viewer application" Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/pl.po =================================================================== --- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/pl.po 2006-11-21 15:42:45 UTC (rev 8238) +++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/po/pl.po 2006-11-21 16:04:24 UTC (rev 8239) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: gnome-vfs.HEAD.pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-16 00:19+0200\n" +"POT-Creation-Date: 2006-11-12 16:14+0100\n" "PO-Revision-Date: 2006-08-13 13:40+0200\n" "Last-Translator: Artur Flinta <aflinta at at.kernel.pl>\n" "Language-Team: Polish <translators at gnomepl.org>\n" @@ -992,7 +992,7 @@ msgid "Filesystem" msgstr "System plików" -#: ../modules/file-method.c:491 +#: ../modules/file-method.c:494 #, c-format msgid "Unknown GnomeVFSSeekPosition %d" msgstr "Nieznana wartość %d GnomeVFSSeekPosition"
- Previous message: [maemo-commits] r8238 - projects/haf/trunk/gazpacho-hildon/resources
- Next message: [maemo-commits] r8240 - projects/haf/trunk/maemo-theme-default
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]