--- nautilus-share-0.7.2.orig/debian/README.Debian +++ nautilus-share-0.7.2/debian/README.Debian @@ -0,0 +1,20 @@ +nautilus-share for Debian +------------------------- + +A quick and easy way to have it running (must be done as root): + +#export USERSHARES_DIR="/var/lib/samba/usershares" +#export USERSHARES_GROUP="sambashare" +#mkdir ${USERSHARES_DIR} +#groupadd ${USERSHARES_GROUP} +#chown root:${USERSHARES_GROUP} ${USERSHARES_DIR} +#chmod 01770 ${USERSHARES_DIR} +#mv /etc/samba/smb.conf{,.bak} +#cp /usr/share/doc/nautilus-share/examples/smb.conf /etc/samba/ +#/etc/init.d/samba restart + +You must add users who can share folder in the usershare group, in this example the group is "sambashare": + +#usermod -a -G sambashare your_username + + -- Chow Loong Jin , + Federico Mena Quintero +Upstream-Source: http://gentoo.ovibes.net/nautilus-share/ + +Files: * +Copyright: Copyright 2005 Ethium, Inc. +License: GPL-2+ + This package 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; either version 2 of the License, or + (at your option) any later version. + . + This package 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 for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, a full copy of this license can be found in + /usr/share/common-licenses/GPL-2 + +Files: debian/* +Copyright: Copyright 2007-2008, Thierry Randrianiriana +Copyright: Copyright 2009, Chow Loong Jin +License: GPL-2+ + --- nautilus-share-0.7.2.orig/debian/README.source +++ nautilus-share-0.7.2/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- nautilus-share-0.7.2.orig/debian/changelog +++ nautilus-share-0.7.2/debian/changelog @@ -0,0 +1,189 @@ +nautilus-share (0.7.2-12) unstable; urgency=low + + * debian/patches/02_install_missing_samba.patch: + + Correct spelling "ou" to "you" + * debian/control: + + No change Standards-Version bump to 3.8.3 + * debian/README.source: + + Copied from /usr/share/doc/quilt to satisfy lintian + * debian/patches/12_undoable-action.patch: + + Fix "Create Share" wording to "Create _Share" which resulted in + untranslated strings. + * debian/patches/14_glade-to-gtkbuilder.patch: + + Transition po files properly, and patch .ui file in instead of + auto-generating it. Also, manually specify gettext domain for GtkBuilder. + Fixes issue where interface loaded from GtkBuilder file is untranslated. + (LP: #425677) + + -- Chow Loong Jin Tue, 08 Sep 2009 03:32:03 +0800 + +nautilus-share (0.7.2-11) unstable; urgency=low + + * debian/control: + + Add samba-common-bin to binary dependencies, since testparm has been + moved to samba-common-bin (Closes: #536271) + + -- Chow Loong Jin Thu, 09 Jul 2009 13:03:49 +0800 + +nautilus-share (0.7.2-10) unstable; urgency=low + + * debian/patches/12_undoable-action.patch: + + Fix bug where user is unable to undo sharing/unsharing a folder without + closing the property window (LP: #392165) + * debian/patches/13_permissions.patch: + + Don't require permissions go+rx on folders to be shared any more, since + * debian/patches/14_glade-to-gtkbuilder.patch: + + Migrate from glade to gtkbuilder + samba doesn't appear to have that requirement + * debian/patches/*.patch: + + Organize/Add information to patch headers as per DEP-3 + * debian/control: + + Drop libglade2-dev build dependency + + -- Chow Loong Jin Wed, 01 Jul 2009 05:16:40 +0800 + +nautilus-share (0.7.2-9) unstable; urgency=low + + * debian/patches/05_dependencies.patch, 11_use-gio.patch: + + Drop GnomeVFS dependency and use GIO instead. Thanks Andreas Henriksson + for the patch + * debian/control: + + Bump Standards-Version to 3.8.2 + + Add Enhances: nautilus + + Drop libgnomevfs2-dev build-dependency + + -- Chow Loong Jin Mon, 22 Jun 2009 01:18:11 +0800 + +nautilus-share (0.7.2-8) unstable; urgency=low + + * debian/patches/10_fix-writable-detection.patch: + + Fix parsing of share writability from the output of net (LP: #280480) + * debian/rules: + + Add -Wl,-z,defs to LDFLAGS + + -- Chow Loong Jin Sun, 21 Jun 2009 16:37:48 +0800 + +nautilus-share (0.7.2-7) unstable; urgency=low + + * debian/patches/08_change-confusing-wording.patch: + + Change some confusing wording: "Allow other people to write in this + folder" to "Allow others to make changes in this folder" + (LP: #385801) + * debian/patches/09_change-comments-location.patch: + + Change confusing position of "Comment" field (LP: #385801) + * debian/patches/*.patch: + + Amend patch headers, the top line was accidentally excluded from all of + them + * debian/control: + + Change of email address in Maintainer field + + -- Chow Loong Jin Fri, 12 Jun 2009 00:51:17 +0800 + +nautilus-share (0.7.2-6) unstable; urgency=low + + * debian/control: + + Bumped up samba suggests to 3.0.27a + + Depends on samba-common 3.0.27a for "net" binary + * debian/patches/*: + + Add descriptions to patches + * debian/patches/01_fix_install_dir.patch: + + Drop FIXME lines from Makefile.am and Makefile.in, since it's fixed + + Fix Makefile.in to grab extensiondir from pkg-config as well + + Use $(PKG_CONFIG) instead of pkg-config directly + * debian/patches/02_install_missing_samba.patch: + + Rewritten to fix LP: #258570, and also be more robust when attempting to + enable sharing of multiple directories while installing samba. + * debian/patches/07_set-title.patch: + + Manually set the title of the Sharing Options dialog so that it can be + translated (LP: #356191) + + -- Chow Loong Jin Mon, 11 May 2009 00:55:13 +0800 + +nautilus-share (0.7.2-5) unstable; urgency=low + + * debian/control, + debian/patches/05_dependencies.patch: + + Drop libeel dependency (Closes: #525543) + * debian/control: + + Bump Standards-Version + + -- Chow Loong Jin Mon, 27 Apr 2009 03:22:34 +0800 + +nautilus-share (0.7.2-4) unstable; urgency=low + + * debian/patches/06_fix-validation.patch: + + Fix issue where field validation errors aren't cleared after being + corrected + * debian/patches/02_install_missing_samba.patch: + + Ask to retry if installation failed + + -- Chow Loong Jin Sat, 21 Mar 2009 20:11:02 +0800 + +nautilus-share (0.7.2-3) unstable; urgency=low + + * debian/patches/04_use_correct_icon.patch: + + Use folder-remote instead of gnome-fs-share + + -- Chow Loong Jin Fri, 20 Mar 2009 01:37:56 +0800 + +nautilus-share (0.7.2-2) unstable; urgency=low + + * debian/patches/04_use_correct_icon.patch: + + Updated to fix icon in properties dialog as well + + -- Chow Loong Jin Thu, 19 Mar 2009 23:21:45 +0800 + +nautilus-share (0.7.2-1) unstable; urgency=low + + * New upstream release + * debian/control: + + Change maintainer (Closes: #501938) + + Change build-dep to include CDBS and Quilt + + Move samba from Depends to Suggests since 02_install_missing_samba.patch + allows for automatic installing of samba + + Add libgnomevfs2-dev dependency + * debian/rules: + + Move to CDBS + + Build translation templates + + Omit installing useless doc files (retain AUTHORS only) + + Add -Wl,--as-needed to LDFLAGS to drop unnecessary dependencies + * debian/examples: + + Add smb.conf to this + * debian/copyright: + + Switched to new copyright format + + Added another name to Upstream-Maintainers + * debian/docs: + + Dropped, not needed. + * debian/smb.conf, debian/README.Debian: + + Update usershare directory (Closes: #500443) + * Import patches from Ubuntu: + + debian/patches/01_fix_install_dir.patch: + - Fix install dir location for nautilus extensions (Closes: #475230) + - Modified to use extension path from pkg-config + + debian/patches/02_install_missing_samba.patch: + - Ask to install samba and libpam-smbpass if it is not installed already + + debian/patches/03_no_verbose_logging.patch: + - Don't print extra messages in session logs when there is no issue + - Modified to also omit initializing and shutdown messages + + debian/patches/04_use_correct_icon.patch: + - Use gnome-fs-share icon in Nautilus + * debian/patches/05_dependencies.patch: + + Add needed cflags and libs from libgnomeui-2.0 and + gnome-vfs-2.0 + * debian/patches/99_ltmain_as-needed.patch: + + Imported from Banshee packaging, adds -Wl,--as-needed support + + -- Chow Loong Jin Wed, 18 Mar 2009 00:30:15 +0800 + +nautilus-share (0.7.1-2) unstable; urgency=low + + * Upload to unstable + * Added an example of samba configuration file + + -- Thierry Randrianiriana Sun, 29 Apr 2007 18:48:52 +0300 + +nautilus-share (0.7.1-1) experimental; urgency=low + + * Initial release (Closes: #315229) + + -- Thierry Randrianiriana Sun, 18 Mar 2007 08:21:12 +0300 --- nautilus-share-0.7.2.orig/debian/smb.conf +++ nautilus-share-0.7.2/debian/smb.conf @@ -0,0 +1,9 @@ +[global] +workgroup = HOME +security = share + +usershare path = /var/lib/samba/usershares +usershare max shares = 100 +usershare allow guests = yes +usershare owner only = yes +wins support = no --- nautilus-share-0.7.2.orig/debian/examples +++ nautilus-share-0.7.2/debian/examples @@ -0,0 +1 @@ +debian/smb.conf --- nautilus-share-0.7.2.orig/debian/compat +++ nautilus-share-0.7.2/debian/compat @@ -0,0 +1 @@ +5 --- nautilus-share-0.7.2.orig/debian/watch +++ nautilus-share-0.7.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://gentoo.ovibes.net/nautilus-share/nautilus-share-(.*)\.tar\.gz --- nautilus-share-0.7.2.orig/debian/rules +++ nautilus-share-0.7.2/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_DH_INSTALLCHANGELOGS_ARGS = ChangeLog +DEB_DH_MAKESHLIBS_ARGS = -n +DEB_INSTALL_DOCS_ALL = AUTHORS +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +install/nautilus-share:: + find $(DEB_DESTDIR) -name '*.*a' -delete + +build/nautilus-share:: + cd po; intltool-update -p --verbose + +clean:: + rm -f intltool-merge intltool-update intltool-extract + +# hack to remove shlibs to fix lintian error +binary-predeb/nautilus-share:: + rm -f debian/nautilus-share/DEBIAN/shlibs --- nautilus-share-0.7.2.orig/debian/control +++ nautilus-share-0.7.2/debian/control @@ -0,0 +1,26 @@ +Source: nautilus-share +Section: gnome +Priority: optional +Maintainer: Chow Loong Jin +Build-Depends: cdbs, + debhelper (>= 5), + autotools-dev, + quilt, + intltool (>= 0.29), + libgnomeui-dev, + libnautilus-extension-dev (>= 2.10.0), + libglib2.0-dev (>= 2.4.0), +Standards-Version: 3.8.3 +Homepage: http://gentoo.ovibes.net/nautilus-share/ + +Package: nautilus-share +Architecture: any +Depends: nautilus (>= 2.10), + samba-common (>= 3.0.27a), + samba-common-bin | samba-common (<< 2:3.4.0~pre2-1~0), + ${shlibs:Depends}, ${misc:Depends} +Enhances: nautilus +Suggests: samba (>= 3.0.27a) +Description: Nautilus extension to share folder using Samba + Nautilus Share allows you to quickly share a folder from + the GNOME Nautilus file manager without requiring root access. --- nautilus-share-0.7.2.orig/debian/patches/09_change-comments-location.patch +++ nautilus-share-0.7.2/debian/patches/09_change-comments-location.patch @@ -0,0 +1,48 @@ +# Description: Change location of Comment field to make it less confusing +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/385801 +# Forwarded: no +# Author: Chow Loong Jin +--- + + interfaces/share-dialog.glade.in | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + + +diff --git a/interfaces/share-dialog.glade.in b/interfaces/share-dialog.glade.in +index 179ebac..f6d399a 100644 +--- a/interfaces/share-dialog.glade.in ++++ b/interfaces/share-dialog.glade.in +@@ -273,8 +273,8 @@ + + 0 + 1 +- 3 +- 4 ++ 2 ++ 3 + fill + + +@@ -294,8 +294,8 @@ + + 1 + 2 +- 3 +- 4 ++ 2 ++ 3 + + + +@@ -315,8 +315,8 @@ + + 0 + 2 +- 2 +- 3 ++ 3 ++ 4 + fill + + --- nautilus-share-0.7.2.orig/debian/patches/03_no_verbose_logging.patch +++ nautilus-share-0.7.2/debian/patches/03_no_verbose_logging.patch @@ -0,0 +1,169 @@ +# Description: Don't print extra messages in session logs when there is no issue +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/335867 +# Forwarded: no +# Author: Sebastien Bacher +# Reviewed-By: Chow Loong Jin +--- + + src/nautilus-share.c | 4 ++-- + src/shares.c | 30 +++++++++++++++--------------- + 2 files changed, 17 insertions(+), 17 deletions(-) + + +diff --git a/src/nautilus-share.c b/src/nautilus-share.c +index d96edef..be4dfd9 100644 +--- a/src/nautilus-share.c ++++ b/src/nautilus-share.c +@@ -1508,7 +1508,7 @@ nautilus_share_register_type (GTypeModule *module) + void + nautilus_module_initialize (GTypeModule *module) + { +- g_print ("Initializing nautilus-share extension\n"); ++ /*g_print ("Initializing nautilus-share extension\n");*/ + + bindtextdomain("nautilus-share", NAUTILUS_SHARE_LOCALEDIR); + bind_textdomain_codeset("nautilus-share", "UTF-8"); +@@ -1520,7 +1520,7 @@ nautilus_module_initialize (GTypeModule *module) + void + nautilus_module_shutdown (void) + { +- g_print ("Shutting down nautilus-share extension\n"); ++ /*g_print ("Shutting down nautilus-share extension\n");*/ + /* FIXME freeing */ + } + +diff --git a/src/shares.c b/src/shares.c +index 6a869b9..ddec01b 100644 +--- a/src/shares.c ++++ b/src/shares.c +@@ -78,7 +78,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro + + stdout_contents = NULL; + stderr_contents = NULL; +- ++ /* + { + char **p; + +@@ -89,7 +89,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro + + g_message ("end of spawn args; SPAWNING\n"); + } +- ++ */ + real_error = NULL; + retval = g_spawn_sync (NULL, /* cwd */ + real_argv, +@@ -102,7 +102,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro + &exit_status, + &real_error); + +- g_message ("returned from spawn: %s: %s", retval ? "SUCCESS" : "FAIL", retval ? "" : real_error->message); ++ /* g_message ("returned from spawn: %s: %s", retval ? "SUCCESS" : "FAIL", retval ? "" : real_error->message); */ + + if (!retval) { + g_propagate_error (error, real_error); +@@ -141,7 +141,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro + + exit_code = WEXITSTATUS (exit_status); + +- g_message ("exit code %d", exit_code); ++ /* g_message ("exit code %d", exit_code); */ + if (exit_code != 0) { + char *str; + char *message; +@@ -170,7 +170,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro + } + + if (ret_key_file) { +- g_message ("caller wants GKeyFile"); ++ /* g_message ("caller wants GKeyFile"); */ + + *ret_key_file = NULL; + +@@ -205,14 +205,14 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro + } else + retval = TRUE; + +- g_message ("success from calling net usershare and parsing its output"); ++ /* g_message ("success from calling net usershare and parsing its output"); */ + + out: + g_free (real_argv); + g_free (stdout_contents); + g_free (stderr_contents); + +- g_message ("------------------------------------------"); ++ /* g_message ("------------------------------------------"); */ + + return retval; + } +@@ -472,7 +472,7 @@ refresh_if_needed (GError **error) + + new_timestamp = time (NULL); + if (new_timestamp - refresh_timestamp > TIMESTAMP_THRESHOLD) { +- g_message ("REFRESHING SHARES"); ++ /* g_message ("REFRESHING SHARES"); */ + retval = refresh_shares (error); + } else + retval = TRUE; +@@ -606,7 +606,7 @@ add_share (ShareInfo *info, GError **error) + gboolean supports_success; + gboolean supports_guest_ok; + +- g_message ("add_share() start"); ++ /* g_message ("add_share() start"); */ + + if (throw_error_on_add) { + g_set_error (error, +@@ -646,7 +646,7 @@ add_share (ShareInfo *info, GError **error) + copy = copy_share_info (info); + add_share_info_to_hashes (copy); + +- g_message ("add_share() end SUCCESS"); ++ /* g_message ("add_share() end SUCCESS"); */ + + return TRUE; + } +@@ -658,7 +658,7 @@ remove_share (const char *path, GError **error) + char *argv[2]; + GError *real_error; + +- g_message ("remove_share() start"); ++ /* g_message ("remove_share() start"); */ + + if (throw_error_on_remove) { + g_set_error (error, +@@ -699,7 +699,7 @@ remove_share (const char *path, GError **error) + remove_share_info_from_hashes (old_info); + shares_free_share_info (old_info); + +- g_message ("remove_share() end SUCCESS"); ++ /* g_message ("remove_share() end SUCCESS"); */ + + return TRUE; + } +@@ -709,11 +709,11 @@ modify_share (const char *old_path, ShareInfo *info, GError **error) + { + ShareInfo *old_info; + +- g_message ("modify_share() start"); ++ /* g_message ("modify_share() start"); */ + + old_info = lookup_share_by_path (old_path); + if (old_info == NULL) { +- g_message ("modify_share() end; calling add_share() instead"); ++ /*g_message ("modify_share() end; calling add_share() instead");*/ + return add_share (info, error); + } + +@@ -748,7 +748,7 @@ modify_share (const char *old_path, ShareInfo *info, GError **error) + return FALSE; + } + +- g_message ("modify_share() end: will call add_share() with the new share info"); ++ /* g_message ("modify_share() end: will call add_share() with the new share info"); */ + return add_share (info, error); + } + --- nautilus-share-0.7.2.orig/debian/patches/02_install_missing_samba.patch +++ nautilus-share-0.7.2/debian/patches/02_install_missing_samba.patch @@ -0,0 +1,340 @@ +# Description: Auto install samba and libpam-samba if needed. +# Origin: vendor +# Forwarded: not-needed +# Author: Michael Vogt +# Reviewed-By: Sebastien Bacher +# Reviewed-By: Didier Roche +# Reviewed-By: Chow Loong Jin +--- + + src/nautilus-share.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 278 insertions(+), 2 deletions(-) + + +diff --git a/src/nautilus-share.c b/src/nautilus-share.c +index 8768aba..d96edef 100644 +--- a/src/nautilus-share.c ++++ b/src/nautilus-share.c +@@ -32,6 +32,7 @@ + #include + + #include ++#include + #include "nautilus-share.h" + + #include +@@ -45,6 +46,9 @@ + #include + #include + ++#include ++#include ++ + #include + + #include +@@ -52,6 +56,7 @@ + + #include + #include ++#include + + #include "shares.h" + +@@ -572,8 +577,272 @@ modify_share_comment_text_entry (GtkEditable *editable, + page->is_dirty = TRUE; + property_page_check_sensitivity (page); + } +- + /*--------------------------------------------------------------------------*/ ++/*---------------------begin samba auto-install code------------------------*/ ++static gboolean ++check_samba_installed () ++{ ++ return g_file_test ("/usr/sbin/smbd", G_FILE_TEST_IS_EXECUTABLE); ++} ++ ++/* a linked list of PropertyPages waiting for samba to be installed */ ++static GList *pages_waiting_for_samba = NULL; ++/* TRUE if currently installing samba, FALSE otherwise */ ++static gboolean is_installing_samba = FALSE; ++ ++static void ++finish_samba_installation (gboolean success) ++{ ++ gint response; ++ GtkWidget* dialog_ask_restart; ++ ++ is_installing_samba = FALSE; ++ ++ while (pages_waiting_for_samba) ++ { ++ PropertyPage *current = pages_waiting_for_samba->data; ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (current->checkbutton_share_folder), success); ++ property_page_check_sensitivity (current); ++ pages_waiting_for_samba = g_list_remove (pages_waiting_for_samba, current); ++ } ++ ++ if (!success) ++ return; ++ ++ /* if we're successful, then ask to restart to make libpam-smbpass create ++ NTLM password hash */ ++ dialog_ask_restart = gtk_message_dialog_new ( ++ NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_CLOSE, ++ _("Restart your session")); ++ gtk_message_dialog_format_secondary_markup ( ++ GTK_MESSAGE_DIALOG (dialog_ask_restart), ++ _("You need to restart your session in order to enable sharing.")); ++ gtk_dialog_add_button (GTK_DIALOG (dialog_ask_restart), _("Restart session"), ++ GTK_RESPONSE_OK); ++ response = gtk_dialog_run (GTK_DIALOG (dialog_ask_restart)); ++ gtk_widget_destroy (dialog_ask_restart); ++ ++ if (response == GTK_RESPONSE_OK) ++ gnome_client_request_save (gnome_master_client (), ++ GNOME_SAVE_GLOBAL, ++ TRUE, ++ GNOME_INTERACT_ANY, ++ TRUE, ++ TRUE); ++} ++ ++static gboolean ++spawn_synaptic (GtkWidget *window, const gchar *path, gint *child_pid) ++{ ++ GError *error = NULL; ++ gboolean retval = TRUE; ++ gchar **argv; ++ ++ { /* generate argv */ ++ gchar *synaptic_path = g_find_program_in_path ("synaptic"); ++ gint i = 0; ++ ++ argv = g_new0 (gchar*, 5); ++ argv[i++] = g_find_program_in_path ("gksu"); ++ argv[i++] = g_strdup ("--desktop"); ++ argv[i++] = g_strdup ("/usr/share/applications/synaptic.desktop"); ++ argv[i++] = g_strdup_printf ("%s --hide-main-window " ++ "--set-selections-file %s " ++ "--non-interactive " ++ "--parent-window-id %d", ++ synaptic_path, ++ path, ++ GDK_WINDOW_XID (GTK_WIDGET (window)->window)); ++ argv[i++] = NULL; ++ ++ g_free (synaptic_path); ++ } ++ ++ if (!gdk_spawn_on_screen (gtk_window_get_screen (GTK_WINDOW (window)), ++ NULL, argv, NULL, ++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, ++ NULL, NULL, child_pid, &error)) ++ { ++ fprintf (stderr, "synaptic spawn failed; %s", (error) ? error->message : ""); ++ g_error_free (error); ++ retval = FALSE; ++ } ++ ++ g_strfreev (argv); ++ ++ return retval; ++ ++ ++} ++ ++static gboolean ++on_wait_timeout (gpointer data) ++{ ++ gint pid, status; ++ ++ pid = GPOINTER_TO_INT (data); ++ ++ if (waitpid (pid, &status, WNOHANG) > 0) ++ { ++ gtk_main_quit (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gboolean ++wait_for_synaptic (GtkWindow *window, pid_t pid) ++{ ++ gint timer; ++ ++ /* set the cursor to a watch */ ++ GdkCursor *cursor = gdk_cursor_new (GDK_WATCH); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE); ++ ++ /* wait until synaptic is done */ ++ timer = g_timeout_add (500, on_wait_timeout, GINT_TO_POINTER (pid)); ++ gtk_main (); ++ g_source_remove (timer); ++ ++ /* set the cursor to nothing */ ++ gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); ++ ++ gdk_cursor_unref (cursor); ++ ++ return check_samba_installed (); ++} ++ ++static gchar* ++create_temp_file (const gchar *packages[]) ++{ ++ int fd; ++ gchar *path, *str; ++ ++ path = g_strdup_printf ("/tmp/packages.XXXXXX"); ++ fd = mkstemp (path); ++ ++ while (*packages) ++ { ++ str = g_strdup_printf ("%s\ti\n", *packages); ++ write (fd, str, strlen (str)); ++ g_free (str); ++ packages++; ++ } ++ ++ close (fd); ++ return path; ++} ++ ++static void ++run_synaptic (GtkWidget *window) ++{ ++ gchar *path; ++ GtkWidget* dialog_ask_retry; ++ gboolean success = FALSE; ++ ++ /* generate list of packages for installing */ ++ { ++ const gchar *packages[] = { ++ "samba", ++ "libpam-smbpass", ++ NULL ++ }; ++ path = create_temp_file (packages); ++ } ++ ++ /* generate dialog_ask_retry */ ++ dialog_ask_retry = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_CLOSE, ++ _("Sharing service installation failed")); ++ gtk_message_dialog_format_secondary_markup ( ++ GTK_MESSAGE_DIALOG (dialog_ask_retry), ++ _("Sharing service installation has failed. Would you like to retry the " ++ "installation?")); ++ gtk_dialog_add_button (GTK_DIALOG (dialog_ask_retry), ++ _("Retry"), ++ GTK_RESPONSE_OK); ++ ++ /* loop until either installed successfully, or user cancels */ ++ for (;;) ++ { ++ gint response; /* response from dialog */ ++ pid_t pid; /* synaptic's pid */ ++ ++ if (spawn_synaptic (window, path, &pid)) ++ if ((success = wait_for_synaptic (GTK_WINDOW (window), pid))) ++ break; ++ ++ response = gtk_dialog_run (GTK_DIALOG (dialog_ask_retry)); ++ gtk_widget_hide (dialog_ask_retry); ++ if (response != GTK_RESPONSE_OK) ++ { ++ success = FALSE; ++ break; ++ } ++ } ++ ++ /* clean up */ ++ gtk_widget_destroy (dialog_ask_retry); ++ finish_samba_installation (success); ++} ++ ++static void ++start_samba_installation () ++{ ++ gint response; /* response from dialog */ ++ GtkWidget* dialog; ++ ++ /* ask to install samba */ ++ dialog = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_CLOSE, ++ _("Sharing service is not installed")); ++ gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), ++ _("You need to install the Windows networks " ++ "sharing service in order to share your folders.")); ++ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Install service"), GTK_RESPONSE_OK); ++ response = gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_hide (dialog); ++ ++ if (response != GTK_RESPONSE_OK) ++ finish_samba_installation (FALSE); ++ else ++ { ++ is_installing_samba = TRUE; ++ run_synaptic (dialog); ++ } ++ gtk_widget_destroy (dialog); ++} ++ ++static void ++wait_samba_installation (PropertyPage *page) ++{ ++ /* if installed, do nothing */ ++ if (check_samba_installed ()) ++ return; ++ ++ pages_waiting_for_samba = g_list_prepend (pages_waiting_for_samba, page); ++ ++ /* start samba installation if not already started */ ++ if (!is_installing_samba) ++ start_samba_installation (); ++} ++ ++static void ++unwait_samba_installation (PropertyPage *page) ++{ ++ pages_waiting_for_samba = g_list_remove (pages_waiting_for_samba, page); ++} ++/*---------------------end samba auto-install code--------------------------*/ + static void + on_checkbutton_share_folder_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +@@ -582,7 +851,13 @@ on_checkbutton_share_folder_toggled (GtkToggleButton *togglebutton, + + page = user_data; + +- property_page_check_sensitivity (page); ++ if (check_samba_installed ()) ++ property_page_check_sensitivity (page); ++ else if (gtk_toggle_button_get_active ( ++ GTK_TOGGLE_BUTTON (page->checkbutton_share_folder))) ++ wait_samba_installation (page); ++ else ++ unwait_samba_installation (page); + } + + static void +@@ -618,6 +893,7 @@ free_property_page_cb (gpointer data) + + page = data; + ++ unwait_samba_installation (page); + g_free (page->path); + g_object_unref (page->fileinfo); + g_object_unref (page->xml); --- nautilus-share-0.7.2.orig/debian/patches/12_undoable-action.patch +++ nautilus-share-0.7.2/debian/patches/12_undoable-action.patch @@ -0,0 +1,47 @@ +# Description: Allow user to undo sharing/unsharing a folder without needing to +# close the window beforehand +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/392165 +# Forwarded: no +# Author: Chow Loong Jin +--- + + src/nautilus-share.c | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + + +Index: nautilus-share/src/nautilus-share.c +=================================================================== +--- nautilus-share.orig/src/nautilus-share.c 2009-09-08 03:30:29.000000000 +0800 ++++ nautilus-share/src/nautilus-share.c 2009-09-08 03:30:58.000000000 +0800 +@@ -420,6 +420,12 @@ + if (!is_shared) + restore_saved_permissions (page->path); + ++ /* update initially shared state, so that we may undo later on */ ++ if (retval) ++ { ++ page->was_initially_shared = is_shared; ++ page->is_dirty = FALSE; ++ } + return retval; + } + +@@ -550,6 +556,8 @@ + apply_is_sensitive = page->was_initially_shared; + + gtk_widget_set_sensitive (page->button_apply, apply_is_sensitive); ++ gtk_button_set_label (GTK_BUTTON(page->button_apply), ++ _((page->was_initially_shared) ? "Modify _Share" : "Create _Share")); + } + + static void +@@ -917,6 +925,8 @@ + { + if (page->standalone_window) + gtk_widget_destroy (page->standalone_window); ++ else ++ property_page_check_sensitivity (page); + } + } + --- nautilus-share-0.7.2.orig/debian/patches/series +++ nautilus-share-0.7.2/debian/patches/series @@ -0,0 +1,16 @@ +# This series applies on GIT commit 637d65ba140214baf3889ee664c594ccc851c59d +01_fix_install_dir.patch +02_install_missing_samba.patch +03_no_verbose_logging.patch +04_use_correct_icon.patch +05_dependencies.patch +06_fix-validation.patch +07_set-title.patch +08_change-confusing-wording.patch +09_change-comments-location.patch +10_fix-writable-detection.patch +11_use-gio.patch +12_undoable-action.patch +13_permissions.patch +14_glade-to-gtkbuilder.patch +99_ltmain_as-needed.patch --- nautilus-share-0.7.2.orig/debian/patches/01_fix_install_dir.patch +++ nautilus-share-0.7.2/debian/patches/01_fix_install_dir.patch @@ -0,0 +1,42 @@ +# Description: Fix installation directory of nautilus-share (grab from +# pkg-config) +# Origin: vendor +# Forwarded: yes +# Bug-Debian: http://bugs.debian.org/475230 +# Author: by Michael Vogt +# Reviewed-By: Chow Loong Jin +--- + + src/Makefile.am | 3 +-- + src/Makefile.in | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + + +diff --git a/src/Makefile.am b/src/Makefile.am +index b30913c..29f26fe 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -10,8 +10,7 @@ libnautilus_share_la_CFLAGS = \ + $(LIBGLADE_CFLAGS) \ + $(GLIB_CFLAGS) + +-# FIXME: get this from the .pc file +-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir = $(shell $(PKG_CONFIG) --variable=extensiondir libnautilus-extension) + + nautilus_extension_LTLIBRARIES=libnautilus-share.la + +diff --git a/src/Makefile.in b/src/Makefile.in +index 1404b39..88bfb10 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -244,8 +244,7 @@ libnautilus_share_la_CFLAGS = \ + $(GLIB_CFLAGS) + + +-# FIXME: get this from the .pc file +-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir = $(shell $(PKG_CONFIG) --variable=extensiondir libnautilus-extension) + nautilus_extension_LTLIBRARIES = libnautilus-share.la + libnautilus_share_la_SOURCES = \ + nautilus-share.c \ --- nautilus-share-0.7.2.orig/debian/patches/08_change-confusing-wording.patch +++ nautilus-share-0.7.2/debian/patches/08_change-confusing-wording.patch @@ -0,0 +1,200 @@ +# Description: Change of wording: "Allow other people to write in this folder" +# to "Allow others to make changes in this folder" +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/385801 +# Forwarded: no +# Author: Chow Loong Jin +--- + + interfaces/share-dialog.glade.in | 2 +- + po/ar.po | 2 +- + po/ca.po | 2 +- + po/de.po | 2 +- + po/dz.po | 2 +- + po/en_GB.po | 4 ++-- + po/es.po | 2 +- + po/eu.po | 2 +- + po/fi.po | 2 +- + po/fr.po | 2 +- + po/hu.po | 2 +- + po/it.po | 2 +- + po/pl.po | 2 +- + po/pt_BR.po | 2 +- + 14 files changed, 15 insertions(+), 15 deletions(-) + + +diff --git a/interfaces/share-dialog.glade.in b/interfaces/share-dialog.glade.in +index 50bcf2a..179ebac 100644 +--- a/interfaces/share-dialog.glade.in ++++ b/interfaces/share-dialog.glade.in +@@ -304,7 +304,7 @@ + + True + True +- _Allow other people to write in this folder ++ _Allow others to create and delete files in this folder + True + GTK_RELIEF_NORMAL + True +diff --git a/po/ar.po b/po/ar.po +index 8b1fcac..aa9186f 100644 +--- a/po/ar.po ++++ b/po/ar.po +@@ -185,6 +185,6 @@ msgstr "_شارك المجلد" + + #: ../interfaces/share-dialog.glade.in.h:5 + #, fuzzy +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "لا تملك الصلاحيات الكافية للكتابة في هذا المجلد." + +diff --git a/po/ca.po b/po/ca.po +index 2922b86..34bd275 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -176,5 +176,5 @@ msgid "Share this _folder" + msgstr "Comparteix aquesta _carpeta" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "_Permet que altres persones puguin escriure en aquesta carpeta" +diff --git a/po/de.po b/po/de.po +index efad353..0122c3f 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -50,7 +50,7 @@ msgid "Folder Sharing" + msgstr "Ordner freigeben" + + #: ../interfaces/share-dialog.glade.h:2 +-msgid "Allow other people to write in this folder" ++msgid "Allow others to create and delete files in this folder" + msgstr "Anderen erlauben, in diesen Ordner zu schreiben" + + #: ../interfaces/share-dialog.glade.h:3 +diff --git a/po/dz.po b/po/dz.po +index ae98cb1..cf492c0 100644 +--- a/po/dz.po ++++ b/po/dz.po +@@ -169,6 +169,6 @@ msgid "Share this _folder" + msgstr "སྣོད་འཛིན་འདི་རུབ་སྤྱོད་འབད།(_f)" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "སྣོད་འཛིན་འདི་ནང་གཞན་གང་ཟག་ལུ་འབྲི་ཆོགཔ་ཨིན།(_A)" + +diff --git a/po/en_GB.po b/po/en_GB.po +index 5404643..a9cb36c 100755 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -165,6 +165,6 @@ msgid "Share this _folder" + msgstr "Share this _folder" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" +-msgstr "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" ++msgstr "_Allow others to create and delete files in this folder" + +diff --git a/po/es.po b/po/es.po +index aee7953..4101340 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -176,6 +176,6 @@ msgid "Share this _folder" + msgstr "Compartir esta _carpeta" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "_Permitir a otras personas escribir en esta carpeta" + +diff --git a/po/eu.po b/po/eu.po +index a1b7f94..0867a2c 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -173,6 +173,6 @@ msgid "Share this _folder" + msgstr "Partekatu _karpeta hau" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "_Baimendu beste erabiltzaileek karpeta honetan idatea" + +diff --git a/po/fi.po b/po/fi.po +index 1a74706..48532ca 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -177,7 +177,7 @@ msgid "Share this _folder" + msgstr "Jaa tämä _kansio" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "_Salli muiden kirjoittaa tähän kansioon" + + #~ msgid "Sharename too long, may not appear on all Os" +diff --git a/po/fr.po b/po/fr.po +index 52232fb..9864be3 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -182,7 +182,7 @@ msgid "Share this _folder" + msgstr "Partager ce _dossier" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "_Permettre aux autres utilisateurs de modifier ce dossier" + + #~ msgid "Sharename too long, may not appear on all Os" +diff --git a/po/hu.po b/po/hu.po +index 90d9db9..f60c348 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -177,6 +177,6 @@ msgid "Share this _folder" + msgstr "_Mappa megosztása" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "Írás engedélyezése a m_appába" + +diff --git a/po/it.po b/po/it.po +index 1bcc97b..b32d67d 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -52,7 +52,7 @@ msgid "Folder Sharing" + msgstr "Condivisione cartella" + + #: ../interfaces/share-dialog.glade.h:2 +-msgid "Allow other people to write in this folder" ++msgid "Allow others to create and delete files in this folder" + msgstr "Permetti ad altri di scrivere in questa cartella" + + #: ../interfaces/share-dialog.glade.h:3 +diff --git a/po/pl.po b/po/pl.po +index 02145f7..5921df0 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -179,7 +179,7 @@ msgid "Share this _folder" + msgstr "Udostępnij ten _folder" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "Zezwolenie innym na z_apis w tym katalogu" + + #~ msgid "Sharename too long, may not appear on all Os" +diff --git a/po/pt_BR.po b/po/pt_BR.po +index f5f685d..cf09c39 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -169,7 +169,7 @@ msgid "Share this _folder" + msgstr "Compar_tilhar esta pasta" + + #: ../interfaces/share-dialog.glade.in.h:5 +-msgid "_Allow other people to write in this folder" ++msgid "_Allow others to create and delete files in this folder" + msgstr "Permite outras pessoas escreverem nesta p_asta" + + #~ msgid "Sharename too long, may not appear on all Os" --- nautilus-share-0.7.2.orig/debian/patches/05_dependencies.patch +++ nautilus-share-0.7.2/debian/patches/05_dependencies.patch @@ -0,0 +1,105 @@ +# Description: Drop unnecessary dependencies and add some dependencies which +# were previously indirect. +# Origin: vendor +# Bug-Debian: http://bugs.debian.org/525543 +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/347971 +# Forwarded: no +# Author: Robert Ancell +# Reviewed-By: Chow Loong Jin +--- + + configure | 20 ++++++++++---------- + configure.in | 2 +- + src/nautilus-share.c | 2 -- + 3 files changed, 11 insertions(+), 13 deletions(-) + + +diff --git a/configure b/configure +index 0854909..0cf965a 100755 +--- a/configure ++++ b/configure +@@ -20683,12 +20683,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED eel-2.0 >= \$EEL_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED libgnomeui-2.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED" 2>/dev/null` ++ pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20701,12 +20701,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED eel-2.0 >= \$EEL_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED libgnomeui-2.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED" 2>/dev/null` ++ pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20725,14 +20725,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED"` ++ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0"` + else +- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED"` ++ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$NAUTILUS_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0) were not met: + + $NAUTILUS_PKG_ERRORS + +@@ -20743,7 +20743,7 @@ Alternatively, you may set the environment variables NAUTILUS_CFLAGS + and NAUTILUS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0) were not met: + + $NAUTILUS_PKG_ERRORS + +diff --git a/configure.in b/configure.in +index 96cea69..9b8e90a 100644 +--- a/configure.in ++++ b/configure.in +@@ -28,7 +28,7 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then + AC_MSG_ERROR(you need to have pkgconfig installed !) + fi + +-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) ++PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) + PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED) + +diff --git a/src/nautilus-share.c b/src/nautilus-share.c +index 12afd34..f2105d4 100644 +--- a/src/nautilus-share.c ++++ b/src/nautilus-share.c +@@ -35,8 +35,6 @@ + #include + #include "nautilus-share.h" + +-#include +- + #include + + #include --- nautilus-share-0.7.2.orig/debian/patches/04_use_correct_icon.patch +++ nautilus-share-0.7.2/debian/patches/04_use_correct_icon.patch @@ -0,0 +1,88 @@ +# Description: Use gnome-fs-share icon in nautilus +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/209136 +# Forwarded: no +# Author: Sebastien Bacher +# Reviewed-By: Chow Loong JIn +--- + + Makefile.am | 2 +- + Makefile.in | 2 +- + interfaces/Makefile.am | 2 +- + interfaces/Makefile.in | 2 +- + interfaces/share-dialog.glade.in | 3 ++- + src/nautilus-share.c | 2 +- + 6 files changed, 7 insertions(+), 6 deletions(-) + + +diff --git a/Makefile.am b/Makefile.am +index 5642043..857d7e9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,2 +1,2 @@ +-SUBDIRS = src pixmaps interfaces po ++SUBDIRS = src interfaces po + EXTRA_DIST = intltool-update.in intltool-extract.in intltool-merge.in +diff --git a/Makefile.in b/Makefile.in +index 2de0abe..aef5918 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -226,7 +226,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = src pixmaps interfaces po ++SUBDIRS = src interfaces po + EXTRA_DIST = intltool-update.in intltool-extract.in intltool-merge.in + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am +index e21799d..a403b47 100644 +--- a/interfaces/Makefile.am ++++ b/interfaces/Makefile.am +@@ -10,4 +10,4 @@ EXTRA_DIST = \ + CLEANFILES = $(interfaces) + + $(interfaces): %.glade: %.glade.in +- $(top_srcdir)/interfaces/fix.pl $(pixmapsdir) < $< > $@ ++ cp $< $@ +diff --git a/interfaces/Makefile.in b/interfaces/Makefile.in +index 8545583..efbb5b8 100644 +--- a/interfaces/Makefile.in ++++ b/interfaces/Makefile.in +@@ -404,7 +404,7 @@ uninstall-am: uninstall-info-am uninstall-interfacesDATA + + + $(interfaces): %.glade: %.glade.in +- $(top_srcdir)/interfaces/fix.pl $(pixmapsdir) < $< > $@ ++ cp $< $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff --git a/interfaces/share-dialog.glade.in b/interfaces/share-dialog.glade.in +index 2c1f5e4..50bcf2a 100644 +--- a/interfaces/share-dialog.glade.in ++++ b/interfaces/share-dialog.glade.in +@@ -36,7 +36,8 @@ + + + True +- share-logo.png ++ 64 ++ folder-remote + 0.5 + 0.5 + 0 +diff --git a/src/nautilus-share.c b/src/nautilus-share.c +index be4dfd9..12afd34 100644 +--- a/src/nautilus-share.c ++++ b/src/nautilus-share.c +@@ -1404,7 +1404,7 @@ nautilus_share_get_file_items (NautilusMenuProvider *provider, + item = nautilus_menu_item_new ("NautilusShare::share", + _("Sharing Options"), + _("Share this Folder"), +- "stock_shared-by-me"); ++ "folder-remote"); + g_signal_connect (item, "activate", + G_CALLBACK (share_this_folder_callback), + fileinfo); --- nautilus-share-0.7.2.orig/debian/patches/06_fix-validation.patch +++ nautilus-share-0.7.2/debian/patches/06_fix-validation.patch @@ -0,0 +1,27 @@ +# Description: Fix validation false positives +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/293601 +# Forwarded: no +# Author: Chow Loong Jin +--- + + src/nautilus-share.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + + +diff --git a/src/nautilus-share.c b/src/nautilus-share.c +index f2105d4..0944214 100644 +--- a/src/nautilus-share.c ++++ b/src/nautilus-share.c +@@ -505,8 +505,11 @@ property_page_share_name_is_valid (PropertyPage *page) + return FALSE; + } + else ++ { ++ property_page_set_normal (page); + return TRUE; + } ++ } + } + + static void --- nautilus-share-0.7.2.orig/debian/patches/13_permissions.patch +++ nautilus-share-0.7.2/debian/patches/13_permissions.patch @@ -0,0 +1,58 @@ +# Description: Relax the permission requirement for nautilus-share, since +# usershares don't appear to need go+rx any more +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/330114 +# Author: Chow Loong Jin +--- + + src/nautilus-share.c | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + + +diff --git a/src/nautilus-share.c b/src/nautilus-share.c +index d3a215c..7246958 100644 +--- a/src/nautilus-share.c ++++ b/src/nautilus-share.c +@@ -62,9 +62,9 @@ + #include "shares.h" + + +-#define NEED_ALWAYS_MASK (S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) /* all usershares need go+rx */ ++#define NEED_IF_GUESTOK_MASK (S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) /* need go+rx for guest enabled usershares */ + #define NEED_IF_WRITABLE_MASK (S_IWGRP | S_IWOTH) /* writable usershares need go+w additionally*/ +-#define NEED_ALL_MASK (NEED_ALWAYS_MASK | NEED_IF_WRITABLE_MASK) ++#define NEED_ALL_MASK (NEED_IF_GUESTOK_MASK | NEED_IF_WRITABLE_MASK) + + static GObjectClass *parent_class; + +@@ -328,7 +328,7 @@ typedef enum { + } ConfirmPermissionsStatus; + + static ConfirmPermissionsStatus +-confirm_sharing_permissions (GtkWidget *widget, const char *path, gboolean is_shared, gboolean is_writable) ++confirm_sharing_permissions (GtkWidget *widget, const char *path, gboolean is_shared, gboolean guest_ok, gboolean is_writable) + { + struct stat st; + mode_t mode, new_mode, need_mask; +@@ -339,9 +339,10 @@ confirm_sharing_permissions (GtkWidget *widget, const char *path, gboolean is_sh + if (stat (path, &st) != 0) + return CONFIRM_NO_MODIFICATIONS; /* We'll just let "net usershare" give back an error if the file disappears */ + +- mode = st.st_mode; +- new_mode = mode | NEED_ALWAYS_MASK; ++ new_mode = mode = st.st_mode; + ++ if (guest_ok) ++ new_mode |= NEED_IF_GUESTOK_MASK; + if (is_writable) + new_mode |= NEED_IF_WRITABLE_MASK; + +@@ -395,7 +396,7 @@ property_page_commit (PropertyPage *page) + if (is_shared && page->was_writable && !share_info.is_writable) + restore_write_permissions (page->path); + +- status = confirm_sharing_permissions (page->main, page->path, is_shared, share_info.is_writable); ++ status = confirm_sharing_permissions (page->main, page->path, is_shared, share_info.guest_ok, share_info.is_writable); + if (status == CONFIRM_CANCEL_OR_ERROR) + return FALSE; /* the user didn't want us to change his folder's permissions */ + --- nautilus-share-0.7.2.orig/debian/patches/11_use-gio.patch +++ nautilus-share-0.7.2/debian/patches/11_use-gio.patch @@ -0,0 +1,91 @@ +# Description: Use GIO to get file paths instead of GnomeVFS +# Origin: vendor +# Author: Andreas Henriksson +# Reviewed-By: Chow Loong Jin +--- + + src/nautilus-share.c | 21 ++++++++++++++------- + 1 files changed, 14 insertions(+), 7 deletions(-) + + +diff --git a/src/nautilus-share.c b/src/nautilus-share.c +index 0616965..9f2544e 100644 +--- a/src/nautilus-share.c ++++ b/src/nautilus-share.c +@@ -31,12 +31,13 @@ + #include + #include + +-#include + #include + #include "nautilus-share.h" + + #include + ++#include ++ + #include + #include + #include +@@ -52,6 +53,8 @@ + #include + #include + ++#include ++#include + #include + #include + #include +@@ -424,15 +427,15 @@ property_page_commit (PropertyPage *page) + static gchar * + get_fullpath_from_fileinfo(NautilusFileInfo *fileinfo) + { +- gchar *uri; ++ GFile *file; + gchar *fullpath; + + g_assert (fileinfo != NULL); + +- uri = nautilus_file_info_get_uri(fileinfo); +- fullpath = gnome_vfs_get_local_path_from_uri(uri); +- g_assert (fullpath != NULL); /* In the beginning we checked that this was a local URI */ +- g_free(uri); ++ file = nautilus_file_info_get_location(fileinfo); ++ fullpath = g_file_get_path(file); ++ g_assert (fullpath != NULL && g_file_is_native(file)); /* In the beginning we checked that this was a local URI */ ++ g_object_unref(file); + + return(fullpath); + } +@@ -1144,11 +1147,13 @@ get_share_info_for_file_info (NautilusFileInfo *file, ShareInfo **share_info, gb + { + char *uri; + char *local_path = NULL; ++ GFile *f; + + *share_info = NULL; + *is_shareable = FALSE; + + uri = nautilus_file_info_get_uri (file); ++ f = nautilus_file_info_get_location(file); + if (!uri) + goto out; + +@@ -1177,7 +1182,8 @@ get_share_info_for_file_info (NautilusFileInfo *file, ShareInfo **share_info, gb + if (!nautilus_file_info_is_directory(file)) + goto out; + +- if(!(local_path = gnome_vfs_get_local_path_from_uri(uri))) ++ local_path = g_file_get_path(f); ++ if (!local_path || !g_file_is_native(f)) + goto out; + + /* FIXME: NULL GError */ +@@ -1188,6 +1194,7 @@ get_share_info_for_file_info (NautilusFileInfo *file, ShareInfo **share_info, gb + + out: + ++ g_object_unref(f); + g_free (uri); + g_free (local_path); + } --- nautilus-share-0.7.2.orig/debian/patches/10_fix-writable-detection.patch +++ nautilus-share-0.7.2/debian/patches/10_fix-writable-detection.patch @@ -0,0 +1,27 @@ +# Description: Fix issue where writable option is wrongly detected as false +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/280480 +# Forwarded: no +# Author: Chow Loong Jin +--- + + src/shares.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + + +diff --git a/src/shares.c b/src/shares.c +index ddec01b..f65f78d 100644 +--- a/src/shares.c ++++ b/src/shares.c +@@ -358,9 +358,9 @@ add_key_group_to_hashes (GKeyFile *key_file, const char *group) + + acl = get_string_from_key_file (key_file, group, KEY_ACL); + if (acl) { +- if (strcmp (acl, "Everyone:R") == 0) ++ if (strstr (acl, "Everyone:R")) + is_writable = FALSE; +- else if (strcmp (acl, "Everyone:F") == 0) ++ else if (strstr (acl, "Everyone:F")) + is_writable = TRUE; + else { + g_message ("unknown format for key '%s/%s' as it contains '%s'. Assuming that the share is read-only", --- nautilus-share-0.7.2.orig/debian/patches/99_ltmain_as-needed.patch +++ nautilus-share-0.7.2/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,42 @@ +# Description: Fix ltmain.sh to allow -Wl,--as-needed to be passed properly to +# reduce dependencies +# Origin: vendor +# Forwarded: not-needed +--- + + ltmain.sh | 14 ++++++++++++++ + 1 files changed, 14 insertions(+), 0 deletions(-) + + +diff --git a/ltmain.sh b/ltmain.sh +index 2160ef7..c929072 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1794,6 +1794,11 @@ EOF + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2137,6 +2142,15 @@ EOF + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- nautilus-share-0.7.2.orig/debian/patches/07_set-title.patch +++ nautilus-share-0.7.2/debian/patches/07_set-title.patch @@ -0,0 +1,24 @@ +# Description: Set the title of the sharing options dialog manually so it can +# be translated. +# Origin: vendor +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/356191 +# Forwarded: no +# Author: Chow Loong Jin +--- + + src/nautilus-share.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + + +diff --git a/src/nautilus-share.c b/src/nautilus-share.c +index 0944214..0616965 100644 +--- a/src/nautilus-share.c ++++ b/src/nautilus-share.c +@@ -1363,6 +1363,7 @@ share_this_folder_callback (NautilusMenuItem *item, + g_assert (fileinfo != NULL); + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); ++ gtk_window_set_title (GTK_WINDOW (window), _("Folder Sharing")); + page = create_property_page (fileinfo); + page->standalone_window = window; + g_signal_connect (page->button_cancel, "clicked", --- nautilus-share-0.7.2.orig/debian/patches/14_glade-to-gtkbuilder.patch +++ nautilus-share-0.7.2/debian/patches/14_glade-to-gtkbuilder.patch @@ -0,0 +1,4370 @@ +# Description: Migrate from using glade (deprecated) to using GtkBuilder +# Origin: vendor +# Forwarded: no +# Author: Chow Loong Jin + +Index: nautilus-share/configure +=================================================================== +--- nautilus-share.orig/configure 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/configure 2009-09-08 02:54:23.000000000 +0800 +@@ -899,8 +899,6 @@ + NAUTILUS_LIBS + GLIB_CFLAGS + GLIB_LIBS +-LIBGLADE_CFLAGS +-LIBGLADE_LIBS + pixmapsdir + interfacesdir + GETTEXT_PACKAGE +@@ -942,9 +940,7 @@ + NAUTILUS_CFLAGS + NAUTILUS_LIBS + GLIB_CFLAGS +-GLIB_LIBS +-LIBGLADE_CFLAGS +-LIBGLADE_LIBS' ++GLIB_LIBS' + + + # Initialize some variables set by options. +@@ -1561,10 +1557,6 @@ + linker flags for NAUTILUS, overriding pkg-config + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config +- LIBGLADE_CFLAGS +- C compiler flags for LIBGLADE, overriding pkg-config +- LIBGLADE_LIBS +- linker flags for LIBGLADE, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -3853,7 +3845,6 @@ + NAUTILUS_REQUIRED=2.10.0 + EEL_REQUIRED=2.10.0 + GLIB_REQUIRED=2.4.0 +-LIBGLADE_REQUIRED=2.4.0 + + DATADIRNAME=share + +@@ -20896,128 +20887,6 @@ + : + fi + +-pkg_failed=no +-{ echo "$as_me:$LINENO: checking for LIBGLADE" >&5 +-echo $ECHO_N "checking for LIBGLADE... $ECHO_C" >&6; } +- +-if test -n "$PKG_CONFIG"; then +- if test -n "$LIBGLADE_CFLAGS"; then +- pkg_cv_LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_LIBGLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$LIBGLADE_LIBS"; then +- pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_LIBGLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libglade-2.0 >= $LIBGLADE_REQUIRED"` +- else +- LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0 >= $LIBGLADE_REQUIRED"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$LIBGLADE_PKG_ERRORS" >&5 +- +- { { echo "$as_me:$LINENO: error: Package requirements (libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: +- +-$LIBGLADE_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables LIBGLADE_CFLAGS +-and LIBGLADE_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-echo "$as_me: error: Package requirements (libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: +- +-$LIBGLADE_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables LIBGLADE_CFLAGS +-and LIBGLADE_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } +-elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables LIBGLADE_CFLAGS +-and LIBGLADE_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables LIBGLADE_CFLAGS +-and LIBGLADE_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- LIBGLADE_CFLAGS=$pkg_cv_LIBGLADE_CFLAGS +- LIBGLADE_LIBS=$pkg_cv_LIBGLADE_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- : +-fi +- +- +- +- +- +- +- +- +- +- +- +- + if test "x${prefix}" = "xNONE"; then + + cat >>confdefs.h <<_ACEOF +@@ -23447,8 +23316,6 @@ + NAUTILUS_LIBS!$NAUTILUS_LIBS$ac_delim + GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim + GLIB_LIBS!$GLIB_LIBS$ac_delim +-LIBGLADE_CFLAGS!$LIBGLADE_CFLAGS$ac_delim +-LIBGLADE_LIBS!$LIBGLADE_LIBS$ac_delim + pixmapsdir!$pixmapsdir$ac_delim + interfacesdir!$interfacesdir$ac_delim + GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim +@@ -23472,7 +23339,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +Index: nautilus-share/configure.in +=================================================================== +--- nautilus-share.orig/configure.in 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/configure.in 2009-09-08 02:54:23.000000000 +0800 +@@ -10,7 +10,6 @@ + NAUTILUS_REQUIRED=2.10.0 + EEL_REQUIRED=2.10.0 + GLIB_REQUIRED=2.4.0 +-LIBGLADE_REQUIRED=2.4.0 + + DATADIRNAME=share + +@@ -30,7 +29,6 @@ + + PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) +-PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED) + + AC_SUBST(NAUTILUS_CFLAGS) + AC_SUBST(NAUTILUS_LIBS) +@@ -38,9 +36,6 @@ + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +-AC_SUBST(LIBGLADE_CFLAGS) +-AC_SUBST(LIBGLADE_LIBS) +- + + dnl ======================================================== + dnl Set PIXMAPS_DIR +Index: nautilus-share/src/Makefile.am +=================================================================== +--- nautilus-share.orig/src/Makefile.am 2009-09-08 02:54:22.000000000 +0800 ++++ nautilus-share/src/Makefile.am 2009-09-08 02:54:23.000000000 +0800 +@@ -7,7 +7,6 @@ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(NAUTILUS_CFLAGS) \ +- $(LIBGLADE_CFLAGS) \ + $(GLIB_CFLAGS) + + nautilus_extensiondir = $(shell $(PKG_CONFIG) --variable=extensiondir libnautilus-extension) +@@ -21,4 +20,4 @@ + shares.h + + libnautilus_share_la_LDFLAGS = -module -avoid-version +-libnautilus_share_la_LIBADD = $(GLIB_LIBS) $(NAUTILUS_LIBS) $(LIBGLADE_LIBS) ++libnautilus_share_la_LIBADD = $(GLIB_LIBS) $(NAUTILUS_LIBS) +Index: nautilus-share/src/Makefile.in +=================================================================== +--- nautilus-share.orig/src/Makefile.in 2009-09-08 02:54:22.000000000 +0800 ++++ nautilus-share/src/Makefile.in 2009-09-08 02:54:23.000000000 +0800 +@@ -147,8 +147,6 @@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +-LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ +-LIBGLADE_LIBS = @LIBGLADE_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ +@@ -240,7 +238,6 @@ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(NAUTILUS_CFLAGS) \ +- $(LIBGLADE_CFLAGS) \ + $(GLIB_CFLAGS) + + +@@ -253,7 +250,7 @@ + shares.h + + libnautilus_share_la_LDFLAGS = -module -avoid-version +-libnautilus_share_la_LIBADD = $(GLIB_LIBS) $(NAUTILUS_LIBS) $(LIBGLADE_LIBS) ++libnautilus_share_la_LIBADD = $(GLIB_LIBS) $(NAUTILUS_LIBS) + all: all-am + + .SUFFIXES: +Index: nautilus-share/src/nautilus-share.c +=================================================================== +--- nautilus-share.orig/src/nautilus-share.c 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/src/nautilus-share.c 2009-09-08 02:54:47.000000000 +0800 +@@ -48,8 +48,6 @@ + #include + #include + +-#include +- + #include + #include + +@@ -75,7 +73,7 @@ + char *path; /* Full path which is being shared */ + NautilusFileInfo *fileinfo; /* Nautilus file to which this page refers */ + +- GladeXML *xml; ++ GtkBuilder *xml; + + GtkWidget *main; /* Widget that holds all the rest. Its "PropertyPage" GObject-data points to this PropertyPage structure */ + +@@ -963,25 +961,33 @@ + + share_info = NULL; + g_error_free (error); ++ error = NULL; + } + +- page->xml = glade_xml_new(INTERFACES_DIR"/share-dialog.glade","vbox1",GETTEXT_PACKAGE); +- page->main = glade_xml_get_widget(page->xml,"vbox1"); ++ ++ page->xml = gtk_builder_new (); ++ gtk_builder_set_translation_domain (page->xml, "nautilus-share"); ++ g_assert (gtk_builder_add_from_file (page->xml, ++ INTERFACES_DIR"/share-dialog.ui", &error)); ++ ++ page->main = GTK_WIDGET (gtk_builder_get_object (page->xml,"vbox1")); ++ g_assert (page->main != NULL); ++ + g_object_set_data_full (G_OBJECT (page->main), + "PropertyPage", + page, + free_property_page_cb); + +- page->checkbutton_share_folder = glade_xml_get_widget(page->xml,"checkbutton_share_folder"); +- page->hbox_share_comment = glade_xml_get_widget(page->xml,"hbox_share_comment"); +- page->hbox_share_name = glade_xml_get_widget(page->xml,"hbox_share_name"); +- page->checkbutton_share_rw_ro = glade_xml_get_widget(page->xml,"checkbutton_share_rw_ro"); +- page->checkbutton_share_guest_ok = glade_xml_get_widget(page->xml,"checkbutton_share_guest_ok"); +- page->entry_share_name = glade_xml_get_widget(page->xml,"entry_share_name"); +- page->entry_share_comment = glade_xml_get_widget(page->xml,"entry_share_comment"); +- page->label_status = glade_xml_get_widget(page->xml,"label_status"); +- page->button_cancel = glade_xml_get_widget(page->xml,"button_cancel"); +- page->button_apply = glade_xml_get_widget(page->xml,"button_apply"); ++ page->checkbutton_share_folder = GTK_WIDGET (gtk_builder_get_object (page->xml,"checkbutton_share_folder")); ++ page->hbox_share_comment = GTK_WIDGET (gtk_builder_get_object (page->xml,"hbox_share_comment")); ++ page->hbox_share_name = GTK_WIDGET (gtk_builder_get_object (page->xml,"hbox_share_name")); ++ page->checkbutton_share_rw_ro = GTK_WIDGET (gtk_builder_get_object (page->xml,"checkbutton_share_rw_ro")); ++ page->checkbutton_share_guest_ok = GTK_WIDGET (gtk_builder_get_object (page->xml,"checkbutton_share_guest_ok")); ++ page->entry_share_name = GTK_WIDGET (gtk_builder_get_object (page->xml,"entry_share_name")); ++ page->entry_share_comment = GTK_WIDGET (gtk_builder_get_object (page->xml,"entry_share_comment")); ++ page->label_status = GTK_WIDGET (gtk_builder_get_object (page->xml,"label_status")); ++ page->button_cancel = GTK_WIDGET (gtk_builder_get_object (page->xml,"button_cancel")); ++ page->button_apply = GTK_WIDGET (gtk_builder_get_object (page->xml,"button_apply")); + + /* Sanity check so that we don't screw up the Glade file */ + g_assert (page->checkbutton_share_folder != NULL +Index: nautilus-share/interfaces/share-dialog.ui +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nautilus-share/interfaces/share-dialog.ui 2009-09-08 02:54:23.000000000 +0800 +@@ -0,0 +1,301 @@ ++ ++ ++ ++ ++ ++ True ++ 12 ++ vertical ++ 12 ++ ++ ++ True ++ ++ ++ True ++ 64 ++ folder-remote ++ ++ ++ False ++ 0 ++ ++ ++ ++ ++ True ++ <big><b>Folder Sharing</b></big> ++ True ++ center ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ 0 ++ ++ ++ ++ ++ True ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ True ++ 5 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ ++ ++ 20 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Share _name: ++ True ++ entry_share_name ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ ● ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ Share this _folder ++ True ++ True ++ False ++ True ++ True ++ ++ ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ ++ ++ 20 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Co_mment: ++ True ++ entry_share_comment ++ ++ ++ 1 ++ ++ ++ ++ ++ 2 ++ 3 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ ● ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ ++ ++ ++ ++ ++ _Allow others to create and delete files in this folder ++ True ++ True ++ False ++ True ++ True ++ ++ ++ 2 ++ 3 ++ 4 ++ GTK_FILL ++ ++ ++ ++ ++ ++ _Guest access (for people without a user account) ++ True ++ True ++ False ++ True ++ True ++ ++ ++ 2 ++ 4 ++ 5 ++ GTK_FILL ++ ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ ++ ++ False ++ 3 ++ ++ ++ ++ ++ ++ False ++ 4 ++ ++ ++ ++ ++ False ++ True ++ automatic ++ automatic ++ in ++ ++ ++ True ++ True ++ ++ ++ ++ ++ 1 ++ 5 ++ ++ ++ ++ ++ False ++ ++ ++ False ++ 6 ++ ++ ++ ++ ++ True ++ 5 ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ ++ ++ True ++ gtk-save ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ 7 ++ ++ ++ ++ +Index: nautilus-share/po/POTFILES.in +=================================================================== +--- nautilus-share.orig/po/POTFILES.in 2009-09-08 01:40:30.000000000 +0800 ++++ nautilus-share/po/POTFILES.in 2009-09-08 02:54:23.000000000 +0800 +@@ -1,3 +1,3 @@ + src/nautilus-share.c + src/shares.c +-interfaces/share-dialog.glade.in ++[type: gettext/glade]interfaces/share-dialog.ui +Index: nautilus-share/interfaces/Makefile.am +=================================================================== +--- nautilus-share.orig/interfaces/Makefile.am 2009-09-08 02:54:22.000000000 +0800 ++++ nautilus-share/interfaces/Makefile.am 2009-09-08 02:54:23.000000000 +0800 +@@ -1,13 +1,8 @@ + interfaces = \ +- share-dialog.glade ++ share-dialog.ui + + interfaces_DATA = $(interfaces) + + EXTRA_DIST = \ +- $(interfaces:.glade=.glade.in) \ ++ $(interfaces) \ + fix.pl +- +-CLEANFILES = $(interfaces) +- +-$(interfaces): %.glade: %.glade.in +- cp $< $@ +Index: nautilus-share/interfaces/Makefile.in +=================================================================== +--- nautilus-share.orig/interfaces/Makefile.in 2009-09-08 02:54:22.000000000 +0800 ++++ nautilus-share/interfaces/Makefile.in 2009-09-08 02:54:23.000000000 +0800 +@@ -212,14 +212,14 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + interfaces = \ +- share-dialog.glade ++ share-dialog.ui + + interfaces_DATA = $(interfaces) + EXTRA_DIST = \ +- $(interfaces:.glade=.glade.in) \ ++ $(interfaces) \ + fix.pl + +-CLEANFILES = $(interfaces) ++CLEANFILES = + all: all-am + + .SUFFIXES: +@@ -402,9 +402,6 @@ + ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-interfacesDATA + +- +-$(interfaces): %.glade: %.glade.in +- cp $< $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-share/po/ar.po +=================================================================== +--- nautilus-share.orig/po/ar.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/ar.po 2009-09-08 02:54:23.000000000 +0800 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: Arabic\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-04-21 22:53+0100\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-04-14 18:49+0100\n" + "Last-Translator: Djihed Afifi \n" + "Language-Team: Arabeyes \n" +@@ -15,14 +15,14 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format + msgid "" + "Nautilus needs to add some permissions to your folder \"%s\" in order to " + "share it" + msgstr "" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" + "The folder \"%s\" needs the following extra permissions for sharing to " +@@ -31,160 +31,210 @@ + "automatically?" + msgstr "" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr "" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + #, fuzzy + msgid " - write permission by others\n" + msgstr "حرّر أذون الموقع" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr "" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + #, fuzzy + msgid "Add the permissions automatically" + msgstr "تغيير السرعة آليا" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, fuzzy, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "عفوا، لم يمكن تغيير تصاريح \"%s\"." + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + #, fuzzy + msgid "Share name is too long" + msgstr "اسم المستخدم طويل جدا!" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + #, fuzzy + msgid "The share name cannot be empty" + msgstr "لا يمكن أن يكون أمر بدء التشغيل فارغا" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, fuzzy, c-format + msgid "Error while getting share information: %s" + msgstr "حدث خلل عند تخزين بيانات الملف" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + #, fuzzy + msgid "Another share has the same name" + msgstr "يوجد مسبقاً مكان بنفس الاسم" + +-#: ../src/nautilus-share.c:645 +-#, fuzzy +-msgid "There was an error while getting the sharing information" +-msgstr "حدث خطأ عند بدأ التطبيق." +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + #, fuzzy + msgid "Modify _Share" + msgstr "عدّل الكلمة" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++#, fuzzy ++msgid "There was an error while getting the sharing information" ++msgstr "حدث خطأ عند بدأ التطبيق." ++ ++#: ../src/nautilus-share.c:1067 + #, fuzzy + msgid "Create _Share" + msgstr "أنشيء _قاعدة" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + #, fuzzy + msgid "Share" + msgstr "مشترك" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "متصفح الملفات" ++ ++#: ../src/nautilus-share.c:1430 + #, fuzzy + msgid "Sharing Options" + msgstr "خيارات التَّحذير" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + #, fuzzy + msgid "Share this Folder" + msgstr "المجلدات المشتركة" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, fuzzy, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "فشل الولوج لأسباب مجهولة: %s" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, fuzzy, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "أرجع خادم NNTP %s رمز الخطأ %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, fuzzy, c-format + msgid "'net usershare' returned error %d" + msgstr "أرجع خادم NNTP %s رمز الخطأ %d: %s" + +-#: ../src/shares.c:184 +-#, fuzzy ++#: ../src/shares.c:187 ++#, fuzzy, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "قيمة %s ليست نص UTF-8 صالح" + +-#: ../src/shares.c:418 ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "فشل" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "" + +-#: ../src/shares.c:518 +-#, fuzzy ++#: ../src/shares.c:556 ++#, fuzzy, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "فشل الولوج لأسباب مجهولة: %s" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, fuzzy, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "أرجع خادم NNTP %s رمز الخطأ %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" + msgstr "" + +-#: ../src/shares.c:688 ++#: ../src/shares.c:726 ++#, c-format + msgid "" + "Cannot change the path of an existing share; please remove the old share " + "first and add a new one" + msgstr "" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + #, fuzzy + msgid "Folder Sharing" + msgstr "متصفح الملفات" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "ال_تعليق:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + #, fuzzy + msgid "Share _name:" + msgstr "اسم المشاركة:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + #, fuzzy + msgid "Share this _folder" + msgstr "_شارك المجلد" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + #, fuzzy + msgid "_Allow others to create and delete files in this folder" + msgstr "لا تملك الصلاحيات الكافية للكتابة في هذا المجلد." + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" +Index: nautilus-share/po/ca.po +=================================================================== +--- nautilus-share.orig/po/ca.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/ca.po 2009-09-08 02:54:23.000000000 +0800 +@@ -6,7 +6,7 @@ + msgstr "" + "Project-Id-Version: nautilus-share\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-05-04 04:34+0100\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-05-05 13:24+0100\n" + "Last-Translator: Joan Duran \n" + "Language-Team: Catalan \n" +@@ -15,7 +15,7 @@ + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=n != 1;\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format + msgid "" + "Nautilus needs to add some permissions to your folder \"%s\" in order to " +@@ -24,7 +24,7 @@ + "El Nautilus ha d'afegir alguns permisos a la carpeta «%s» per a poder " + "compartir-la" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" + "The folder \"%s\" needs the following extra permissions for sharing to " +@@ -37,121 +37,170 @@ + "%s%s%sVoleu que el Nautilus afegeixi aquests permisos a la carpeta " + "automàticament?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - permís de lectura per a altres\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - permís d'escriptura per a altres\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - permís d'execució per a altres\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Afegeix els permisos automàticament" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "No s'ha pogut canviar els permisos de la carpeta «%s»" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "El nom de compartició és massa llarg" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "El nom de compartició no pot estar buit" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "S'ha produït un error en obtenir la informació de compartició: %s" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Una altra compartició té el mateix nom" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "S'ha produït un error en obtenir la informació de compartició" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "Modifica la _compartició" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "S'ha produït un error en obtenir la informació de compartició" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "Crea una _compartició" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Comparteix" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Carpeta compartida" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Opcions de compartició" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Comparteix aquesta carpeta" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s ha retornat amb el senyal %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s ha fallat per una raó desconeguda" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "'net usershare' ha retornat l'error %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "'net usershare' ha retornat l'error %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "la sortida del 'net usershare' no té una codificació UTF-8 vàlida" + +-#: ../src/shares.c:418 ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Ha fallat" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "El testparm del Samba ha retornat amb el senyal %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "El testparm del Samba ha fallat per una raó desconeguda" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "El testparm del Samba ha retornat l'error %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "El testparm del Samba ha retornat l'error %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" + msgstr "No es pot suprimir el camí compartit %s: el camí no està compartit" + +-#: ../src/shares.c:688 ++#: ../src/shares.c:726 ++#, c-format + msgid "" + "Cannot change the path of an existing share; please remove the old share " + "first and add a new one" +@@ -159,22 +208,26 @@ + "No es pot canviar el camí d'una compartició existent. Primer heu de suprimir " + "la compartició antiga i després afegir la nova" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Carpeta compartida" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "Co_mentari:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "_Nom de compartició:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "Comparteix aquesta _carpeta" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "_Permet que altres persones puguin escriure en aquesta carpeta" ++ ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" +Index: nautilus-share/po/de.po +=================================================================== +--- nautilus-share.orig/po/de.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/de.po 2009-09-08 02:54:23.000000000 +0800 +@@ -3,62 +3,244 @@ + # This file is distributed under the same license as the nautilus-share package. + # sebastien estienne , 2005. + # +-msgid "" +-msgstr "" +-"Project-Id-Version: nautilus-share 0.6.0\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2005-05-28 13:49+0200\n" +-"PO-Revision-Date: 2005-06-05 14:10+0100\n" +-"Last-Translator: Michael Kanis \n" +-"Language-Team: German \n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=2; plural=(n > 1);\n" +- +-#: ../src/nautilus-share.c:105 +-msgid "Sharename too long, may not appear on all Os" +-msgstr "Freigabename zu lang, könnte auf einigen Systemen nicht angezeigt werden." +- +-#: ../src/nautilus-share.c:116 +-msgid "Sharename already in use or forbidden!" +-msgstr "Freigabename bereits in Benutzung oder nicht erlaubt!" +- +-#: ../src/nautilus-share.c:467 +-msgid "shared (read only)" +-msgstr "freigegeben (nur lesen)" +- +-#: ../src/nautilus-share.c:472 +-msgid "shared (read and write)" +-msgstr "freigegeben (lesen und schreiben)" +- +-#: ../src/nautilus-share.c:476 +-msgid "not shared" +-msgstr "nicht freigegeben" +- +-#: ../src/nautilus-share.c:647 +-msgid "Share" +-msgstr "Ordner freigeben" +- +-#: ../src/nautilus-share.c:648 +-#: ../interfaces/share-dialog.glade.h:5 +-msgid "Share this Folder" +-msgstr "Diesen Ordner freigeben" +- +-#: ../interfaces/share-dialog.glade.h:1 +-msgid "Folder Sharing" +-msgstr "Ordner freigeben" +- +-#: ../interfaces/share-dialog.glade.h:2 +-msgid "Allow others to create and delete files in this folder" +-msgstr "Anderen erlauben, in diesen Ordner zu schreiben" +- +-#: ../interfaces/share-dialog.glade.h:3 +-msgid "Comment :" +-msgstr "Kommentar:" +- +-#: ../interfaces/share-dialog.glade.h:4 +-msgid "Share Name :" +-msgstr "Freigabename:" +- +- ++msgid "" ++msgstr "" ++"Project-Id-Version: nautilus-share 0.6.0\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" ++"PO-Revision-Date: 2005-06-05 14:10+0100\n" ++"Last-Translator: Michael Kanis \n" ++"Language-Team: German \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n > 1);\n" ++ ++#: ../src/nautilus-share.c:133 ++#, c-format ++msgid "" ++"Nautilus needs to add some permissions to your folder \"%s\" in order to " ++"share it" ++msgstr "" ++ ++#: ../src/nautilus-share.c:141 ++#, c-format ++msgid "" ++"The folder \"%s\" needs the following extra permissions for sharing to " ++"work:\n" ++"%s%s%sDo you want Nautilus to add these permissions to the folder " ++"automatically?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:145 ++msgid " - read permission by others\n" ++msgstr "" ++ ++#: ../src/nautilus-share.c:146 ++msgid " - write permission by others\n" ++msgstr "" ++ ++#: ../src/nautilus-share.c:147 ++msgid " - execute permission by others\n" ++msgstr "" ++ ++#: ../src/nautilus-share.c:151 ++msgid "Add the permissions automatically" ++msgstr "" ++ ++#: ../src/nautilus-share.c:177 ++#, c-format ++msgid "Could not change the permissions of folder \"%s\"" ++msgstr "" ++ ++#: ../src/nautilus-share.c:455 ++msgid "Share name is too long" ++msgstr "" ++ ++#: ../src/nautilus-share.c:489 ++msgid "The share name cannot be empty" ++msgstr "" ++ ++#: ../src/nautilus-share.c:502 ++#, c-format ++msgid "Error while getting share information: %s" ++msgstr "" ++ ++#: ../src/nautilus-share.c:512 ++msgid "Another share has the same name" ++msgstr "" ++ ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 ++msgid "Modify _Share" ++msgstr "" ++ ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "" ++ ++#: ../src/nautilus-share.c:1067 ++msgid "Create _Share" ++msgstr "" ++ ++#: ../src/nautilus-share.c:1329 ++msgid "Share" ++msgstr "Ordner freigeben" ++ ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Ordner freigeben" ++ ++#: ../src/nautilus-share.c:1430 ++msgid "Sharing Options" ++msgstr "" ++ ++#: ../src/nautilus-share.c:1431 ++msgid "Share this Folder" ++msgstr "Diesen Ordner freigeben" ++ ++#: ../src/shares.c:125 ++#, c-format ++msgid "%s %s %s returned with signal %d" ++msgstr "" ++ ++#: ../src/shares.c:134 ++#, c-format ++msgid "%s %s %s failed for an unknown reason" ++msgstr "" ++ ++#: ../src/shares.c:154 ++#, c-format ++msgid "'net usershare' returned error %d: %s" ++msgstr "" ++ ++#: ../src/shares.c:156 ++#, c-format ++msgid "'net usershare' returned error %d" ++msgstr "" ++ ++#: ../src/shares.c:187 ++#, c-format ++msgid "the output of 'net usershare' is not in valid UTF-8 encoding" ++msgstr "" ++ ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format ++msgid "Failed" ++msgstr "" ++ ++#: ../src/shares.c:550 ++#, c-format ++msgid "Samba's testparm returned with signal %d" ++msgstr "" ++ ++#: ../src/shares.c:556 ++#, c-format ++msgid "Samba's testparm failed for an unknown reason" ++msgstr "" ++ ++#: ../src/shares.c:571 ++#, c-format ++msgid "Samba's testparm returned error %d: %s" ++msgstr "" ++ ++#: ../src/shares.c:573 ++#, c-format ++msgid "Samba's testparm returned error %d" ++msgstr "" ++ ++#: ../src/shares.c:680 ++#, c-format ++msgid "Cannot remove the share for path %s: that path is not shared" ++msgstr "" ++ ++#: ../src/shares.c:726 ++#, c-format ++msgid "" ++"Cannot change the path of an existing share; please remove the old share " ++"first and add a new one" ++msgstr "" ++ ++#: ../interfaces/share-dialog.ui.h:1 ++msgid "Folder Sharing" ++msgstr "Ordner freigeben" ++ ++#: ../interfaces/share-dialog.ui.h:2 ++#, fuzzy ++msgid "Co_mment:" ++msgstr "Kommentar:" ++ ++#: ../interfaces/share-dialog.ui.h:3 ++#, fuzzy ++msgid "Share _name:" ++msgstr "Freigabename:" ++ ++#: ../interfaces/share-dialog.ui.h:4 ++#, fuzzy ++msgid "Share this _folder" ++msgstr "Diesen Ordner freigeben" ++ ++#: ../interfaces/share-dialog.ui.h:5 ++#, fuzzy ++msgid "_Allow others to create and delete files in this folder" ++msgstr "Anderen erlauben, in diesen Ordner zu schreiben" ++ ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" ++ ++#~ msgid "Sharename too long, may not appear on all Os" ++#~ msgstr "" ++#~ "Freigabename zu lang, könnte auf einigen Systemen nicht angezeigt werden." ++ ++#~ msgid "Sharename already in use or forbidden!" ++#~ msgstr "Freigabename bereits in Benutzung oder nicht erlaubt!" ++ ++#~ msgid "shared (read only)" ++#~ msgstr "freigegeben (nur lesen)" ++ ++#~ msgid "shared (read and write)" ++#~ msgstr "freigegeben (lesen und schreiben)" ++ ++#~ msgid "not shared" ++#~ msgstr "nicht freigegeben" +Index: nautilus-share/po/dz.po +=================================================================== +--- nautilus-share.orig/po/dz.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/dz.po 2009-09-08 02:54:23.000000000 +0800 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: nautilus-share\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-04-02 03:33+0100\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-04-02 04:43+0530\n" + "Last-Translator: yangka \n" + "Language-Team: dzongkha \n" +@@ -19,156 +19,218 @@ + "X-Poedit-Country: BHUTAN\n" + "X-Poedit-SourceCharset: utf-8\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format +-msgid "Nautilus needs to add some permissions to your folder \"%s\" in order to share it" +-msgstr " ནའུ་ཊི་ལཱསི་ལུ་ཁྱོད་ཀྱི་སྣོད་འཛིན་ལུ་ \"%s\" རུབ་སྤྱོད་འབད་ནི་ལུ་བརྡ་བཀོད་ནང་གནང་བ་ལ་ལོ་ཚུ་ཁ་སྐོང་འབད་དགོཔ་ཡོདཔ་ཨིན།" ++msgid "" ++"Nautilus needs to add some permissions to your folder \"%s\" in order to " ++"share it" ++msgstr "" ++" ནའུ་ཊི་ལཱསི་ལུ་ཁྱོད་ཀྱི་སྣོད་འཛིན་ལུ་ \"%s\" རུབ་སྤྱོད་འབད་ནི་ལུ་བརྡ་བཀོད་ནང་གནང་བ་ལ་ལོ་ཚུ་ཁ་སྐོང་" ++"འབད་དགོཔ་ཡོདཔ་ཨིན།" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" +-"The folder \"%s\" needs the following extra permissions for sharing to work:\n" +-"%s%s%sDo you want Nautilus to add these permissions to the folder automatically?" ++"The folder \"%s\" needs the following extra permissions for sharing to " ++"work:\n" ++"%s%s%sDo you want Nautilus to add these permissions to the folder " ++"automatically?" + msgstr "" + "སྣོད་འཛིན་འདི་ལུ་ \"%s\" ལབད་ནི་ལུ་རུབ་སྤྱོད་འབད་ནི་དོན་ལུ་གནང་བ་ཐེབས་ཚུ་དགོཔ་ཡོདཔ་ཨིན།\n" + "%s%s%sཁྱོད་ཀྱིས་ནའུ་ཊི་ལཱསི་འདི་ལུ་གནང་བ་དེ་ཚུ་སྣོད་འཛིན་རང་བཞིན་གྱིས་ཁ་སྐོང་འབད་བཅུག་ནི་ཨིན་ན?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - གཞན་ཚུ་གིས་ལྷག་ནི་གནང་བ།\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - གཞན་ཚུ་གིས་གནང་བ་འབྲི་ནི།\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - གཞན་ཚུ་གིས་ལག་ལེན་འཐབ་ནི་གནང་བ\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "གནང་བ་ཚུ་རང་བཞིན་གྱིས་ཁ་སྐོང་འབད།" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "སྣོད་འཛིན་གྱི་གནང་བ་ཚུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས། \"%s\"" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "རུབ་སྤྱོད་མིག་འདི་གནམ་མེད་ས་མེད་རིངམོ།" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "རུབ་སྤྱོད་འབད་ནི་མིང་འདི་སྟོངམ་བཏོན་མི་བཏུབ།" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "རུབ་སྤྱོད་འབད་ནི་བརྡ་དོན་ལེན་པའི་སྐབས་འཛོལ་བ། %s" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "གཞན་རུབ་སྤྱོད་འབད་ནི་ལུ་ཡང་མིང་ཅོག་འཐདཔ་ཡོདཔ།" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "རུབ་སྤྱོད་འབད་ནི་བརྡ་དོན་འདི་ལེན་པའི་སྐབས་འཛོལ་བ་ཅིག་འབྱུང་ཡོདཔ།" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "རུབ་སྤྱོད་འབད་ནི་ལེགས་བཅོས་འབད།(_S)" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "རུབ་སྤྱོད་འབད་ནི་བརྡ་དོན་འདི་ལེན་པའི་སྐབས་འཛོལ་བ་ཅིག་འབྱུང་ཡོདཔ།" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "རུབ་སྤྱོད་འབད་ནི་གསར་བསྐྲུན་འབད།(_S)" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "རུབ་སྤྱོད་འབད་ནི།" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "སྣོད་འཛིན་རུབ་སྤྱོད་འབད་དོ" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "གདམ་ཁ་ཚུ་རུབ་སྤྱོད་འབད་དོ།" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "སྣོད་འཛིན་འདི་རུབ་སྤྱོད་འབད།" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s བརྡ་རྟགས་དང་གཅིག་ཁར་སླར་ལོག་ཡོདཔ%d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %sམ་ཤེས་པའི་རྒྱུ་མཚན་ཅིག་གི་དོན་ལུ་འཐུས་ཤོར་འབྱུང་ཡོདཔ།" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "'net usershare' འཛོལ་བ་སླར་ལོག་ཡོདཔ %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "'net usershare' འཛོལ་བ་སླར་ལོག་ཡོདཔ %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "'net usershare' གི་་ཨའུཊི་པུཊི་འདི་ཡུ་ཊི་ཨེཕ་-༨་ཨིནཀོ་ཌིང་ནུས་ཅན་ནང་མེདཔ།" + +-#: ../src/shares.c:418 +-#: ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "འཐུས་ཤོར་འབྱུང་ཡོདཔ།" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "སམ་བ་གི་ཊེསིཊི་པརམ་བརྡ་རྟགས་དང་གཅིག་ཁར་སླར་ལོག་ཡོདཔ %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "སམ་བ་གི་ཊེསིཊི་པརམ་མ་ཤེས་པའི་རྒྱུ་མཚན་ཅིག་གི་དོན་ལུ་འཐུས་ཤོར་འབྱུང་ཡོདཔ།" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "སམ་བ་གི་ཊེསིཊི་པརམ་གྱི་འཛོལ་བ་སླར་ལོག་ཡོདཔ %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "སམ་བ་གི་ཊེསིཊི་པརམ་གི་འཛོལ་བ་སླར་ལོག་ཡོདཔ %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" +-msgstr "འགྲུལ་ལམ་གཡི་དོན་ལུ་རུབ་སྤྱོད་འབད་ནི་འདི་རྩ་བསྐྲད་གཏང་མི་ཚུགས %s: འགྲུལ་ལམ་དེ་རུབ་སྤྱོད་འབད་མེདཔ།" ++msgstr "" ++"འགྲུལ་ལམ་གཡི་དོན་ལུ་རུབ་སྤྱོད་འབད་ནི་འདི་རྩ་བསྐྲད་གཏང་མི་ཚུགས %s: འགྲུལ་ལམ་དེ་རུབ་སྤྱོད་འབད་མེདཔ།" + +-#: ../src/shares.c:688 +-msgid "Cannot change the path of an existing share; please remove the old share first and add a new one" +-msgstr "གནས་ཡོད་པའི་རུབ་སྤྱོད་འབད་ནི་གི་འགྲུལ་ལམ་འདི་བསྒྱུརལ་བཅོས་འབད་མི་ཚུགས་ རུབ་སྤྱོད་འབད་ནི་རྙིངམ་འདི་རྩ་བསྐྲད་གཏང་ནི་དང་གསརཔ་ཅིག་ཁ་སྐོང་འབད་གནང་།" ++#: ../src/shares.c:726 ++#, c-format ++msgid "" ++"Cannot change the path of an existing share; please remove the old share " ++"first and add a new one" ++msgstr "" ++"གནས་ཡོད་པའི་རུབ་སྤྱོད་འབད་ནི་གི་འགྲུལ་ལམ་འདི་བསྒྱུརལ་བཅོས་འབད་མི་ཚུགས་ རུབ་སྤྱོད་འབད་ནི་རྙིངམ་འདི་རྩ་" ++"བསྐྲད་གཏང་ནི་དང་གསརཔ་ཅིག་ཁ་སྐོང་འབད་གནང་།" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "སྣོད་འཛིན་རུབ་སྤྱོད་འབད་དོ" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "བསམ་བཀོད།(_m)" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "མིང་རུབ་སྤྱོད་འབད།(_n)" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "སྣོད་འཛིན་འདི་རུབ་སྤྱོད་འབད།(_f)" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "སྣོད་འཛིན་འདི་ནང་གཞན་གང་ཟག་ལུ་འབྲི་ཆོགཔ་ཨིན།(_A)" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" +Index: nautilus-share/po/en_GB.po +=================================================================== +--- nautilus-share.orig/po/en_GB.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/en_GB.po 2009-09-08 02:54:23.000000000 +0800 +@@ -6,7 +6,7 @@ + msgstr "" + "Project-Id-Version: nautilus-share\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-04-22 07:18+0100\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-05-16 08:43-0000\n" + "Last-Translator: David Lodge \n" + "Language-Team: en_GB \n" +@@ -15,156 +15,219 @@ + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format +-msgid "Nautilus needs to add some permissions to your folder \"%s\" in order to share it" +-msgstr "Nautilus needs to add some permissions to your folder \"%s\" in order to share it" ++msgid "" ++"Nautilus needs to add some permissions to your folder \"%s\" in order to " ++"share it" ++msgstr "" ++"Nautilus needs to add some permissions to your folder \"%s\" in order to " ++"share it" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" +-"The folder \"%s\" needs the following extra permissions for sharing to work:\n" +-"%s%s%sDo you want Nautilus to add these permissions to the folder automatically?" ++"The folder \"%s\" needs the following extra permissions for sharing to " ++"work:\n" ++"%s%s%sDo you want Nautilus to add these permissions to the folder " ++"automatically?" + msgstr "" +-"The folder \"%s\" needs the following extra permissions for sharing to work:\n" +-"%s%s%sDo you want Nautilus to add these permissions to the folder automatically?" ++"The folder \"%s\" needs the following extra permissions for sharing to " ++"work:\n" ++"%s%s%sDo you want Nautilus to add these permissions to the folder " ++"automatically?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - read permission by others\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - write permission by others\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - execute permission by others\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Add the permissions automatically" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "Could not change the permissions of folder \"%s\"" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "Share name is too long" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "The share name cannot be empty" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "Error while getting share information: %s" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Another share has the same name" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "There was an error while getting the sharing information" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "Modify _Share" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "There was an error while getting the sharing information" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "Create _Share" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Share" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Folder Sharing" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Sharing Options" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Share this Folder" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s returned with signal %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s failed for an unknown reason" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "'net usershare' returned error %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "'net usershare' returned error %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "the output of 'net usershare' is not in valid UTF-8 encoding" + +-#: ../src/shares.c:418 +-#: ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Failed" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "Samba's testparm returned with signal %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "Samba's testparm failed for an unknown reason" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "Samba's testparm returned error %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "Samba's testparm returned error %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" + msgstr "Cannot remove the share for path %s: that path is not shared" + +-#: ../src/shares.c:688 +-msgid "Cannot change the path of an existing share; please remove the old share first and add a new one" +-msgstr "Cannot change the path of an existing share; please remove the old share first and add a new one" ++#: ../src/shares.c:726 ++#, c-format ++msgid "" ++"Cannot change the path of an existing share; please remove the old share " ++"first and add a new one" ++msgstr "" ++"Cannot change the path of an existing share; please remove the old share " ++"first and add a new one" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Folder Sharing" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "Co_mment:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "Share _name:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "Share this _folder" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "_Allow others to create and delete files in this folder" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" +Index: nautilus-share/po/es.po +=================================================================== +--- nautilus-share.orig/po/es.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/es.po 2009-09-08 02:54:23.000000000 +0800 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: nautilus-share.HEAD.es\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-07-31 03:38+0100\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-08-01 00:26+0200\n" + "Last-Translator: Jorge González \n" + "Language-Team: Spanish \n" +@@ -17,7 +17,7 @@ + "X-Generator: KBabel 1.11.4\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format + msgid "" + "Nautilus needs to add some permissions to your folder \"%s\" in order to " +@@ -26,7 +26,7 @@ + "Nautilus necesita añadir algunos permisos a su carpeta «%s» para poder " + "compartirla" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" + "The folder \"%s\" needs the following extra permissions for sharing to " +@@ -34,148 +34,203 @@ + "%s%s%sDo you want Nautilus to add these permissions to the folder " + "automatically?" + msgstr "" +-"La carpeta «%s» necesita los siguientes permisos adicionales para poder compartirla:\n" ++"La carpeta «%s» necesita los siguientes permisos adicionales para poder " ++"compartirla:\n" + "%s%s%s¿Quiere que Nautilus añada automáticamente estos permisos a la carpeta?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - permisos de lectura por otros\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - permisos de escritura por otros\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - permisos de ejecución por otros\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Añadir los permisos automáticamente" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "No se pudo cambiar los permisos de la carpeta «%s»" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "El nombre compartido es demasiado largo" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "El nombre compartido no puede estar vacío" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "Error al obtener la información de compartición: %s" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Otro compartido tiene el mismo nombre" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "Hubo un error al obtener la información de compartición" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "Modificar _compartición" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "Hubo un error al obtener la información de compartición" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "Crear _compartición" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Compartir" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Compartición de carpetas" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Opciones de compartición" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Compartir esta carpeta" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "se devolvió %s %s %s con la señal %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s falló por una razón desconocida" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "La «red compartida» devolvió el error %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "La «red compartida» devolvió el error %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "La salida de la «red compartida» no está codificada en UTF-8" + +-#: ../src/shares.c:418 ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Fallo" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "Se devolvió el parámetro de prueba de Samba con la señal %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "El parámetro de prueba de Samba falló por una razón desconocida" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "El parámetro de prueba de Samba devolvió el error %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "El parámetro de prueba de Samba devolvió el error %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" +-msgstr "No se puede quitar la compartición para la ruta %s: esa ruta no está compartida" ++msgstr "" ++"No se puede quitar la compartición para la ruta %s: esa ruta no está " ++"compartida" + +-#: ../src/shares.c:688 ++#: ../src/shares.c:726 ++#, c-format + msgid "" + "Cannot change the path of an existing share; please remove the old share " + "first and add a new one" + msgstr "" +-"No se puede cambiar la ruta de una compartición existente; elimine la compartición antigua " +-"primero y añada una nueva" ++"No se puede cambiar la ruta de una compartición existente; elimine la " ++"compartición antigua primero y añada una nueva" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Compartición de carpetas" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "Co_mentario:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "_Nombre compartido:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "Compartir esta _carpeta" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "_Permitir a otras personas escribir en esta carpeta" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" +Index: nautilus-share/po/eu.po +=================================================================== +--- nautilus-share.orig/po/eu.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/eu.po 2009-09-08 02:54:23.000000000 +0800 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: eu\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-08-11 10:12+0200\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-08-11 10:37+0200\n" + "Last-Translator: Iñaki Larrañaga Murgoitio \n" + "Language-Team: Basque \n" +@@ -17,14 +17,16 @@ + "X-Generator: KBabel 1.11.4\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format + msgid "" + "Nautilus needs to add some permissions to your folder \"%s\" in order to " + "share it" +-msgstr "Nautilus-ek zenbait baimen gehitu behar dizkio zure \"%s\" karpetari, karpeta partekatzeko" ++msgstr "" ++"Nautilus-ek zenbait baimen gehitu behar dizkio zure \"%s\" karpetari, " ++"karpeta partekatzeko" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" + "The folder \"%s\" needs the following extra permissions for sharing to " +@@ -32,147 +34,202 @@ + "%s%s%sDo you want Nautilus to add these permissions to the folder " + "automatically?" + msgstr "" +-"\"%s\" karpetak honako baimen gehigarriak behar ditu partekatu ahal izateko:\n" +-"%s%s%s " +-"Nahi duzu Nautilus-ek baimen horiek karpetari automatikoki gehitzea?" ++"\"%s\" karpetak honako baimen gehigarriak behar ditu partekatu ahal " ++"izateko:\n" ++"%s%s%s Nahi duzu Nautilus-ek baimen horiek karpetari automatikoki gehitzea?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - besteek irakurtzeko baimena\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - besteek idazteko baimena\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - besteek exekutatzeko baimena\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Gehitu baimenak automatikoki" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "Ezin izan dira \"%s\" karpetaren baimenak aldatu" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "Partekatze-izena luzeegia da" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "Partekatze-izena ezin da hutsik egon" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "Errorea partekatzeko informazioa eskuratzean: %s" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Beste partekatze-izenak izen berdina du" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "Errorea gertatu da partekatzeko informazioa eskuratzean" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "Aldatu p_artekatzea" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "Errorea gertatu da partekatzeko informazioa eskuratzean" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "Sortu p_artekatzea" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Partekatu" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Karpeta partekatzea" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Partekatze-aukerak" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Partekatu karpeta hau" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s itzuli du honako seinalarekin: %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s huts egin du arrazoi ezezagunagatik" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "'partekatutako sarea'k %d errorea itzuli du: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "'partekatutako sarea'k %d errorea itzuli du" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "'partekatutako sarea'ren irteera ez da baliozko UTF-8 kodeketa" + +-#: ../src/shares.c:418 ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Huts egin du" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "Samba-ren probako parametroa %d seinalearekin itzuli da" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "Samba-ren probako parametroak huts egin du arrazoi ezezagunagatik" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "Samba-ren probako parametroak %d errorea itzuli du: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "Samba-ren probako parametroak %d errorea itzuli du" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" +-msgstr "Ezin da %s bide-izenetik partekatua kendu: bide-izena ez dago partekatua" ++msgstr "" ++"Ezin da %s bide-izenetik partekatua kendu: bide-izena ez dago partekatua" + +-#: ../src/shares.c:688 ++#: ../src/shares.c:726 ++#, c-format + msgid "" + "Cannot change the path of an existing share; please remove the old share " + "first and add a new one" +-msgstr "Ezin da existitzen den partekatuaren bide-izena aldatu. Aurrenik kendu partekatu zaharra eta gero gehitu berria" ++msgstr "" ++"Ezin da existitzen den partekatuaren bide-izena aldatu. Aurrenik kendu " ++"partekatu zaharra eta gero gehitu berria" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Karpeta partekatzea" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "_Iruzkina:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "Partekatze-_izena:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "Partekatu _karpeta hau" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "_Baimendu beste erabiltzaileek karpeta honetan idatea" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" +Index: nautilus-share/po/fi.po +=================================================================== +--- nautilus-share.orig/po/fi.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/fi.po 2009-09-08 02:54:23.000000000 +0800 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: nautilus-share 0.6.3\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-08-06 17:13+0300\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2005-05-28 01:21+0100\n" + "Last-Translator: WareKala \n" + "Language-Team: Finnish\n" +@@ -18,7 +18,7 @@ + "X-Poedit-Language: Finnish\n" + "X-Poedit-Country: FINNISH\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format + msgid "" + "Nautilus needs to add some permissions to your folder \"%s\" in order to " +@@ -27,7 +27,7 @@ + "Nautiluksen täytyy lisätä joitain oikeuksia kansioosi \"%s\", jotta se " + "voidaan jakaa" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" + "The folder \"%s\" needs the following extra permissions for sharing to " +@@ -38,121 +38,170 @@ + "Kansiolle \"%s\" täytyy antaa seuraavat lisäoikeudet, jotta jako toimii:\n" + "%s%s%sHaluatko Nautiluksen muuttavan kansion oikeudet automaattisesti?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - lukuoikeudet muille\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - kirjoitusoikeudet muille\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - suoritusoikeudet muille\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Lisää oikeudet automaattisesti" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "Kansion \"%s\" oikeuksia ei voitu muuttaa" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "Jaon nimi on liian pitkä" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "Jaon nimi ei voi olla tyhjä" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "Virhe haettaessa jaon tietoja: %s" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Toinen jako on olemassa samalla nimellä" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "Virhe haettaessa tietoja levyjaosta" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "Muokkaa _levyjakoa" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "Virhe haettaessa tietoja levyjaosta" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "Luo _levyjako" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Jaa" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Kansion jako" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Jakamisen valinnat" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Jaa tämä kansio" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s palautui signaalilla %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s epäonnistui tuntemattomasta syystä" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "komento 'net usershare' palautti virheen %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "'net usershare' palautti virheen %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "tuloste komennolta 'net usershare' ei ole UTF-8-koodattu" + +-#: ../src/shares.c:418 ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Epäonnistui" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "Samban testparm suljettiin signaaliin %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "Samban testparm epäonnistui tuntemattomasta syystä" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "Samban testparm palautti virheen %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "Samban testparm palautti virheen %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" + msgstr "Jakoa polulle %s ei voi poistaa: polku ei ole jaettu" + +-#: ../src/shares.c:688 ++#: ../src/shares.c:726 ++#, c-format + msgid "" + "Cannot change the path of an existing share; please remove the old share " + "first and add a new one" +@@ -160,26 +209,30 @@ + "Olemassaolevan jaon polkua ei voi muuttaa: ole hyvä ja poista ensin vanha " + "jako, ja lisää sitten uusi jako" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Kansion jako" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "Kommentti:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "Jaon _nimi:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "Jaa tämä _kansio" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "_Salli muiden kirjoittaa tähän kansioon" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" ++ + #~ msgid "Sharename too long, may not appear on all Os" + #~ msgstr "Jakonimi liian pitkä, ei ehkä näy oikein muilla" + +Index: nautilus-share/po/fr.po +=================================================================== +--- nautilus-share.orig/po/fr.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/fr.po 2009-09-08 02:54:23.000000000 +0800 +@@ -9,7 +9,7 @@ + msgstr "" + "Project-Id-Version: nautilus-share 0.6.0\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-04-22 09:32+0200\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-04-22 09:35+0200\n" + "Last-Translator: Jonathan Ernst \n" + "Language-Team: GNOME French Team \n" +@@ -18,14 +18,16 @@ + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n > 1);\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format + msgid "" + "Nautilus needs to add some permissions to your folder \"%s\" in order to " + "share it" +-msgstr "Nautilus doit ajouter des permissions à votre dossier « %s » afin de pouvoir le partager" ++msgstr "" ++"Nautilus doit ajouter des permissions à votre dossier « %s » afin de pouvoir " ++"le partager" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" + "The folder \"%s\" needs the following extra permissions for sharing to " +@@ -33,131 +35,180 @@ + "%s%s%sDo you want Nautilus to add these permissions to the folder " + "automatically?" + msgstr "" +-"Le dossier « %s » nécessite d'avoir les permissions supplémentaires " +-"suivantes afin de permettre son partage :\n" ++"Le dossier « %s » nécessite d'avoir les permissions supplémentaires suivantes " ++"afin de permettre son partage :\n" + "%s%s%sVoulez-vous que Nautilus ajoute automatiquement ces permissions au " + "dossier ?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - lecture par des tiers\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - écriture par des tiers\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - exécution par des tiers\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Ajouter les permissions automatiquement" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "Impossible de modifier les permissions du dossier « %s »" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "Le nom du partage est trop long" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "Le nom du partage ne peut pas être vide" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "" + "Une erreur est survenue lors de la récupération des informations du " + "partage : « %s »" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Un autre partage a déjà le même nom" + +-#: ../src/nautilus-share.c:645 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 ++msgid "Modify _Share" ++msgstr "Modifier le _partage" ++ ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 + msgid "There was an error while getting the sharing information" + msgstr "" + "Une erreur est survenue lors de la récupération des informations du partage" + +-#: ../src/nautilus-share.c:737 +-msgid "Modify _Share" +-msgstr "Modifier le _partage" +- +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "Créer un _partage" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Partager" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Partage de dossier" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Options de partage" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Partager ce dossier" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s a retourné le signal %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s a échoué pour une raison inconnue" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "« net usershare » a retourné l'erreur %d : %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "« net usershare » a retourné l'erreur %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "la sortie de « net usershare » n'est pas codée en UTF-8 valide" + +-#: ../src/shares.c:418 ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Échec" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "testparm de Samba a retourné le signal %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "testparm de Samba a échoué pour une raison inconnue" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "testparm de Samba a retourné l'erreur %d : %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "testparm de Samba a retourné l'erreur %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" + msgstr "" + "Impossible d'éliminer le partage pour le répertoire %s : ce répertoire n'est " + "pas partagé" + +-#: ../src/shares.c:688 ++#: ../src/shares.c:726 ++#, c-format + msgid "" + "Cannot change the path of an existing share; please remove the old share " + "first and add a new one" +@@ -165,26 +216,30 @@ + "Impossible de modifier le chemin d'un partage existant ; veuillez supprimer " + "l'ancien partage puis créez en un nouveau" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Partage de dossier" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "Co_mmentaire :" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "_Nom du partage :" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "Partager ce _dossier" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "_Permettre aux autres utilisateurs de modifier ce dossier" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" ++ + #~ msgid "Sharename too long, may not appear on all Os" + #~ msgstr "Nom trop long, peut ne pas apparaître sur certains systèmes" + +Index: nautilus-share/po/hu.po +=================================================================== +--- nautilus-share.orig/po/hu.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/hu.po 2009-09-08 02:54:23.000000000 +0800 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: new\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-04-05 03:35+0100\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-04-06 03:36+0200\n" + "Last-Translator: Gabor Kelemen \n" + "Language-Team: \n" +@@ -18,7 +18,7 @@ + "X-Generator: KBabel 1.11.4\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format + msgid "" + "Nautilus needs to add some permissions to your folder \"%s\" in order to " +@@ -27,7 +27,7 @@ + "A megosztáshoz a Nautilusnak fel kell vennie néhány jogosultságot a " + "következő mappához: \"%s\"" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" + "The folder \"%s\" needs the following extra permissions for sharing to " +@@ -36,147 +36,201 @@ + "automatically?" + msgstr "" + "A megosztáshoz a következő jogokat kell felvenni a(z) \"%s\" mappához:\n" +-"%s%s%s Kívánja, hogy a Nautilus automatikusan hozzáadja a szükséges jogokat a mappához?" ++"%s%s%s Kívánja, hogy a Nautilus automatikusan hozzáadja a szükséges jogokat " ++"a mappához?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - olvasási jogosultság mások számára\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - írási jogosultság mások számára\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - végrehajtási jogosultság mások számára\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Jogosultságok automatikus felvétele" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "A(z) \"%s\" mappa jogosultságainak megváltoztatása nem sikerült" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "A megosztás neve túl hosszú" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "A megosztás neve nem lehet üres" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "Hiba történt a(z) %s megosztás információinak lekérdezése közben" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Egy másik megosztásnak ugyanez a neve" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "Hiba történt a megosztás információinak lekérdezése közben" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "Mó_dosítás" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "Hiba történt a megosztás információinak lekérdezése közben" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "_Megosztás" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Megosztás" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Mappa megosztása" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Megosztás beállításai" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Könyvtár megosztása" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s a következő szignált adta vissza: %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s ismeretlen okból sikertelen" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "A 'net usershare' a következő hibát adta vissza: %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "A 'net usershare' a következő hibát adta vissza: %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "a 'net usershare' kimenete nem UTF-8 kódolású" + +-#: ../src/shares.c:418 ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Sikertelen" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "A Samba testparm parancsa a következő szignállal tért vissza: %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "A Samba testparm parancsa ismeretlen okból nem futott le" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "A Samba testparm parancsa a következő hibával tért vissza: %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "A Samba testparm parancsa a következő hibával tért vissza: %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" + msgstr "" + "A megosztás nem vonható vissza a megadott útvonalról (%s), mert az jelenleg " + "nem megosztott" + +-#: ../src/shares.c:688 ++#: ../src/shares.c:726 ++#, c-format + msgid "" + "Cannot change the path of an existing share; please remove the old share " + "first and add a new one" +-msgstr "A megosztás útvonala nem változtatható meg, először vonja vissza a megosztást" ++msgstr "" ++"A megosztás útvonala nem változtatható meg, először vonja vissza a megosztást" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Mappa megosztása" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "Meg_jegyzés:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "A m_egosztás neve:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "_Mappa megosztása" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "Írás engedélyezése a m_appába" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" +Index: nautilus-share/po/it.po +=================================================================== +--- nautilus-share.orig/po/it.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/it.po 2009-09-08 02:54:23.000000000 +0800 +@@ -2,65 +2,249 @@ + # Copyright (C) 2005 Mirko Maischberger + # This file is distributed under the same license as the nautilus-share package. + # Mirko Maischberger . +-# +-#, fuzzy +-msgid "" +-msgstr "" +-"Project-Id-Version: nautilus-share 0.6.0\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2005-05-28 13:49+0200\n" +-"PO-Revision-Date: 2005-06-15 18:08+0200\n" +-"Last-Translator: Mirko Maischberger \n" +-"Language-Team:\n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=2; plural=(n > 1);\n" +-"X-Poedit-Language: Italian\n" +-"X-Poedit-Country: ITALY\n" +- +-#: ../src/nautilus-share.c:105 +-msgid "Sharename too long, may not appear on all Os" +-msgstr "Nome condivisione troppo lungo, potrebbe non comparire correttamente su tutti i sistemi" +- +-#: ../src/nautilus-share.c:116 +-msgid "Sharename already in use or forbidden!" +-msgstr "Nome condivisione già in uso!" +- +-#: ../src/nautilus-share.c:467 +-msgid "shared (read only)" +-msgstr "condivisa (sola lettura)" +- +-#: ../src/nautilus-share.c:472 +-msgid "shared (read and write)" +-msgstr "condivisa (lettura/scrittura)" +- +-#: ../src/nautilus-share.c:476 +-msgid "not shared" +-msgstr "non condivisa" +- +-#: ../src/nautilus-share.c:647 +-msgid "Share" +-msgstr "Condivisione" +- +-#: ../src/nautilus-share.c:648 ../interfaces/share-dialog.glade.h:5 +-msgid "Share this Folder" +-msgstr "Condividi cartella" +- +-#: ../interfaces/share-dialog.glade.h:1 +-msgid "Folder Sharing" +-msgstr "Condivisione cartella" +- +-#: ../interfaces/share-dialog.glade.h:2 +-msgid "Allow others to create and delete files in this folder" +-msgstr "Permetti ad altri di scrivere in questa cartella" +- +-#: ../interfaces/share-dialog.glade.h:3 +-msgid "Comment :" +-msgstr "Commento :" +- +-#: ../interfaces/share-dialog.glade.h:4 +-msgid "Share Name :" +-msgstr "Nome della condivisione :" +- +- ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: nautilus-share 0.6.0\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" ++"PO-Revision-Date: 2005-06-15 18:08+0200\n" ++"Last-Translator: Mirko Maischberger \n" ++"Language-Team:\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n > 1);\n" ++"X-Poedit-Language: Italian\n" ++"X-Poedit-Country: ITALY\n" ++ ++#: ../src/nautilus-share.c:133 ++#, c-format ++msgid "" ++"Nautilus needs to add some permissions to your folder \"%s\" in order to " ++"share it" ++msgstr "" ++ ++#: ../src/nautilus-share.c:141 ++#, c-format ++msgid "" ++"The folder \"%s\" needs the following extra permissions for sharing to " ++"work:\n" ++"%s%s%sDo you want Nautilus to add these permissions to the folder " ++"automatically?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:145 ++msgid " - read permission by others\n" ++msgstr "" ++ ++#: ../src/nautilus-share.c:146 ++msgid " - write permission by others\n" ++msgstr "" ++ ++#: ../src/nautilus-share.c:147 ++msgid " - execute permission by others\n" ++msgstr "" ++ ++#: ../src/nautilus-share.c:151 ++msgid "Add the permissions automatically" ++msgstr "" ++ ++#: ../src/nautilus-share.c:177 ++#, c-format ++msgid "Could not change the permissions of folder \"%s\"" ++msgstr "" ++ ++#: ../src/nautilus-share.c:455 ++msgid "Share name is too long" ++msgstr "" ++ ++#: ../src/nautilus-share.c:489 ++msgid "The share name cannot be empty" ++msgstr "" ++ ++#: ../src/nautilus-share.c:502 ++#, c-format ++msgid "Error while getting share information: %s" ++msgstr "" ++ ++#: ../src/nautilus-share.c:512 ++msgid "Another share has the same name" ++msgstr "" ++ ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 ++msgid "Modify _Share" ++msgstr "" ++ ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "" ++ ++#: ../src/nautilus-share.c:1067 ++msgid "Create _Share" ++msgstr "" ++ ++#: ../src/nautilus-share.c:1329 ++msgid "Share" ++msgstr "Condivisione" ++ ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Condivisione cartella" ++ ++#: ../src/nautilus-share.c:1430 ++msgid "Sharing Options" ++msgstr "" ++ ++#: ../src/nautilus-share.c:1431 ++msgid "Share this Folder" ++msgstr "Condividi cartella" ++ ++#: ../src/shares.c:125 ++#, c-format ++msgid "%s %s %s returned with signal %d" ++msgstr "" ++ ++#: ../src/shares.c:134 ++#, c-format ++msgid "%s %s %s failed for an unknown reason" ++msgstr "" ++ ++#: ../src/shares.c:154 ++#, c-format ++msgid "'net usershare' returned error %d: %s" ++msgstr "" ++ ++#: ../src/shares.c:156 ++#, c-format ++msgid "'net usershare' returned error %d" ++msgstr "" ++ ++#: ../src/shares.c:187 ++#, c-format ++msgid "the output of 'net usershare' is not in valid UTF-8 encoding" ++msgstr "" ++ ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format ++msgid "Failed" ++msgstr "" ++ ++#: ../src/shares.c:550 ++#, c-format ++msgid "Samba's testparm returned with signal %d" ++msgstr "" ++ ++#: ../src/shares.c:556 ++#, c-format ++msgid "Samba's testparm failed for an unknown reason" ++msgstr "" ++ ++#: ../src/shares.c:571 ++#, c-format ++msgid "Samba's testparm returned error %d: %s" ++msgstr "" ++ ++#: ../src/shares.c:573 ++#, c-format ++msgid "Samba's testparm returned error %d" ++msgstr "" ++ ++#: ../src/shares.c:680 ++#, c-format ++msgid "Cannot remove the share for path %s: that path is not shared" ++msgstr "" ++ ++#: ../src/shares.c:726 ++#, c-format ++msgid "" ++"Cannot change the path of an existing share; please remove the old share " ++"first and add a new one" ++msgstr "" ++ ++#: ../interfaces/share-dialog.ui.h:1 ++msgid "Folder Sharing" ++msgstr "Condivisione cartella" ++ ++#: ../interfaces/share-dialog.ui.h:2 ++#, fuzzy ++msgid "Co_mment:" ++msgstr "Commento :" ++ ++#: ../interfaces/share-dialog.ui.h:3 ++#, fuzzy ++msgid "Share _name:" ++msgstr "Nome della condivisione :" ++ ++#: ../interfaces/share-dialog.ui.h:4 ++#, fuzzy ++msgid "Share this _folder" ++msgstr "Condividi cartella" ++ ++#: ../interfaces/share-dialog.ui.h:5 ++#, fuzzy ++msgid "_Allow others to create and delete files in this folder" ++msgstr "Permetti ad altri di scrivere in questa cartella" ++ ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" ++ ++#~ msgid "Sharename too long, may not appear on all Os" ++#~ msgstr "" ++#~ "Nome condivisione troppo lungo, potrebbe non comparire correttamente su " ++#~ "tutti i sistemi" ++ ++#~ msgid "Sharename already in use or forbidden!" ++#~ msgstr "Nome condivisione già in uso!" ++ ++#~ msgid "shared (read only)" ++#~ msgstr "condivisa (sola lettura)" ++ ++#~ msgid "shared (read and write)" ++#~ msgstr "condivisa (lettura/scrittura)" ++ ++#~ msgid "not shared" ++#~ msgstr "non condivisa" +Index: nautilus-share/po/pl.po +=================================================================== +--- nautilus-share.orig/po/pl.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/pl.po 2009-09-08 02:54:23.000000000 +0800 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: nautilus-share\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-06-27 10:12+0200\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-06-26 17:51+0100\n" + "Last-Translator: Tomasz Dominikowski \n" + "Language-Team: Tomasz Dominikowski \n" +@@ -17,7 +17,7 @@ + "X-Poedit-Language: Polish\n" + "X-Poedit-Country: Poland\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format + msgid "" + "Nautilus needs to add some permissions to your folder \"%s\" in order to " +@@ -26,7 +26,7 @@ + "Nautilus musi nadać pewne uprawnienia na folder \"%s\", aby można było go " + "współdzielić" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" + "The folder \"%s\" needs the following extra permissions for sharing to " +@@ -38,123 +38,172 @@ + "współdzielenie:\n" + "%s%s%sCzy chcesz, aby Nautilus nadał te uprawnienia automatycznie?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - uprawnienia odczytu przez innych\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - uprawnienia zapisu przez innych\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - uprawnienia wykonania przez innych\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Nadaj uprawnienia automatycznie" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "Nie można zmienić uprawnień folderu \"%s\"" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "Nazwa udziału jest zbyt długa" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "Nazwa udziału nie może być pusta" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "Błąd podczas uzyskiwania informacji o udziale: %s" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Inny udział ma już taką nazwę" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "Wystąpił błąd podczas pobierania informacji o współdzieleniu" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "_Zmodyfikuj udział" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "Wystąpił błąd podczas pobierania informacji o współdzieleniu" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "_Utwórz udział" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Udostępnij" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Udostępnianie folderów" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Opcje współdzielenia" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Udostępnij ten folder" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s zwrócono z sygnałem %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s nieudane z nieznanego powodu" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "\"net usershare\" zwrócił błąd %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "\"net usershare\" zwrócił błąd %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" + msgstr "" + "wiadomość zwrotna \"net usershare\" nie zawiera poprawnego kodowania UTF-8" + +-#: ../src/shares.c:418 ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Nieudane" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "Testparm Samby zwrócił sygnał %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "Testparm Samby nieudany z nieznanego powodu" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "Testparm Samby zwrócił błąd %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "Testparm Samby zwrócił błąd %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" + msgstr "" + "Nie można usunąć udziału dla ścieżki %s: ta ścieżka nie jest współdzielona" + +-#: ../src/shares.c:688 ++#: ../src/shares.c:726 ++#, c-format + msgid "" + "Cannot change the path of an existing share; please remove the old share " + "first and add a new one" +@@ -162,26 +211,30 @@ + "Nie można zmienić ścieżki do istniejącego udziału; proszę najpierw usunąć " + "poprzedni udział i utworzyć nowy" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Udostępnianie folderów" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "Ko_mentarz:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "_Nazwa udziału:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "Udostępnij ten _folder" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "Zezwolenie innym na z_apis w tym katalogu" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" ++ + #~ msgid "Sharename too long, may not appear on all Os" + #~ msgstr "Zbyt długa nazwa, moĹźe się nieukazać w niektĂłrych systemach" + +Index: nautilus-share/po/pt_BR.po +=================================================================== +--- nautilus-share.orig/po/pt_BR.po 2009-09-08 02:54:23.000000000 +0800 ++++ nautilus-share/po/pt_BR.po 2009-09-08 02:54:23.000000000 +0800 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: nautilus-share 0.6.0\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-04-01 03:33+0100\n" ++"POT-Creation-Date: 2009-09-08 01:40+0800\n" + "PO-Revision-Date: 2007-09-01 14:06-0500\n" + "Last-Translator: Og Maciel \n" + "Language-Team: Brazilian Portuguese \n" +@@ -19,169 +19,238 @@ + "X-Poedit-Language: Brazilian Portuguese\n" + "X-Poedit-Country: BRAZIL\n" + +-#: ../src/nautilus-share.c:128 ++#: ../src/nautilus-share.c:133 + #, c-format +-msgid "Nautilus needs to add some permissions to your folder \"%s\" in order to share it" +-msgstr "É necessário adicionar algumas permissões à sua pasta \"%s\" para compartilhá-lo" ++msgid "" ++"Nautilus needs to add some permissions to your folder \"%s\" in order to " ++"share it" ++msgstr "" ++"É necessário adicionar algumas permissões à sua pasta \"%s\" para " ++"compartilhá-lo" + +-#: ../src/nautilus-share.c:136 ++#: ../src/nautilus-share.c:141 + #, c-format + msgid "" +-"The folder \"%s\" needs the following extra permissions for sharing to work:\n" +-"%s%s%sDo you want Nautilus to add these permissions to the folder automatically?" ++"The folder \"%s\" needs the following extra permissions for sharing to " ++"work:\n" ++"%s%s%sDo you want Nautilus to add these permissions to the folder " ++"automatically?" + msgstr "" + "A pasta \"%s\" precisa das seguintes permissões para ser compartilhada:\n" + "%s%s%sVocê deseja adicionar estas permissões à pasta automaticamente?" + +-#: ../src/nautilus-share.c:140 ++#: ../src/nautilus-share.c:145 + msgid " - read permission by others\n" + msgstr " - permissões de leituras por outros\n" + +-#: ../src/nautilus-share.c:141 ++#: ../src/nautilus-share.c:146 + msgid " - write permission by others\n" + msgstr " - permissão de escrita por outros\n" + +-#: ../src/nautilus-share.c:142 ++#: ../src/nautilus-share.c:147 + msgid " - execute permission by others\n" + msgstr " - permissão de execução por outros\n" + +-#: ../src/nautilus-share.c:146 ++#: ../src/nautilus-share.c:151 + msgid "Add the permissions automatically" + msgstr "Adicionar as permissões automaticamente" + +-#: ../src/nautilus-share.c:172 ++#: ../src/nautilus-share.c:177 + #, c-format + msgid "Could not change the permissions of folder \"%s\"" + msgstr "Não foi possível modificar as permissões da pasta \"%s\"" + +-#: ../src/nautilus-share.c:442 ++#: ../src/nautilus-share.c:455 + msgid "Share name is too long" + msgstr "Nome do compartilhamento é muito longo" + +-#: ../src/nautilus-share.c:476 ++#: ../src/nautilus-share.c:489 + msgid "The share name cannot be empty" + msgstr "O nome do compartilhamento não pode ser vazio" + +-#: ../src/nautilus-share.c:489 ++#: ../src/nautilus-share.c:502 + #, c-format + msgid "Error while getting share information: %s" + msgstr "Erro ao obter informação do compartilhamento: %s" + +-#: ../src/nautilus-share.c:499 ++#: ../src/nautilus-share.c:512 + msgid "Another share has the same name" + msgstr "Um outro compartilhamento possui o mesmo nome" + +-#: ../src/nautilus-share.c:645 +-msgid "There was an error while getting the sharing information" +-msgstr "Houve um erro ao obter a informação do compartilhamento" +- +-#: ../src/nautilus-share.c:737 ++#: ../src/nautilus-share.c:559 ../src/nautilus-share.c:1065 + msgid "Modify _Share" + msgstr "Modificar Compar_tilhamento" + +-#: ../src/nautilus-share.c:739 ++#: ../src/nautilus-share.c:630 ++msgid "Restart your session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:633 ++msgid "You need to restart your session in order to enable sharing." ++msgstr "" ++ ++#: ../src/nautilus-share.c:634 ++msgid "Restart session" ++msgstr "" ++ ++#: ../src/nautilus-share.c:775 ++msgid "Sharing service installation failed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:778 ++msgid "" ++"Sharing service installation has failed. Would you like to retry the " ++"installation?" ++msgstr "" ++ ++#: ../src/nautilus-share.c:781 ++msgid "Retry" ++msgstr "" ++ ++#: ../src/nautilus-share.c:819 ++msgid "Sharing service is not installed" ++msgstr "" ++ ++#: ../src/nautilus-share.c:821 ++msgid "" ++"You need to install the Windows networks sharing service in order to share " ++"your folders." ++msgstr "" ++ ++#: ../src/nautilus-share.c:823 ++msgid "Install service" ++msgstr "" ++ ++#: ../src/nautilus-share.c:958 ++msgid "There was an error while getting the sharing information" ++msgstr "Houve um erro ao obter a informação do compartilhamento" ++ ++#: ../src/nautilus-share.c:1067 + msgid "Create _Share" + msgstr "Criar _Compartilhamento" + +-#: ../src/nautilus-share.c:993 ++#: ../src/nautilus-share.c:1329 + msgid "Share" + msgstr "Compartilhar" + +-#: ../src/nautilus-share.c:1093 ++#: ../src/nautilus-share.c:1389 ++#, fuzzy ++msgid "Folder Sharing" ++msgstr "Compartilhamento de Pastas" ++ ++#: ../src/nautilus-share.c:1430 + msgid "Sharing Options" + msgstr "Opções de Compartilhamento" + +-#: ../src/nautilus-share.c:1094 ++#: ../src/nautilus-share.c:1431 + msgid "Share this Folder" + msgstr "Compartilhar esta Pasta" + +-#: ../src/shares.c:122 ++#: ../src/shares.c:125 + #, c-format + msgid "%s %s %s returned with signal %d" + msgstr "%s %s %s retornou com signal %d" + +-#: ../src/shares.c:131 ++#: ../src/shares.c:134 + #, c-format + msgid "%s %s %s failed for an unknown reason" + msgstr "%s %s %s falhou por um motivo desconhecido" + +-#: ../src/shares.c:151 ++#: ../src/shares.c:154 + #, c-format + msgid "'net usershare' returned error %d: %s" + msgstr "\"compartilhamento de rede de usuário\" retornou erro %d: %s" + +-#: ../src/shares.c:153 ++#: ../src/shares.c:156 + #, c-format + msgid "'net usershare' returned error %d" + msgstr "\"compartilhamento de rede de usuário\" retornou erro %d" + +-#: ../src/shares.c:184 ++#: ../src/shares.c:187 ++#, c-format + msgid "the output of 'net usershare' is not in valid UTF-8 encoding" +-msgstr "a saída do \"compartilhamento de rede de usuário\" não está em uma codificação UTF-8 válida" ++msgstr "" ++"a saída do \"compartilhamento de rede de usuário\" não está em uma " ++"codificação UTF-8 válida" + +-#: ../src/shares.c:418 +-#: ../src/shares.c:577 ++#: ../src/shares.c:442 ../src/shares.c:615 ++#, c-format + msgid "Failed" + msgstr "Falhou" + +-#: ../src/shares.c:512 ++#: ../src/shares.c:550 + #, c-format + msgid "Samba's testparm returned with signal %d" + msgstr "O comando testparm do Samba retornou com sinal %d" + +-#: ../src/shares.c:518 ++#: ../src/shares.c:556 ++#, c-format + msgid "Samba's testparm failed for an unknown reason" + msgstr "O comando testparm do Samba falhou por um motivo desconhecido" + +-#: ../src/shares.c:533 ++#: ../src/shares.c:571 + #, c-format + msgid "Samba's testparm returned error %d: %s" + msgstr "O comando testparm do Samba retornou erro %d: %s" + +-#: ../src/shares.c:535 ++#: ../src/shares.c:573 + #, c-format + msgid "Samba's testparm returned error %d" + msgstr "O comando testparm do Samba retornou erro %d" + +-#: ../src/shares.c:642 ++#: ../src/shares.c:680 + #, c-format + msgid "Cannot remove the share for path %s: that path is not shared" +-msgstr "Não foi possível remover o compartilhamento do caminho %s: este caminho não é compartilhado" ++msgstr "" ++"Não foi possível remover o compartilhamento do caminho %s: este caminho não " ++"é compartilhado" + +-#: ../src/shares.c:688 +-msgid "Cannot change the path of an existing share; please remove the old share first and add a new one" +-msgstr "Não é possível modificar o caminho de um compartilhamento atual; por favor, remova-o primeiro e adicione um novo" ++#: ../src/shares.c:726 ++#, c-format ++msgid "" ++"Cannot change the path of an existing share; please remove the old share " ++"first and add a new one" ++msgstr "" ++"Não é possível modificar o caminho de um compartilhamento atual; por favor, " ++"remova-o primeiro e adicione um novo" + +-#: ../interfaces/share-dialog.glade.in.h:1 ++#: ../interfaces/share-dialog.ui.h:1 + msgid "Folder Sharing" + msgstr "Compartilhamento de Pastas" + +-#: ../interfaces/share-dialog.glade.in.h:2 ++#: ../interfaces/share-dialog.ui.h:2 + msgid "Co_mment:" + msgstr "Co_mentário:" + +-#: ../interfaces/share-dialog.glade.in.h:3 ++#: ../interfaces/share-dialog.ui.h:3 + msgid "Share _name:" + msgstr "_Nome do compartilhamento:" + +-#: ../interfaces/share-dialog.glade.in.h:4 ++#: ../interfaces/share-dialog.ui.h:4 + msgid "Share this _folder" + msgstr "Compar_tilhar esta pasta" + +-#: ../interfaces/share-dialog.glade.in.h:5 ++#: ../interfaces/share-dialog.ui.h:5 + msgid "_Allow others to create and delete files in this folder" + msgstr "Permite outras pessoas escreverem nesta p_asta" + ++#: ../interfaces/share-dialog.ui.h:6 ++msgid "_Guest access (for people without a user account)" ++msgstr "" ++ + #~ msgid "Sharename too long, may not appear on all Os" + #~ msgstr "" + #~ "Nome de compartilhamento muito longo, pode não ser indicado em alguns " + #~ "sistemas" ++ + #~ msgid "Sharename already in use or forbidden!" + #~ msgstr "Nome de compartilhamento já em uso ou proibido!" ++ + #~ msgid "shared (read only)" + #~ msgstr "compartilhado (apenas para leitura)" ++ + #~ msgid "shared (read and write)" + #~ msgstr "compartilhado (leitura e escrita)" ++ + #~ msgid "not shared" + #~ msgstr "não compartilhado" +-