Imported Upstream version 0.9.0

author: Carlos Martín Nieto <carlos@cmartin.tk> 2012-06-26 23:19:57 +0200
committer: Carlos Martín Nieto <carlos@cmartin.tk> 2012-06-26 23:19:57 +0200
commit: 50bd5da236c4da4abbb5a74e5884aef28f0e9548 (patch)
tree: ca8b5b960f799712ae5a2775e4a7048f302c7042
parent: 9a423cedb3984e73164d70197041eed44e20616d (diff)
218 files changed, 5983 insertions, 19989 deletions
diff --git a/Makefile.am b/Makefile.am
index 3013133..9c482e6 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,14 @@
-basedirs = build SparkleLib SparkleLib/Git data po
+basedirs = build SparkleLib SparkleLib/Git
 
 SUBDIRS = $(basedirs) $(GUISUBDIRS)
 DIST_SUBDIRS = $(basedirs) SparkleShare
 
 EXTRA_DIST = \
-	gnome-doc-utils.make \
-	LICENSE \
-	TRADEMARK \
-	AUTHORS
+	NEWS \
+        README.md \
+	legal/LICENSE \
+	legal/TRADEMARK \
+	legal/AUTHORS
 
 DISTCLEANFILES = \
 	intltool-extract        \
diff --git a/Makefile.in b/Makefile.in
index f5f9b13..d3cc352 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,12 +53,10 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in \
 	$(top_srcdir)/build/m4/shave/shave-libtool.in \
 	$(top_srcdir)/build/m4/shave/shave.in $(top_srcdir)/configure \
-	AUTHORS NEWS config.guess config.sub install-sh ltmain.sh \
-	missing
+	NEWS config.guess config.sub install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -65,6 +80,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -76,9 +96,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -107,10 +129,11 @@ am__relativize = \
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -121,50 +144,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -174,8 +178,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -187,8 +189,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -205,20 +205,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -257,14 +252,15 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-basedirs = build SparkleLib SparkleLib/Git data po
+basedirs = build SparkleLib SparkleLib/Git
 SUBDIRS = $(basedirs) $(GUISUBDIRS)
 DIST_SUBDIRS = $(basedirs) SparkleShare
 EXTRA_DIST = \
-	gnome-doc-utils.make \
-	LICENSE \
-	TRADEMARK \
-	AUTHORS
+	NEWS \
+        README.md \
+	legal/LICENSE \
+	legal/TRADEMARK \
+	legal/AUTHORS
 
 DISTCLEANFILES = \
 	intltool-extract        \
@@ -275,7 +271,7 @@ DISTCLEANFILES = \
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -492,13 +488,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -529,7 +522,11 @@ dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -537,7 +534,7 @@ dist-lzma: distdir
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -554,7 +551,7 @@ dist-zip: distdir
 
 dist dist-all: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
 	$(am__remove_distdir)
@@ -570,6 +567,8 @@ distcheck: dist
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -589,6 +588,7 @@ distcheck: dist
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -617,8 +617,16 @@ distcheck: dist
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -649,10 +657,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -741,8 +754,8 @@ uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool clean-local ctags ctags-recursive dist dist-all \
-	dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic \
+	dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
diff --git a/NEWS b/NEWS
index 5def091..ca524c3 100755
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,24 @@
-0.8.4 for Linux, Mac and Window (Sun Mar 18 2012)
+0.9.0 for Linux, Mac and Windows (Wed Jun 27 2012)
+
+	Hylke:
+	- Expeimental client side encryption using OpenSSL's AES
+	- Allow setting custom paths in config.xml
+	- Ship host keys of default plugins and verify on project add
+	- Don't touch the user's ~/.ssh/config to configure SSH
+	- Make fetching remote project's history optional
+	- Cached logs for faster event log loading/switching
+	- Sort event log file entries by time
+	- Change default notification service to use port 80
+	- Show backend error message(s) when on failed project add
+	- Update Growl framework to version 1.3.1: A separate Growl 
+	  is no longer needed and ready for Mountain Lion's notifications
+	- Monochrome appindicator icons on Ubuntu
+
+	Travis:
+	- Rewrote the notification service, now more robust and reliable
+
+
+0.8.4 for Linux, Mac and Windows (Sun Mar 18 2012)
 
 	Hylke:
 	- Show initial sync progress in taskbar item on Windows 7
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8b5ddff
--- /dev/null
+++ b/README.md
@@ -0,0 +1,34 @@
+## SparkleShare
+
+SparkleShare is an Open Source collaboration and sharing tool that is designed to keep things simple and to stay out of your way. It allows you to instantly sync with [Git](http://www.git-scm.org/) repositories and is available for Linux distributions, Mac and Windows.
+
+
+### Resources
+
+|                    |                                                   |
+|-------------------:|:--------------------------------------------------|
+|       **Website**: | http://www.sparkleshare.org/                      |
+|     **Downloads**: | https://github.com/hbons/SparkleShare/downloads   |
+|   **Source code**: | https://github.com/hbons/SparkleShare             |
+|   **IRC channel**: | #sparkleshare on irc.gnome.org                    |
+|          **Wiki**: | http://github.com/hbons/SparkleShare/wiki/        |
+| **Report issues**: | http://github.com/hbons/SparkleShare/issues/      |
+|  **Translations**: | http://www.transifex.net/projects/p/sparkleshare/ |
+
+
+### License
+
+SparkleShare is Open Source software and licensed under the `GNU General Public License version 3 or later`. You are welcome to change and redistribute it under certain conditions.For more information see the `legal/LICENSE` file.
+
+
+### Building...
+
+[...on Linux distributions](https://github.com/hbons/SparkleShare/blob/master/SparkleShare/Linux/README.md)  
+[...on Mac](https://github.com/hbons/SparkleShare/blob/master/SparkleShare/Mac/README.md)  
+[...on Windows](https://github.com/hbons/SparkleShare/blob/master/SparkleShare/Windows/README.md)  
+
+
+### Finally...
+
+Have fun, make awesome. :)
+
diff --git a/SparkleLib/AssemblyInfo.cs b/SparkleLib/AssemblyInfo.cs
index f2a7938..77e5db1 100644
--- a/SparkleLib/AssemblyInfo.cs
+++ b/SparkleLib/AssemblyInfo.cs
@@ -7,5 +7,5 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("0.8.4")]
+[assembly: AssemblyVersion("0.9.0")]
 [assembly: AssemblyTitle ("SparkleShare")]
diff --git a/SparkleLib/Defines.cs b/SparkleLib/Defines.cs
index dda6906..dd5a8cf 100644
--- a/SparkleLib/Defines.cs
+++ b/SparkleLib/Defines.cs
@@ -20,11 +20,11 @@ namespace SparkleLib {
 
 	public class Defines {
 
-		public const string VERSION         = "0.8.4";
-		public const string LOCALE_DIR      = "/usr/share/locale";
-		public const string DATAROOTDIR     = "/usr/share";
-		public const string GETTEXT_PACKAGE = "sparkleshare";
-		public const string PREFIX          = "/usr";
+		public const string VERSION         = "0.9.0";
+		public const string LOCALE_DIR      = "/home/carlos/staging/ss/share/locale";
+		public const string DATAROOTDIR     = "/home/carlos/staging/ss/share";
+		public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+		public const string PREFIX          = "/home/carlos/staging/ss";
 	}
 }
 
diff --git a/SparkleLib/Git/Makefile.in b/SparkleLib/Git/Makefile.in
index db3c6e0..90202f2 100644
--- a/SparkleLib/Git/Makefile.in
+++ b/SparkleLib/Git/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -40,7 +57,6 @@ subdir = SparkleLib/Git
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -74,13 +90,23 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(moduledir)"
 SCRIPTS = $(module_SCRIPTS)
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -91,50 +117,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -144,8 +151,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -157,8 +162,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -175,20 +178,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -333,6 +331,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/build/build.mk $(top_srcdir)/build/build.environment.mk $(top_srcdir)/build/build.rules.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -344,8 +343,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-moduleSCRIPTS: $(module_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
 	@list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -373,9 +375,7 @@ uninstall-moduleSCRIPTS:
 	@list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(moduledir)" && rm -f $$files
+	dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -436,10 +436,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs
index 27b835d..3b732a8 100755
--- a/SparkleLib/Git/SparkleFetcherGit.cs
+++ b/SparkleLib/Git/SparkleFetcherGit.cs
@@ -16,8 +16,9 @@
 
 
 using System;
-using System.IO;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
 
@@ -29,35 +30,22 @@ namespace SparkleLib.Git {
     public class SparkleFetcher : SparkleFetcherBase {
 
         private SparkleGit git;
+        private string crypto_salt = "e0d592768d7cf99a"; // TODO: Make unique per repo
 
 
-        public SparkleFetcher (string server, string remote_path, string target_folder) :
-            base (server, remote_path, target_folder)
+        public SparkleFetcher (string server, string required_fingerprint, string remote_path,
+            string target_folder, bool fetch_prior_history) : base (server, required_fingerprint, remote_path,
+                target_folder, fetch_prior_history)
         {
-			remote_path = remote_path.Trim ("/".ToCharArray ());
-			
-            if (server.EndsWith ("/"))
-                server = server.Substring (0, server.Length - 1);
-
-            if (!remote_path.StartsWith ("/"))
-                remote_path = "/" + remote_path;
-
-            Uri uri;
-
-            try {
-				uri = new Uri (server + remote_path);
-
-            } catch (UriFormatException) {
-				uri = new Uri ("ssh://" + server + remote_path);
-            }
-
+            Uri uri = RemoteUrl;
 
             if (!uri.Scheme.Equals ("ssh") &&
+                !uri.Scheme.Equals ("https") &&
+                !uri.Scheme.Equals ("http") &&
                 !uri.Scheme.Equals ("git")) {
-				
-				uri = new Uri ("ssh://" + uri);
-            }
 
+                uri = new Uri ("ssh://" + uri);
+            }
 
             if (uri.Host.Equals ("gitorious.org")) {
                 if (!uri.AbsolutePath.Equals ("/") &&
@@ -76,27 +64,40 @@ namespace SparkleLib.Git {
                 uri = new Uri ("ssh://git@gnome.org/git" + uri.AbsolutePath);
 
             } else {
-                if (string.IsNullOrEmpty (uri.UserInfo)) {
-					if (uri.Port == -1)
-						uri = new Uri (uri.Scheme + "://git@" + uri.Host + uri.AbsolutePath);
-					else
-						uri = new Uri (uri.Scheme + "://git@" + uri.Host + ":" + uri.Port + uri.AbsolutePath);
+                if (string.IsNullOrEmpty (uri.UserInfo) &&
+                    !uri.Scheme.Equals ("https") &&
+                    !uri.Scheme.Equals ("http")) {
+
+                    if (uri.Port == -1)
+                        uri = new Uri (uri.Scheme + "://git@" + uri.Host + uri.AbsolutePath);
+                    else
+                        uri = new Uri (uri.Scheme + "://git@" + uri.Host + ":" + uri.Port + uri.AbsolutePath);
                 }
             }
 
-
             TargetFolder = target_folder;
-            RemoteUrl    = uri.ToString ();
+            RemoteUrl    = uri;
         }
 
 
         public override bool Fetch ()
         {
-            this.git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath,
-                "clone " +
-                "--progress " + // Redirects progress stats to standarderror
-                "\"" + RemoteUrl + "\" \"" + TargetFolder + "\"");
-            
+            if (FetchPriorHistory) {
+                this.git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath,
+                    "clone " +
+                    "--progress " +
+                    "--no-checkout " +
+                    "\"" + RemoteUrl + "\" \"" + TargetFolder + "\"");
+
+            } else {
+                    this.git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath,
+                    "clone " +
+                    "--progress " +
+                    "--no-checkout " +
+                    "--depth=1 " +
+                    "\"" + RemoteUrl + "\" \"" + TargetFolder + "\"");
+            }
+
             this.git.StartInfo.RedirectStandardError = true;
             this.git.Start ();
 
@@ -123,8 +124,18 @@ namespace SparkleLib.Git {
                     else
                         // "Compressing objects" stage
                         number = (number / 100 * 20);
+
+                } else {
+                    SparkleHelpers.DebugInfo ("Fetcher", line);
+
+                    if (line.StartsWith ("fatal:", true, null) ||
+                        line.StartsWith ("error:", true, null)) {
+
+                        base.errors.Add (line);
+                    }
                 }
-                
+
+
                 if (number >= percentage) {
                     percentage = number;
 
@@ -136,23 +147,25 @@ namespace SparkleLib.Git {
             }
             
             this.git.WaitForExit ();
+
             SparkleHelpers.DebugInfo ("Git", "Exit code: " + this.git.ExitCode);
 
             if (this.git.ExitCode == 0) {
                 while (percentage < 100) {
                     percentage += 25;
-    
+
                     if (percentage >= 100)
                         break;
-    
+
                     Thread.Sleep (500);
                     base.OnProgressChanged (percentage);
                 }
-    
+
                 base.OnProgressChanged (100);
 
                 InstallConfiguration ();
                 InstallExcludeRules ();
+
                 AddWarnings ();
 
                 return true;
@@ -163,38 +176,125 @@ namespace SparkleLib.Git {
         }
 
 
-        private void AddWarnings ()
+        public override bool IsFetchedRepoEmpty {
+            get {
+                SparkleGit git = new SparkleGit (TargetFolder, "rev-parse HEAD");
+                git.Start ();
+
+                // Reading the standard output HAS to go before
+                // WaitForExit, or it will hang forever on output > 4096 bytes
+                git.StandardOutput.ReadToEnd ();
+                git.WaitForExit ();
+
+                return (git.ExitCode != 0);
+            }
+        }
+
+
+        public override void EnableFetchedRepoCrypto (string password)
         {
-            SparkleGit git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath,
-                "config --global core.excludesfile");
+            // Define the crypto filter in the config
+            string repo_config_file_path = SparkleHelpers.CombineMore (TargetFolder, ".git", "config");
+            string config = File.ReadAllText (repo_config_file_path);
 
-            git.Start ();
+            string n = Environment.NewLine;
+
+            config += "[filter \"crypto\"]" + n +
+                "\tsmudge = openssl enc -d -aes-256-cbc -base64 -S " + this.crypto_salt + " -pass file:.git/password" + n +
+                "\tclean  = openssl enc -e -aes-256-cbc -base64 -S " + this.crypto_salt + " -pass file:.git/password" + n;
+
+            File.WriteAllText (repo_config_file_path, config);
+
+
+            // Pass all files through the crypto filter
+            string git_attributes_file_path = SparkleHelpers.CombineMore (
+                TargetFolder, ".git", "info", "attributes");
+
+            File.WriteAllText (git_attributes_file_path, "* filter=crypto");
+
+
+            // Store the password
+            string password_file_path = SparkleHelpers.CombineMore (TargetFolder, ".git", "password");
+            File.WriteAllText (password_file_path, password.Trim ());
+        }
+
+
+        public override bool IsFetchedRepoPasswordCorrect (string password)
+        {
+            string password_check_file_path = Path.Combine (TargetFolder, ".sparkleshare");
+
+            if (!File.Exists (password_check_file_path)) {
+                SparkleGit git = new SparkleGit (TargetFolder, "show HEAD:.sparkleshare");
+                git.Start ();
+
+                // Reading the standard output HAS to go before
+                // WaitForExit, or it will hang forever on output > 4096 bytes
+                string output = git.StandardOutput.ReadToEnd ();
+                git.WaitForExit ();
+
+                if (git.ExitCode != 0) {
+                    return false;
+
+                } else {
+                    File.WriteAllText (password_check_file_path, output);
+                }
+            }
+
+            Process process = new Process () {
+                EnableRaisingEvents = true
+            };
+
+            process.StartInfo.WorkingDirectory       = TargetFolder;
+            process.StartInfo.UseShellExecute        = false;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.CreateNoWindow         = true;
+
+            process.StartInfo.FileName  = "openssl";
+            process.StartInfo.Arguments = "enc -d -aes-256-cbc -base64 -S " + this.crypto_salt +
+                " -pass pass:\"" + password + "\" -in " + password_check_file_path;
+
+            process.Start ();
 
             // Reading the standard output HAS to go before
             // WaitForExit, or it will hang forever on output > 4096 bytes
-            string output = git.StandardOutput.ReadToEnd ().Trim ();
-            git.WaitForExit ();
+            process.StandardOutput.ReadToEnd ();
+            process.WaitForExit ();
 
-            if (string.IsNullOrEmpty (output)) {
-                return;
+            if (process.ExitCode == 0) {
+                File.Delete (password_check_file_path);
+                return true;
 
             } else {
-                Warnings = new string [] {
-                    string.Format ("You seem to have configured a system wide ‘gitignore’ file. " +
-                                   "This may affect SparkleShare files:\n\n{0}", output)
-                };
+                return false;
             }
         }
 
 
         public override void Stop ()
         {
-            if (this.git != null && !this.git.HasExited) {
+            try {
+                this.git.Close ();
                 this.git.Kill ();
                 this.git.Dispose ();
+
+            } catch (Exception e) {
+                SparkleHelpers.DebugInfo ("Fetcher", "Failed to dispose properly: " + e.Message);
             }
+        }
+
 
-            Dispose ();
+        public override void Complete ()
+        {
+            if (IsFetchedRepoEmpty)
+                return;
+
+            SparkleGit git = new SparkleGit (TargetFolder, "checkout HEAD");
+            git.Start ();
+
+            // Reading the standard output HAS to go before
+            // WaitForExit, or it will hang forever on output > 4096 bytes
+            git.StandardOutput.ReadToEnd ();
+            git.WaitForExit ();
         }
 
 
@@ -203,13 +303,16 @@ namespace SparkleLib.Git {
         private void InstallConfiguration ()
         {
             string repo_config_file_path = SparkleHelpers.CombineMore (TargetFolder, ".git", "config");
-            string config = String.Join (Environment.NewLine, File.ReadAllLines (repo_config_file_path));
+            string config = File.ReadAllText (repo_config_file_path);
 
             string n = Environment.NewLine;
 
             config = config.Replace ("[core]" + n,
-                "[core]" + n + "\tquotepath = false" + n + // Show special characters in the logs
+                "[core]" + n +
+                "\tquotepath = false" + n + // Show special characters in the logs
                 "\tpackedGitLimit = 128m" + n +
+                "\tautocrlf = false" + n +
+                "\tsafecrlf = false" + n +
                 "\tpackedGitWindowSize = 128m" + n);
 
             config = config.Replace ("[remote \"origin\"]" + n,
@@ -226,11 +329,8 @@ namespace SparkleLib.Git {
             config = config.Replace ("filemode = true", "filemode = false");
 
             // Write the config to the file
-            TextWriter writer = new StreamWriter (repo_config_file_path);
-            writer.WriteLine (config);
-            writer.Close ();
-
-            SparkleHelpers.DebugInfo ("Config", "Added configuration to '" + repo_config_file_path + "'");
+            File.WriteAllText (repo_config_file_path, config);
+            SparkleHelpers.DebugInfo ("Fetcher", "Added configuration to '" + repo_config_file_path + "'");
         }
 
 
@@ -344,5 +444,26 @@ namespace SparkleLib.Git {
 
             writer.Close ();
         }
+
+
+        private void AddWarnings ()
+        {
+            /*
+            SparkleGit git = new SparkleGit (TargetFolder,
+                "config --global core.excludesfile");
+
+            git.Start ();
+
+            // Reading the standard output HAS to go before
+            // WaitForExit, or it will hang forever on output > 4096 bytes
+            string output = git.StandardOutput.ReadToEnd ().Trim ();
+            git.WaitForExit ();
+
+            if (string.IsNullOrEmpty (output))
+                return;
+            else
+                this.warnings.Add ("You seem to have a system wide ‘gitignore’ file, this may affect SparkleShare files.");
+            */
+        }
     }
 }
diff --git a/SparkleLib/Git/SparkleGit.cs b/SparkleLib/Git/SparkleGit.cs
index 06b280c..7e13a46 100644
--- a/SparkleLib/Git/SparkleGit.cs
+++ b/SparkleLib/Git/SparkleGit.cs
@@ -48,7 +48,8 @@ namespace SparkleLib.Git {
 
         new public void Start ()
         {
-            SparkleHelpers.DebugInfo ("Cmd", "git " + StartInfo.Arguments);
+            SparkleHelpers.DebugInfo ("Cmd | " + System.IO.Path.GetFileName (StartInfo.WorkingDirectory),
+                "git " + StartInfo.Arguments);
 
             try {
                 base.Start ();
diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index f8ff086..fb39577 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -25,37 +25,11 @@ namespace SparkleLib.Git {
 
     public class SparkleRepo : SparkleRepoBase {
 
-        public SparkleRepo (string path) : base (path)
-        {
-        }
+		private bool author_set = false;
 
 
-        private string identifier = null;
-
-        public override string Identifier {
-            get {
-                if (string.IsNullOrEmpty (this.identifier)) {
-
-                    // Because git computes a hash based on content,
-                    // author, and timestamp; it is unique enough to
-                    // use the hash of the first commit as an identifier
-                    // for our folder
-                    SparkleGit git = new SparkleGit (LocalPath, "rev-list --reverse HEAD");
-                    git.Start ();
-
-                    // Reading the standard output HAS to go before
-                    // WaitForExit, or it will hang forever on output > 4096 bytes
-                    string output = git.StandardOutput.ReadToEnd ();
-                    git.WaitForExit ();
-
-                    if (output.Length < 40)
-                        return null;
-
-                    this.identifier = output.Substring (0, 40);
-                }
-
-                return this.identifier;
-            }
+        public SparkleRepo (string path) : base (path)
+        {
         }
 
 
@@ -113,6 +87,13 @@ namespace SparkleLib.Git {
         }
 
 
+        public override void CreateInitialChangeSet ()
+        {
+            base.CreateInitialChangeSet ();
+            SyncUp (); // FIXME: Weird freeze happens when base class handles this
+        }
+
+
         public override string [] UnsyncedFilePaths {
             get {
                 List<string> file_paths = new List<string> ();
@@ -144,19 +125,20 @@ namespace SparkleLib.Git {
 
         public override string CurrentRevision {
             get {
-
                 // Remove stale rebase-apply files because it
                 // makes the method return the wrong hashes.
                 string rebase_apply_file = SparkleHelpers.CombineMore (LocalPath, ".git", "rebase-apply");
+
                 if (File.Exists (rebase_apply_file))
                     File.Delete (rebase_apply_file);
 
-                SparkleGit git = new SparkleGit (LocalPath, "log -1 --format=%H");
+                SparkleGit git = new SparkleGit (LocalPath, "rev-parse HEAD");
                 git.Start ();
+                
+                string output = git.StandardOutput.ReadToEnd ();
                 git.WaitForExit ();
 
                 if (git.ExitCode == 0) {
-                    string output = git.StandardOutput.ReadToEnd ();
                     return output.TrimEnd ();
 
                 } else {
@@ -166,11 +148,12 @@ namespace SparkleLib.Git {
         }
 
 
-        public override bool HasRemoteChanges
-        {
+        public override bool HasRemoteChanges {
             get {
-                SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Checking for remote changes...");
-                SparkleGit git = new SparkleGit (LocalPath, "ls-remote " + Url + " master");
+                SparkleHelpers.DebugInfo ("Git", Name + " | Checking for remote changes...");
+
+                string current_revision = CurrentRevision;
+                SparkleGit git = new SparkleGit (LocalPath, "ls-remote --exit-code \"" + RemoteUrl + "\" master");
     
                 git.Start ();
                 git.WaitForExit ();
@@ -178,15 +161,19 @@ namespace SparkleLib.Git {
                 if (git.ExitCode != 0)
                     return false;
     
-                string remote_revision = git.StandardOutput.ReadToEnd ().TrimEnd ();
+                string remote_revision = git.StandardOutput.ReadToEnd ().Substring (0, 40);
     
-                if (!remote_revision.StartsWith (CurrentRevision)) {
+                if (!remote_revision.StartsWith (current_revision)) {
                     SparkleHelpers.DebugInfo ("Git",
-                        "[" + Name + "] Remote changes found. (" + remote_revision + ")");
+                        Name + " | Remote changes detected (local: " +
+                        current_revision + ", remote: " + remote_revision + ")");
 
                     return true;
 
                 } else {
+                    SparkleHelpers.DebugInfo ("Git",
+                        Name + " | No remote changes detected (local+remote: " + current_revision + ")");
+
                     return false;
                 }
             }
@@ -202,10 +189,9 @@ namespace SparkleLib.Git {
                 Commit (message);
             }
 
-
             SparkleGit git = new SparkleGit (LocalPath,
                 "push --progress " + // Redirects progress stats to standarderror
-                Url + " master");
+                "\"" + RemoteUrl + "\" master");
 
             git.StartInfo.RedirectStandardError = true;
             git.Start ();
@@ -230,6 +216,12 @@ namespace SparkleLib.Git {
                         number = (number / 100 * 20);
 
                     } else {
+                        if (line.StartsWith ("ERROR: QUOTA EXCEEDED")) {
+                            int quota_limit = int.Parse (line.Substring (21).Trim ());
+                            throw new QuotaExceededException ("Quota exceeded", quota_limit);
+                        }
+
+
                         // "Writing objects" stage
                         number = (number / 100 * 80 + 20);
 
@@ -241,6 +233,9 @@ namespace SparkleLib.Git {
                             speed = speed.Replace ("MB/s", "ᴍʙ/s");
                         }
                     }
+
+                } else {
+                    SparkleHelpers.DebugInfo ("Git", Name + " | " + line);
                 }
 
                 if (number >= percentage) {
@@ -252,6 +247,7 @@ namespace SparkleLib.Git {
             git.WaitForExit ();
 
             UpdateSizes ();
+            ChangeSets = GetChangeSets ();
 
             if (git.ExitCode == 0)
                 return true;
@@ -262,7 +258,7 @@ namespace SparkleLib.Git {
 
         public override bool SyncDown ()
         {
-            SparkleGit git = new SparkleGit (LocalPath, "fetch --progress " + Url);
+            SparkleGit git = new SparkleGit (LocalPath, "fetch --progress \"" + RemoteUrl + "\" master");
 
             git.StartInfo.RedirectStandardError = true;
             git.Start ();
@@ -298,7 +294,11 @@ namespace SparkleLib.Git {
                             speed = speed.Replace ("MB/s", "ᴍʙ/s");
                         }
                     }
+
+                } else {
+                    SparkleHelpers.DebugInfo ("Git", Name + " | " + line);
                 }
+                
 
                 if (number >= percentage) {
                     percentage = number;
@@ -312,9 +312,18 @@ namespace SparkleLib.Git {
 
             if (git.ExitCode == 0) {
                 Rebase ();
-                return true;
+                
+				File.SetAttributes (
+					Path.Combine (LocalPath, ".sparkleshare"),
+					FileAttributes.Hidden
+				);
+
+                ChangeSets = GetChangeSets ();
+
+				return true;
 
             } else {
+                ChangeSets = GetChangeSets ();
                 return false;
             }
         }
@@ -335,7 +344,7 @@ namespace SparkleLib.Git {
                 string [] lines = output.Split ("\n".ToCharArray ());
 
                 foreach (string line in lines) {
-                    if (line.Length > 1 && !line [1].Equals (" "))
+                    if (line.Trim ().Length > 0)
                         return true;
                 }
 
@@ -374,25 +383,32 @@ namespace SparkleLib.Git {
             git.Start ();
             git.WaitForExit ();
 
-            SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes staged");
+            SparkleHelpers.DebugInfo ("Git", Name + " | Changes staged");
         }
 
 
-        // Removes unneeded objects
-/*        private void CollectGarbage ()
-        {
-            SparkleGit git = new SparkleGit (LocalPath, "gc");
-            git.Start ();
-            git.WaitForExit ();
+        // Commits the made changes
+        private void Commit (string message)
+		{
+			SparkleGit git;
 
-            SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Garbage collected.");
-        } */
+			if (!this.author_set) {
+	            git = new SparkleGit (LocalPath,
+	                "config user.name \"" + SparkleConfig.DefaultConfig.User.Name + "\"");
 
+				git.Start ();
+				git.WaitForExit ();
 
-        // Commits the made changes
-        private void Commit (string message)
-        {
-            SparkleGit git = new SparkleGit (LocalPath,
+	            git = new SparkleGit (LocalPath,
+	                "config user.email \"" + SparkleConfig.DefaultConfig.User.Email + "\"");
+
+				git.Start ();
+				git.WaitForExit ();
+
+				this.author_set = true;
+			}
+
+            git = new SparkleGit (LocalPath,
                 "commit -m \"" + message + "\" " +
                 "--author=\"" + SparkleConfig.DefaultConfig.User.Name +
                 " <" + SparkleConfig.DefaultConfig.User.Email + ">\"");
@@ -400,21 +416,12 @@ namespace SparkleLib.Git {
             git.Start ();
             git.StandardOutput.ReadToEnd ();
             git.WaitForExit ();
-
-            SparkleHelpers.DebugInfo ("Commit", "[" + Name + "] " + message);
-
-            // Collect garbage pseudo-randomly. Turn off for
-            // now: too resource heavy.
-            // if (DateTime.Now.Second % 10 == 0)
-            //     CollectGarbage ();
         }
 
 
         // Merges the fetched changes
         private void Rebase ()
         {
-            DisableWatching ();
-
             if (HasLocalChanges) {
                 Add ();
 
@@ -422,28 +429,27 @@ namespace SparkleLib.Git {
                 Commit (commit_message);
             }
 
-            SparkleGit git = new SparkleGit (LocalPath, "rebase -v FETCH_HEAD");
+            SparkleGit git = new SparkleGit (LocalPath, "rebase FETCH_HEAD");
+            git.StartInfo.RedirectStandardOutput = false;
 
             git.Start ();
             git.WaitForExit ();
 
             if (git.ExitCode != 0) {
-                SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
+                SparkleHelpers.DebugInfo ("Git", Name + " | Conflict detected, trying to get out...");
 
                 while (HasLocalChanges)
                     ResolveConflict ();
 
-                SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
+                SparkleHelpers.DebugInfo ("Git", Name + " | Conflict resolved");
                 OnConflictResolved ();
             }
-
-            EnableWatching ();
         }
 
 
         private void ResolveConflict ()
         {
-            // This is al list of conflict status codes that Git uses, their
+            // This is a list of conflict status codes that Git uses, their
             // meaning, and how SparkleShare should handle them.
             //
             // DD    unmerged, both deleted    -> Do nothing
@@ -476,7 +482,7 @@ namespace SparkleLib.Git {
                 string conflicting_path = line.Substring (3);
                 conflicting_path = conflicting_path.Trim ("\"".ToCharArray ());
 
-                SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict type: " + line);
+                SparkleHelpers.DebugInfo ("Git", Name + " | Conflict type: " + line);
 
                 // Both the local and server version have been modified
                 if (line.StartsWith ("UU") || line.StartsWith ("AA") ||
@@ -492,7 +498,9 @@ namespace SparkleLib.Git {
                     // Windows doesn't allow colons in the file name, so
                     // we use "h" between the hours and minutes instead.
                     string timestamp            = DateTime.Now.ToString ("MMM d H\\hmm");
-                    string their_path           = conflicting_path + " (" + SparkleConfig.DefaultConfig.User.Name + ", " + timestamp + ")";
+                    string their_path           = Path.GetFileNameWithoutExtension (conflicting_path) +
+                        " (" + SparkleConfig.DefaultConfig.User.Name + ", " + timestamp + ")" + Path.GetExtension (conflicting_path);
+                    
                     string abs_conflicting_path = Path.Combine (LocalPath, conflicting_path);
                     string abs_their_path       = Path.Combine (LocalPath, their_path);
 
@@ -509,10 +517,9 @@ namespace SparkleLib.Git {
                     SparkleGit git_rebase_continue = new SparkleGit (LocalPath, "rebase --continue");
                     git_rebase_continue.Start ();
                     git_rebase_continue.WaitForExit ();
-                }
 
                 // The local version has been modified, but the server version was removed
-                if (line.StartsWith ("DU")) {
+                } else if (line.StartsWith ("DU")) {
 
                     // The modified local version is already in the
                     // checkout, so it just needs to be added.
@@ -527,21 +534,18 @@ namespace SparkleLib.Git {
                     SparkleGit git_rebase_continue = new SparkleGit (LocalPath, "rebase --continue");
                     git_rebase_continue.Start ();
                     git_rebase_continue.WaitForExit ();
-                }
 
                 // The server version has been modified, but the local version was removed
-                if (line.StartsWith ("UD")) {
+                } else if (line.StartsWith ("UD")) {
 
                     // We can just skip here, the server version is
                     // already in the checkout
                     SparkleGit git_rebase_skip = new SparkleGit (LocalPath, "rebase --skip");
                     git_rebase_skip.Start ();
                     git_rebase_skip.WaitForExit ();
-                }
 
                 // New local files
-                if (line.StartsWith ("??")) {
-
+                } else {
                     Add ();
 
                     SparkleGit git_rebase_continue = new SparkleGit (LocalPath, "rebase --continue");
@@ -553,17 +557,18 @@ namespace SparkleLib.Git {
 
 
         // Returns a list of the latest change sets
-        public override List <SparkleChangeSet> GetChangeSets (int count)
+        public override List<SparkleChangeSet> GetChangeSets (int count)
         {
             if (count < 1)
                 count = 30;
 
+            count = 150;
+
             List <SparkleChangeSet> change_sets = new List <SparkleChangeSet> ();
 
-            // Console.InputEncoding  = System.Text.Encoding.Unicode;
-            // Console.OutputEncoding = System.Text.Encoding.Unicode;
+            SparkleGit git_log = new SparkleGit (LocalPath,
+                "log -" + count + " --raw -M --date=iso --format=medium --no-color --no-merges");
 
-            SparkleGit git_log = new SparkleGit (LocalPath, "log -" + count + " --raw -M --date=iso");
             git_log.Start ();
 
             // Reading the standard output HAS to go before
@@ -598,40 +603,23 @@ namespace SparkleLib.Git {
 
             entries.Add (last_entry);
 
-            Regex merge_regex = new Regex (@"commit ([a-z0-9]{40})\n" +
-                                "Merge: .+ .+\n" +
-                                "Author: (.+) <(.+)>\n" +
-                                "Date:   ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
-                                "([0-9]{2}):([0-9]{2}):([0-9]{2}) .([0-9]{4})\n" +
-                                "*", RegexOptions.Compiled);
-
-            Regex non_merge_regex = new Regex (@"commit ([a-z0-9]{40})\n" +
-                                "Author: (.+) <(.+)>\n" +
-                                "Date:   ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
-                                "([0-9]{2}):([0-9]{2}):([0-9]{2}) (.[0-9]{4})\n" +
-                                "*", RegexOptions.Compiled);
+            Regex regex = new Regex (@"commit ([a-z0-9]{40})\n" +
+                "Author: (.+) <(.+)>\n" +
+                "*" +
+                "Date:   ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
+                "([0-9]{2}):([0-9]{2}):([0-9]{2}) (.[0-9]{4})\n" +
+                "*", RegexOptions.Compiled);
 
             foreach (string log_entry in entries) {
-                Regex regex;
-                bool is_merge_commit = false;
-
-                if (log_entry.Contains ("\nMerge: ")) {
-                    regex = merge_regex;
-                    is_merge_commit = true;
-                } else {
-                    regex = non_merge_regex;
-                }
-
                 Match match = regex.Match (log_entry);
 
                 if (match.Success) {
                     SparkleChangeSet change_set = new SparkleChangeSet ();
 
-                    change_set.Folder    = Name;
+                    change_set.Folder    = new SparkleFolder (Name);
                     change_set.Revision  = match.Groups [1].Value;
                     change_set.User      = new SparkleUser (match.Groups [2].Value, match.Groups [3].Value);
-                    change_set.IsMagical = is_merge_commit;
-                    change_set.Url       = Url;
+                    change_set.RemoteUrl = RemoteUrl;
 
                     change_set.Timestamp = new DateTime (int.Parse (match.Groups [4].Value),
                         int.Parse (match.Groups [5].Value), int.Parse (match.Groups [6].Value),
@@ -658,14 +646,35 @@ namespace SparkleLib.Git {
                                 file_path = file_path.Substring (0,
                                     file_path.Length - ".empty".Length);
 
+                            if (file_path.Equals (".sparkleshare"))
+                                continue;
+
                             if (change_type.Equals ("A")) {
-                                change_set.Added.Add (file_path);
+                                change_set.Changes.Add (
+                                    new SparkleChange () {
+                                        Path      = file_path,
+                                        Timestamp = change_set.Timestamp,
+                                        Type      = SparkleChangeType.Added
+                                    }
+                                );
 
                             } else if (change_type.Equals ("M")) {
-                                change_set.Edited.Add (file_path);
+                                change_set.Changes.Add (
+                                    new SparkleChange () {
+                                        Path      = file_path,
+                                        Timestamp = change_set.Timestamp,
+                                        Type      = SparkleChangeType.Edited
+                                    }
+                                );
 
                             } else if (change_type.Equals ("D")) {
-                                change_set.Deleted.Add (file_path);
+                                change_set.Changes.Add (
+                                    new SparkleChange () {
+                                        Path      = file_path,
+                                        Timestamp = change_set.Timestamp,
+                                        Type      = SparkleChangeType.Deleted
+                                    }
+                                );
 
                             } else if (change_type.Equals ("R")) {
                                 int tab_pos  = entry_line.LastIndexOf ("\t");
@@ -673,26 +682,50 @@ namespace SparkleLib.Git {
                                 to_file_path = entry_line.Substring (tab_pos + 1);
 
                                 if (file_path.EndsWith (".empty"))
-                                    file_path = file_path.Substring (0,
-                                        file_path.Length - ".empty".Length);
+                                    file_path = file_path.Substring (0, file_path.Length - 6);
 
                                 if (to_file_path.EndsWith (".empty"))
-                                    to_file_path = to_file_path.Substring (0,
-                                        to_file_path.Length - ".empty".Length);
-
-                                change_set.MovedFrom.Add (file_path);
-                                change_set.MovedTo.Add (to_file_path);
+                                    to_file_path = to_file_path.Substring (0, to_file_path.Length - 6);
+
+                                change_set.Changes.Add (
+                                    new SparkleChange () {
+                                        Path        = file_path,
+                                        MovedToPath = to_file_path,
+                                        Timestamp   = change_set.Timestamp,
+                                        Type        = SparkleChangeType.Moved
+                                    }
+                                );
                             }
                         }
                     }
 
+                    if (change_set.Changes.Count > 0) {
+                        if (change_sets.Count > 0) {
+                            SparkleChangeSet last_change_set = change_sets [change_sets.Count - 1];
+
+                            if (change_set.Timestamp.Year  == last_change_set.Timestamp.Year &&
+                                change_set.Timestamp.Month == last_change_set.Timestamp.Month &&
+                                change_set.Timestamp.Day   == last_change_set.Timestamp.Day &&
+                                change_set.User.Name.Equals (last_change_set.User.Name)) {
+
+                                last_change_set.Changes.AddRange (change_set.Changes);
 
-                    if ((change_set.Added.Count +
-                         change_set.Edited.Count +
-                         change_set.Deleted.Count +
-                         change_set.MovedFrom.Count) > 0) {
+                                if (DateTime.Compare (last_change_set.Timestamp, change_set.Timestamp) < 1) {
+                                    last_change_set.FirstTimestamp = last_change_set.Timestamp;
+                                    last_change_set.Timestamp      = change_set.Timestamp;
+                                    last_change_set.Revision       = change_set.Revision;
 
-                        change_sets.Add (change_set);
+                                } else {
+                                    last_change_set.FirstTimestamp = change_set.Timestamp;
+                                }
+
+                            } else {
+                                change_sets.Add (change_set);
+                            }
+
+                        } else {
+                            change_sets.Add (change_set);
+                        }
                     }
                 }
             }
@@ -710,20 +743,21 @@ namespace SparkleLib.Git {
         {
             try {
                 foreach (string child_path in Directory.GetDirectories (path)) {
-                    if (child_path.EndsWith (".git") &&
-                        !child_path.Equals (Path.Combine (LocalPath, ".git"))) {
+                    if (SparkleHelpers.IsSymlink (child_path))
+                        continue;
+
+                    if (child_path.EndsWith (".git")) {
+                        if (child_path.Equals (Path.Combine (LocalPath, ".git")))
+                            continue;
     
                         string HEAD_file_path = Path.Combine (child_path, "HEAD");
     
                         if (File.Exists (HEAD_file_path)) {
                             File.Move (HEAD_file_path, HEAD_file_path + ".backup");
-                            SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Renamed " + HEAD_file_path);
+                            SparkleHelpers.DebugInfo ("Git", Name + " | Renamed " + HEAD_file_path);
                         }
     
                         continue;
-    
-                    } else if (child_path.EndsWith (".git")) {
-                        continue;
                     }
     
                     PrepareDirectories (child_path);
@@ -732,9 +766,15 @@ namespace SparkleLib.Git {
                 if (Directory.GetFiles (path).Length == 0 &&
                     Directory.GetDirectories (path).Length == 0 &&
                     !path.Equals (LocalPath)) {
-    
-                    File.Create (Path.Combine (path, ".empty")).Close ();
-                    File.SetAttributes (Path.Combine (path, ".empty"), FileAttributes.Hidden);
+
+                    if (!File.Exists (Path.Combine (path, ".empty"))) {
+                        try {
+                            File.WriteAllText (Path.Combine (path, ".empty"), "I'm a folder!");
+                            File.SetAttributes (Path.Combine (path, ".empty"), FileAttributes.Hidden);
+                        } catch {
+                            SparkleHelpers.DebugInfo ("Git", Name + " | Failed adding empty folder " + path);
+                        }
+                    }
                 }
 
             } catch (IOException e) {
@@ -796,7 +836,7 @@ namespace SparkleLib.Git {
                 file_name = modified.Trim ("\"".ToCharArray ());
 
                 if (file_name.EndsWith (".empty"))
-                    file_name = file_name.Substring (0, file_name.Length - 6);
+                    continue;
 
                 message += "/ ‘" + file_name + "’" + n;
 
@@ -826,14 +866,14 @@ namespace SparkleLib.Git {
         // Recursively gets a folder's size in bytes
         private double CalculateSizes (DirectoryInfo parent)
         {
-            if (!Directory.Exists (parent.ToString ()))
+            if (!Directory.Exists (parent.FullName))
                 return 0;
 
-            double size = 0;
-
             if (parent.Name.Equals ("rebase-apply"))
                 return 0;
 
+            double size = 0;
+
             try {
                 foreach (FileInfo file in parent.GetFiles ()) {
                     if (!file.Exists)
@@ -845,11 +885,18 @@ namespace SparkleLib.Git {
                     size += file.Length;
                 }
 
-                // FIXME: Doesn't seem to recurse on Windows
+            } catch (Exception e) {
+                SparkleHelpers.DebugInfo ("Local", "Error calculating size: " + e.Message);
+                return 0;
+            }
+
+
+            try {
                 foreach (DirectoryInfo directory in parent.GetDirectories ())
                     size += CalculateSizes (directory);
 
-            } catch (Exception) {
+            } catch (Exception e) {
+                SparkleHelpers.DebugInfo ("Local", "Error calculating size: " + e.Message);
                 return 0;
             }
 
diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
index 68ab375..1a6d1b8 100755
--- a/SparkleLib/Makefile.am
+++ b/SparkleLib/Makefile.am
@@ -5,8 +5,8 @@ SOURCES =  \
 	Defines.cs \
 	SparkleAnnouncement.cs \
 	SparkleBackend.cs \
-	SparkleChangeSet.cs \
 	SparkleConfig.cs \
+	SparkleExceptions.cs \
 	SparkleExtensions.cs \
 	SparkleFetcherBase.cs \
 	SparkleHelpers.cs \
@@ -15,7 +15,8 @@ SOURCES =  \
 	SparkleListenerTcp.cs \
 	SparkleRepoBase.cs \
 	SparkleUser.cs \
-	SparkleWatcher.cs
+	SparkleWatcher.cs \
+	SparkleWrappers.cs
 
 
 install-data-hook:
diff --git a/SparkleLib/Makefile.in b/SparkleLib/Makefile.in
index f0a419e..a6c7f75 100644
--- a/SparkleLib/Makefile.in
+++ b/SparkleLib/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -41,7 +58,6 @@ subdir = SparkleLib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -75,13 +91,23 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(moduledir)"
 SCRIPTS = $(module_SCRIPTS)
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -92,50 +118,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -145,8 +152,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -158,8 +163,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -176,20 +179,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -234,8 +232,8 @@ SOURCES = \
 	Defines.cs \
 	SparkleAnnouncement.cs \
 	SparkleBackend.cs \
-	SparkleChangeSet.cs \
 	SparkleConfig.cs \
+	SparkleExceptions.cs \
 	SparkleExtensions.cs \
 	SparkleFetcherBase.cs \
 	SparkleHelpers.cs \
@@ -244,7 +242,8 @@ SOURCES = \
 	SparkleListenerTcp.cs \
 	SparkleRepoBase.cs \
 	SparkleUser.cs \
-	SparkleWatcher.cs
+	SparkleWatcher.cs \
+	SparkleWrappers.cs
 
 
 # Initializers
@@ -344,6 +343,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/build/build.mk $(top_srcdir)/build/build.environment.mk $(top_srcdir)/build/build.rules.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -359,8 +359,11 @@ Defines.cs: $(top_builddir)/config.status $(srcdir)/Defines.cs.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-moduleSCRIPTS: $(module_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
 	@list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -388,9 +391,7 @@ uninstall-moduleSCRIPTS:
 	@list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(moduledir)" && rm -f $$files
+	dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -451,10 +452,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/SparkleLib/SparkleChangeSet.cs b/SparkleLib/SparkleChangeSet.cs
deleted file mode 100755
index 9293b7c..0000000
--- a/SparkleLib/SparkleChangeSet.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
-//
-//   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-
-namespace SparkleLib {
-
-    public class SparkleChangeSet {
-
-        public SparkleUser User = new SparkleUser ("Unknown", "Unknown");
-
-        public string Folder;
-        public string Revision;
-        public DateTime Timestamp;
-        public DateTime FirstTimestamp;
-        public bool IsMagical = false;
-        public Uri Url;
-
-        public List<string> Added     = new List<string> ();
-        public List<string> Deleted   = new List<string> ();
-        public List<string> Edited    = new List<string> ();
-        public List<string> MovedFrom = new List<string> ();
-        public List<string> MovedTo   = new List<string> ();
-		
-
-        public string RelativeTimestamp {
-            get {
-                TimeSpan time_span = DateTime.Now - Timestamp;
-
-                if (time_span <= TimeSpan.FromSeconds (60))
-                    return "just now";
-
-                if (time_span <= TimeSpan.FromMinutes (60))
-                    return time_span.Minutes > 1
-                        ? time_span.Minutes + " minutes ago"
-                        : "a minute ago";
-
-                if (time_span <= TimeSpan.FromHours (24))
-                    return time_span.Hours > 1
-                        ? time_span.Hours + " hours ago"
-                        : "an hour ago";
-
-                if (time_span <= TimeSpan.FromDays (30))
-                    return time_span.Days > 1
-                        ? time_span.Days + " days ago"
-                        : "a day ago";
-
-                if (time_span <= TimeSpan.FromDays (365))
-                    return time_span.Days > 30
-                    ? (time_span.Days / 30) + " months ago"
-                    : "a month ago";
-
-                return time_span.Days > 365
-                    ? (time_span.Days / 365) + " years ago"
-                    : "a year ago";
-            }   
-        }
-    }
-
-
-    public class SparkleFolder {
-
-        public string Name;
-        public Uri RemoteAddress;
-
-        public string FullPath {
-            get {
-                return Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, Name);
-            }
-        }
-
-
-        public SparkleFolder (string name)
-        {
-            Name = name;
-        }
-    }
-}
diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs
index de74dce..fcbafd6 100755
--- a/SparkleLib/SparkleConfig.cs
+++ b/SparkleLib/SparkleConfig.cs
@@ -29,37 +29,26 @@ namespace SparkleLib {
             Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData),
                 "sparkleshare");
 
-        // TODO: declare elsewhere
         public static SparkleConfig DefaultConfig = new SparkleConfig (default_config_path, "config.xml");
         public static bool DebugMode = true;
 
-
         public string FullPath;
         public string TmpPath;
         public string LogFilePath;
 
+
         public string HomePath {
             get {
-                if (GetConfigOption ("home_path") != null) {
+                if (GetConfigOption ("home_path") != null)
                     return GetConfigOption ("home_path");
-
-                } else if (SparkleHelpers.IsWindows) {
-                    try {
-                        Environment.SpecialFolder folder =
-                            (Environment.SpecialFolder) Enum.Parse (
-                                typeof(Environment.SpecialFolder), "UserProfile");
-
-                        return (Environment.GetFolderPath (folder));
-
-                    } catch {
-                        return Environment.GetFolderPath (Environment.SpecialFolder.Personal);
-                    }
-                } else
+                else if (SparkleHelpers.IsWindows)
+                    return Environment.GetFolderPath (Environment.SpecialFolder.UserProfile);
+                else
                     return Environment.GetFolderPath (Environment.SpecialFolder.Personal);
-
             }
         }
 
+
         public string FoldersPath {
             get {
                 if (GetConfigOption ("folders_path") != null)
@@ -69,6 +58,7 @@ namespace SparkleLib {
             }
         }
 
+
         public SparkleConfig (string config_path, string config_file_name)
         {
             try {
@@ -86,7 +76,6 @@ namespace SparkleLib {
                     Directory.Move (old_path, new_path);
 
                     Console.WriteLine ("Migrated SparkleShare folder to %USERPROFILE%");
-
                 }
 
             } catch (Exception e) {
@@ -95,14 +84,14 @@ namespace SparkleLib {
             }
 
             FullPath    = Path.Combine (config_path, config_file_name);
-            LogFilePath = Path.Combine (config_path, "debug.log");
+            LogFilePath = Path.Combine (config_path, "debug.txt");
 
             if (File.Exists (LogFilePath)) {
                 try {
                     File.Delete (LogFilePath);
 
                 } catch (Exception) {
-                    // Don't delete the debug.log if 'tail' is reading it
+                    // Don't delete the debug.log if, for example, 'tail' is reading it
                 }
             }
 
@@ -137,6 +126,7 @@ namespace SparkleLib {
             } finally {
                 Load (FullPath);
                 TmpPath = Path.Combine (FoldersPath, ".tmp");
+                Directory.CreateDirectory (TmpPath);
             }
         }
 
@@ -204,64 +194,9 @@ namespace SparkleLib {
                 email_node.InnerText = user.Email;
 
                 Save ();
-
-                // ConfigureSSH ();
             }
         }
 
-/*
-        private void ConfigureSSH ()
-        {
-            if (User.Email.Equals ("Unknown"))
-                return;
-
-            string path = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
-
-            if (!(SparkleBackend.Platform == PlatformID.Unix ||
-                  SparkleBackend.Platform == PlatformID.MacOSX)) {
-
-                path = Environment.ExpandEnvironmentVariables ("%HOMEDRIVE%%HOMEPATH%");
-            }
-
-            string ssh_config_path      = Path.Combine (path, ".ssh");
-            string ssh_config_file_path = SparkleHelpers.CombineMore (path, ".ssh", "config");
-
-            string ssh_key_path = SparkleHelpers.NormalizeSeparatorsToOS(
-                Path.Combine(SparkleConfig.ConfigPath, "sparkleshare." + User.Email + ".key"));
-            if (SparkleHelpers.IsWindows && ssh_key_path.IndexOf(' ') >= 0)
-            {
-                ssh_key_path = "\"" + ssh_key_path + "\"";
-            }
-            string ssh_config = "IdentityFile " + ssh_key_path;
-
-            if (!Directory.Exists (ssh_config_path))
-                Directory.CreateDirectory (ssh_config_path);
-
-            if (File.Exists (ssh_config_file_path)) {
-                string current_config = File.ReadAllText (ssh_config_file_path);
-                if (current_config.Contains (ssh_config))
-                    return;
-
-                if (current_config.EndsWith ("\n\n"))
-                    ssh_config = "# SparkleShare's key\n" + ssh_config;
-                else if (current_config.EndsWith ("\n"))
-                    ssh_config = "\n# SparkleShare's key\n" + ssh_config;
-                else
-                    ssh_config = "\n\n# SparkleShare's key\n" + ssh_config;
-
-                TextWriter writer = File.AppendText (ssh_config_file_path);
-                writer.Write (ssh_config + "\n");
-                writer.Close ();
-
-            } else {
-                File.WriteAllText (ssh_config_file_path, ssh_config);
-            }
-
-            Chmod644 (ssh_config_file_path);
-
-            SparkleHelpers.DebugInfo ("Config", "Added key to " + ssh_config_file_path);
-        }
-*/
 
         public List<string> Folders {
             get {
@@ -309,13 +244,6 @@ namespace SparkleLib {
         }
 
 
-        public bool FolderExists (string name)
-        {
-            XmlNode folder = GetFolder (name);
-            return (folder != null);
-        }
-
-
         public string GetBackendForFolder (string name)
         {
             return GetFolderValue (name, "backend");
@@ -345,6 +273,7 @@ namespace SparkleLib {
             }
 
             Save ();
+
             return true;
         }
 
@@ -365,47 +294,9 @@ namespace SparkleLib {
         }
 
 
-        public List<string> Hosts {
-            get {
-                List<string> hosts = new List<string> ();
-
-                foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) {
-                    Uri uri = new Uri (node_folder ["url"].InnerText);
-
-                    if (!hosts.Contains (uri.Host))
-                        hosts.Add (uri.Host);
-                }
-
-              return hosts;
-           }
-        }
-
-
-        public List<string> HostsWithUsername {
-            get {
-                List<string> hosts = new List<string> ();
-
-                foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) {
-                    try {
-                        Uri uri = new Uri (node_folder ["url"].InnerText);
-
-                        if (uri.UserInfo != "git" && !hosts.Contains (uri.UserInfo + "@" + uri.Host))
-                            hosts.Add (uri.UserInfo + "@" + uri.Host);
-
-                    } catch (UriFormatException) {
-                        SparkleHelpers.DebugInfo ("Config",
-                            "Ignoring badly formatted URI: " + node_folder ["url"].InnerText);
-                    }
-                }
-
-              return hosts;
-           }
-        }
-
-
         private XmlNode GetFolder (string name)
         {
-            return SelectSingleNode (String.Format("/sparkleshare/folder[name='{0}']", name));
+            return SelectSingleNode (string.Format ("/sparkleshare/folder[name=\"{0}\"]", name));
         }
 
 
@@ -460,23 +351,14 @@ namespace SparkleLib {
             Save (FullPath);
             SparkleHelpers.DebugInfo ("Config", "Updated \"" + FullPath + "\"");
         }
-
-
-        private void Chmod644 (string file_path)
-        {
-            // Hack to be able to set the permissions on a file
-            // that OpenSSH still likes without resorting to Mono.Unix
-            FileInfo file_info   = new FileInfo (file_path);
-            file_info.Attributes = FileAttributes.ReadOnly;
-            file_info.Attributes = FileAttributes.Normal;
-        }
     }
 
 
     public class ConfigFileNotFoundException : Exception {
 
-        public ConfigFileNotFoundException (string message) :
-            base (message) { }
+        public ConfigFileNotFoundException (string message) : base (message)
+        {
+        }
     }
 }
 
diff --git a/SparkleLib/SparkleExceptions.cs b/SparkleLib/SparkleExceptions.cs
new file mode 100644
index 0000000..78e24d9
--- /dev/null
+++ b/SparkleLib/SparkleExceptions.cs
@@ -0,0 +1,37 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+using System;
+
+namespace SparkleLib {
+
+    public class QuotaExceededException : Exception {
+
+        public readonly int QuotaLimit = -1;
+
+
+        public QuotaExceededException ()
+        {
+        }
+
+
+        public QuotaExceededException (string message, int quota_limit) : base (message)
+        {
+            QuotaLimit = quota_limit;
+        }
+    }
+}
diff --git a/SparkleLib/SparkleFetcherBase.cs b/SparkleLib/SparkleFetcherBase.cs
index 12865fd..59a0eed 100755
--- a/SparkleLib/SparkleFetcherBase.cs
+++ b/SparkleLib/SparkleFetcherBase.cs
@@ -16,7 +16,11 @@
 
 
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Security.Cryptography;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 
@@ -26,7 +30,7 @@ namespace SparkleLib {
     public abstract class SparkleFetcherBase {
 
         public delegate void StartedEventHandler ();
-        public delegate void FinishedEventHandler (string [] warnings);
+        public delegate void FinishedEventHandler (bool repo_is_encrypted, bool repo_is_empty, string [] warnings);
         public delegate void FailedEventHandler ();
         public delegate void ProgressChangedEventHandler (double percentage);
 
@@ -37,132 +41,124 @@ namespace SparkleLib {
 
         public abstract bool Fetch ();
         public abstract void Stop ();
-
-        public string TargetFolder;
-        public string RemoteUrl;
-        public string [] ExcludeRules;
-        public string [] Warnings;
+        public abstract void Complete ();
+        public abstract bool IsFetchedRepoEmpty { get; }
+        public abstract bool IsFetchedRepoPasswordCorrect (string password);
+        public abstract void EnableFetchedRepoCrypto (string password);
+
+        public Uri RemoteUrl { get; protected set; }
+        public string RequiredFingerprint { get; protected set; }
+        public readonly bool FetchPriorHistory = false;
+        public string TargetFolder { get; protected set; }
         public bool IsActive { get; private set; }
 
+        public string [] Warnings {
+            get {
+                return this.warnings.ToArray ();
+            }
+        }
+
+        public string [] Errors {
+            get {
+                return this.errors.ToArray ();
+            }
+        }
+
+        
+        protected List<string> warnings = new List<string> ();
+        protected List<string> errors = new List<string> ();
+
         private Thread thread;
 
 
-        public SparkleFetcherBase (string server, string remote_folder, string target_folder)
+        public SparkleFetcherBase (string server, string required_fingerprint, string remote_path,
+            string target_folder, bool fetch_prior_history)
         {
+            RequiredFingerprint = required_fingerprint;
+            FetchPriorHistory   = fetch_prior_history;
+            remote_path         = remote_path.Trim ("/".ToCharArray ());
+
+            if (server.EndsWith ("/"))
+                server = server.Substring (0, server.Length - 1);
+
+            if (!remote_path.StartsWith ("/"))
+                remote_path = "/" + remote_path;
+
+            if (!server.Contains ("://"))
+                server = "ssh://" + server;
+
             TargetFolder = target_folder;
-            RemoteUrl    = server + "/" + remote_folder;
-            IsActive       = false;
-
-            ExcludeRules = new string [] {
-                // gedit and emacs
-                "*~",
-
-                // Firefox and Chromium temporary download files
-                "*.part",
-                "*.crdownload",
-
-                // vi(m)
-                ".*.sw[a-z]",
-                "*.un~",
-                "*.swp",
-                "*.swo",
-
-                // KDE
-                ".directory",
-
-                // Mac OS X
-                ".DS_Store",
-                "Icon?",
-                "._*",
-                ".Spotlight-V100",
-                ".Trashes",
-
-                // Omnigraffle
-                "*(Autosaved).graffle",
-
-                // Windows
-                "Thumbs.db",
-                "Desktop.ini",
-
-                // MS Office
-                "~*.tmp",
-                "~*.TMP",
-                "*~*.tmp",
-                "*~*.TMP",
-                "~*.ppt",
-                "~*.PPT",
-                "~*.pptx",
-                "~*.PPTX",
-                "~*.xls",
-                "~*.XLS",
-                "~*.xlsx",
-                "~*.XLSX",
-                "~*.doc",
-                "~*.DOC",
-                "~*.docx",
-                "~*.DOCX",
-
-                // CVS
-                "*/CVS/*",
-                ".cvsignore",
-                "*/.cvsignore",
-
-                // Subversion
-                "/.svn/*",
-                "*/.svn/*",
-
-                // Mercurial
-                "/.hg/*",
-                "*/.hg/*",
-                "*/.hgignore",
-
-                // Bazaar
-                "/.bzr/*",
-                "*/.bzr/*",
-                "*/.bzrignore"
-            };
+            RemoteUrl    = new Uri (server + remote_path);
+            IsActive     = false;
         }
 
 
-        // Clones the remote repository
         public void Start ()
         {
             IsActive = true;
-            SparkleHelpers.DebugInfo ("Fetcher", "[" + TargetFolder + "] Fetching folder: " + RemoteUrl);
 
             if (Started != null)
                 Started ();
 
+            SparkleHelpers.DebugInfo ("Fetcher", "[" + TargetFolder + "] Fetching folder: " + RemoteUrl);
+
             if (Directory.Exists (TargetFolder))
                 Directory.Delete (TargetFolder, true);
 
-            string host = GetHost (RemoteUrl);
 
-            if (String.IsNullOrEmpty (host)) {
+            string host     = RemoteUrl.Host;
+            string host_key = GetHostKey ();
+
+            if (string.IsNullOrEmpty (host) || host_key == null) {
                 if (Failed != null)
                     Failed ();
 
                 return;
             }
 
-            DisableHostKeyCheckingForHost (host);
+
+            bool warn = true;
+            if (RequiredFingerprint != null) {
+                string host_fingerprint = GetFingerprint (host_key);
+
+                if (host_fingerprint == null ||
+                    !RequiredFingerprint.Equals (host_fingerprint)) {
+
+                    SparkleHelpers.DebugInfo ("Auth", "Fingerprint doesn't match");
+
+                    if (Failed != null)
+                        Failed ();
+
+                    return;
+                }
+
+                warn = false;
+                SparkleHelpers.DebugInfo ("Auth", "Fingerprint matches");
+
+            } else {
+               SparkleHelpers.DebugInfo ("Auth", "Skipping fingerprint check");
+            }
+
+            AcceptHostKey (host_key, warn);
+
 
             this.thread = new Thread (new ThreadStart (delegate {
                 if (Fetch ()) {
                     Thread.Sleep (500);
                     SparkleHelpers.DebugInfo ("Fetcher", "Finished");
 
-                    EnableHostKeyCheckingForHost (host);
                     IsActive = false;
 
+                    // TODO: Find better way to determine if folder should have crypto setup
+                    bool repo_is_encrypted = RemoteUrl.ToString ().Contains ("crypto");
+
                     if (Finished != null)
-                        Finished (Warnings);
+                        Finished (repo_is_encrypted, IsFetchedRepoEmpty, Warnings);
 
                 } else {
                     Thread.Sleep (500);
                     SparkleHelpers.DebugInfo ("Fetcher", "Failed");
 
-                    EnableHostKeyCheckingForHost (host);
                     IsActive = false;
 
                     if (Failed != null)
@@ -187,111 +183,201 @@ namespace SparkleLib {
             if (ProgressChanged != null)
                 ProgressChanged (percentage);
         }
-    
-        
-        private void DisableHostKeyCheckingForHost (string host)
-        {
-            string path = SparkleConfig.DefaultConfig.HomePath;
 
-            if (!(SparkleBackend.Platform == PlatformID.Unix ||
-                  SparkleBackend.Platform == PlatformID.MacOSX)) {
 
-                path = Environment.ExpandEnvironmentVariables ("%HOMEDRIVE%%HOMEPATH%");
-            }
+        private string GetHostKey ()
+        {
+            string host = RemoteUrl.Host;
+            SparkleHelpers.DebugInfo ("Auth", "Fetching host key for " + host);
 
-            string ssh_config_path      = Path.Combine (path, ".ssh");
-            string ssh_config_file_path = SparkleHelpers.CombineMore (path, ".ssh", "config");
-            string ssh_config           = "\n# <SparkleShare>" +
-                                          "\nHost " + host +
-                                          "\n\tStrictHostKeyChecking no" +
-                                          "\n# </SparkleShare>";
+            Process process = new Process () {
+                EnableRaisingEvents = true
+            };
 
-            if (!Directory.Exists (ssh_config_path))
-                Directory.CreateDirectory (ssh_config_path);
+            process.StartInfo.WorkingDirectory       = SparkleConfig.DefaultConfig.TmpPath;
+            process.StartInfo.UseShellExecute        = false;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.CreateNoWindow         = true;
 
-            if (File.Exists (ssh_config_file_path)) {
-                TextWriter writer = File.AppendText (ssh_config_file_path);
-                writer.Write (ssh_config);
-                writer.Close ();
+            process.StartInfo.FileName = "ssh-keyscan";
+            process.StartInfo.Arguments = "-t rsa " + host;
 
-            } else {
-                File.WriteAllText (ssh_config_file_path, ssh_config);
-            }
+            process.Start ();
 
-            Chmod644 (ssh_config_file_path);
-            SparkleHelpers.DebugInfo ("Fetcher", "Disabled host key checking for " + host);
+            // Reading the standard output HAS to go before
+            // WaitForExit, or it will hang forever on output > 4096 bytes
+            string host_key = process.StandardOutput.ReadToEnd ().Trim ();
+            process.WaitForExit ();
+
+            if (process.ExitCode == 0)
+                return host_key;
+            else
+                return null;
         }
-        
 
-        private void EnableHostKeyCheckingForHost (string host)
+
+        // FIXME: Calculate fingerprint natively: decode base64 -> md5
+        private string GetFingerprint (string public_key)
         {
-            string path = SparkleConfig.DefaultConfig.HomePath;
+            string tmp_file_path = Path.Combine (SparkleConfig.DefaultConfig.TmpPath, "hostkey.tmp");
+            File.WriteAllText (tmp_file_path, public_key + Environment.NewLine);
 
-            if (SparkleBackend.Platform != PlatformID.Unix &&
-                SparkleBackend.Platform != PlatformID.MacOSX) {
+            Process process = new Process () {
+                EnableRaisingEvents = true
+            };
 
-                path = Environment.ExpandEnvironmentVariables ("%HOMEDRIVE%%HOMEPATH%");
-            }
+            process.StartInfo.WorkingDirectory       = SparkleConfig.DefaultConfig.TmpPath;
+            process.StartInfo.UseShellExecute        = false;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.CreateNoWindow         = true;
 
-            string ssh_config_file_path = SparkleHelpers.CombineMore (path, ".ssh", "config");
+            process.StartInfo.FileName  = "ssh-keygen";
+            process.StartInfo.Arguments = "-lf " + tmp_file_path;
 
-            if (File.Exists (ssh_config_file_path)) {
-                string current_ssh_config = File.ReadAllText (ssh_config_file_path);
+            process.Start ();
 
-                current_ssh_config = current_ssh_config.Trim ();
-                string [] lines = current_ssh_config.Split ('\n');
-                string new_ssh_config = "";
-                bool in_sparkleshare_section = false;
+            // Reading the standard output HAS to go before
+            // WaitForExit, or it will hang forever on output > 4096 bytes
+            string fingerprint = process.StandardOutput.ReadToEnd ().Trim ();
+            process.WaitForExit ();
 
-                foreach (string line in lines) {
-                    if (line.StartsWith ("# <SparkleShare>")) {
-                        in_sparkleshare_section = true;
-                        continue;
-                    }
+            try {
+                fingerprint = fingerprint.Substring (fingerprint.IndexOf (" ") + 1, 47);
 
-                    if (line.StartsWith ("# </SparkleShare>")) {
-                        in_sparkleshare_section = false;
-                        continue;
-                    }
+            } catch (Exception e) {
+                SparkleHelpers.DebugInfo ("Fetcher", "Not a valid fingerprint: " + e.Message);
+                return null;
+            }
 
-                    if (in_sparkleshare_section)
-                        continue;
+            File.Delete (tmp_file_path);
 
-                    new_ssh_config += line + "\n"; // do not use Environment.NewLine because file is in unix format
-                }
+            return fingerprint;
+        }
 
-                if (string.IsNullOrEmpty (new_ssh_config.Trim ())) {
-                    File.Delete (ssh_config_file_path);
 
-                } else {
-                    File.WriteAllText (ssh_config_file_path, new_ssh_config.Trim ());
-                    Chmod644 (ssh_config_file_path);
-                }
-            }
+        private void AcceptHostKey (string host_key, bool warn)
+        {
+            string ssh_config_path       = Path.Combine (SparkleConfig.DefaultConfig.HomePath, ".ssh");
+            string known_hosts_file_path = Path.Combine (ssh_config_path, "known_hosts");
 
-            SparkleHelpers.DebugInfo ("Fetcher", "Enabled host key checking for " + host);
-        }
+            if (!File.Exists (known_hosts_file_path)) {
+                if (!Directory.Exists (ssh_config_path))
+                    Directory.CreateDirectory (ssh_config_path);
 
+                File.Create (known_hosts_file_path).Close ();
+            }
 
-        private string GetHost (string url)
-        {
-            Regex regex = new Regex (@"(@|://)([a-z0-9\.-]+)(/|:)");
-            Match match = regex.Match (url);
+            string host                 = RemoteUrl.Host;
+            string known_hosts          = File.ReadAllText (known_hosts_file_path);
+            string [] known_hosts_lines = File.ReadAllLines (known_hosts_file_path);
 
-            if (match.Success)
-                return match.Groups [2].Value;
+            foreach (string line in known_hosts_lines) {
+                if (line.StartsWith (host + " "))
+                    return;
+            }
+
+            if (known_hosts.EndsWith ("\n"))
+                File.AppendAllText (known_hosts_file_path, host_key + "\n");
             else
-                return null;
+                File.AppendAllText (known_hosts_file_path, "\n" + host_key + "\n");
+
+            SparkleHelpers.DebugInfo ("Auth", "Accepted host key for " + host);
+
+            if (warn)
+                this.warnings.Add ("The following host key has been accepted:\n" + GetFingerprint (host_key));
         }
-        
-        
-        private void Chmod644 (string file_path)
+
+
+        public static string GetBackend (string path)
         {
-            // Hack to be able to set the permissions on a file
-            // that OpenSSH still likes without resorting to Mono.Unix
-            FileInfo file_info   = new FileInfo (file_path);
-            file_info.Attributes = FileAttributes.ReadOnly;
-            file_info.Attributes = FileAttributes.Normal;
+            string extension = Path.GetExtension (path);
+
+            if (!string.IsNullOrEmpty (extension)) {
+                extension       = extension.Substring (1);
+                char [] letters = extension.ToCharArray ();
+                letters [0]     = char.ToUpper (letters [0]);
+
+                return new string (letters);
+
+            } else {
+                return  "Git";
+            }
         }
+
+
+        protected string [] ExcludeRules = new string [] {
+            // Various autosaving apps
+            "*.autosave",
+
+            // gedit and emacs
+            "*~",
+
+            // LibreOffice
+            ".~lock.*",
+
+            // Firefox and Chromium temporary download files
+            "*.part",
+            "*.crdownload",
+
+            // vi(m)
+            ".*.sw[a-z]",
+            "*.un~",
+            "*.swp",
+            "*.swo",
+
+            // KDE
+            ".directory",
+
+            // Mac OS X
+            ".DS_Store",
+            "Icon\r\r",
+            "._*",
+            ".Spotlight-V100",
+            ".Trashes",
+
+            // Omnigraffle
+            "*(Autosaved).graffle",
+
+            // Windows
+            "Thumbs.db",
+            "Desktop.ini",
+
+            // MS Office
+            "~*.tmp",
+            "~*.TMP",
+            "*~*.tmp",
+            "*~*.TMP",
+            "~*.ppt",
+            "~*.PPT",
+            "~*.pptx",
+            "~*.PPTX",
+            "~*.xls",
+            "~*.XLS",
+            "~*.xlsx",
+            "~*.XLSX",
+            "~*.doc",
+            "~*.DOC",
+            "~*.docx",
+            "~*.DOCX",
+
+            // CVS
+            "*/CVS/*",
+            ".cvsignore",
+            "*/.cvsignore",
+
+            // Subversion
+            "/.svn/*",
+            "*/.svn/*",
+
+            // Mercurial
+            "/.hg/*",
+            "*/.hg/*",
+            "*/.hgignore",
+
+            // Bazaar
+            "/.bzr/*",
+            "*/.bzr/*",
+            "*/.bzrignore"
+        };
     }
 }
diff --git a/SparkleLib/SparkleHelpers.cs b/SparkleLib/SparkleHelpers.cs
index 6de09a2..d58f5c5 100755
--- a/SparkleLib/SparkleHelpers.cs
+++ b/SparkleLib/SparkleHelpers.cs
@@ -17,21 +17,20 @@
 
 using System;
 using System.IO;
+using System.Security.Cryptography;
+using System.Text;
 
 namespace SparkleLib {
     
     public static class SparkleHelpers {
 
-        private static object debug_lock = new object ();
+        private static Object debug_lock = new Object ();
 
         // Show debug info if needed
         public static void DebugInfo (string type, string message)
         {
-            if (!message.StartsWith ("["))
-                message = " " + message;
-
             string timestamp = DateTime.Now.ToString ("HH:mm:ss");
-            string line      = timestamp + " " + "[" + type + "]" + message;
+            string line      = timestamp + " | " + type + " | " + message;
 
             if (SparkleConfig.DebugMode)
                 Console.WriteLine (line);
@@ -79,9 +78,8 @@ namespace SparkleLib {
         // Check if a file is a symbolic link
         public static bool IsSymlink (string file)
         {
-            FileAttributes attr = File.GetAttributes (file);
-
-            return ((attr & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint);
+            FileAttributes attributes = File.GetAttributes (file);
+            return ((attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint);
         }
 
 
@@ -93,22 +91,24 @@ namespace SparkleLib {
         }
 
 
-        // Gets the relative path of two hierarchical absolute paths    
-        public static string DiffPaths (string target, string source)
-        {
-            return target.Replace (source + Path.DirectorySeparatorChar, "");      
+        public static bool IsWindows {
+            get {
+                PlatformID platform = Environment.OSVersion.Platform;
+
+                return (platform == PlatformID.Win32NT ||
+                        platform == PlatformID.Win32S  ||
+                        platform == PlatformID.Win32Windows);
+            }
         }
 
-        public static bool IsWindows
+
+        public static string SHA1 (string s)
         {
-            get
-            {
-                PlatformID platform = Environment.OSVersion.Platform;
-                return (platform == PlatformID.Win32NT
-                    || platform == PlatformID.Win32S
-                    || platform == PlatformID.Win32Windows);
-            }
+            SHA1 sha1         = new SHA1CryptoServiceProvider ();
+            Byte [] bytes     = ASCIIEncoding.Default.GetBytes (s);
+            Byte [] enc_bytes = sha1.ComputeHash (bytes);
+
+            return BitConverter.ToString (enc_bytes).ToLower ().Replace ("-", "");
         }
     }
 }
-
diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs
index 5e92143..c7e16b4 100755
--- a/SparkleLib/SparkleListenerBase.cs
+++ b/SparkleLib/SparkleListenerBase.cs
@@ -109,7 +109,7 @@ namespace SparkleLib {
         {
             if (!this.channels.Contains (channel) && IsConnected) {
                 SparkleHelpers.DebugInfo ("Listener",
-                    "Subscribing to channel " + channel);
+                    "Subscribing to channel " + channel + " on " + Server);
 
                 this.channels.Add (channel);
                 AlsoListenToInternal (channel);
diff --git a/SparkleLib/SparkleListenerFactory.cs b/SparkleLib/SparkleListenerFactory.cs
index f6fabbc..c5e9377 100644
--- a/SparkleLib/SparkleListenerFactory.cs
+++ b/SparkleLib/SparkleListenerFactory.cs
@@ -49,7 +49,7 @@ namespace SparkleLib {
                 // Please see the SparkleShare wiki if you wish to run
                 // your own service instead
 
-                uri = "tcp://notifications.sparkleshare.org:1986";
+                uri = "tcp://notifications.sparkleshare.org:80";
             }
 
             Uri announce_uri = new Uri (uri);
diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs
index 553f7bc..11a79b4 100755
--- a/SparkleLib/SparkleListenerTcp.cs
+++ b/SparkleLib/SparkleListenerTcp.cs
@@ -64,12 +64,11 @@ namespace SparkleLib {
                     int port = Server.Port;
 
                     if (port < 0)
-                        port = 1986;
+                        port = 80;
 
                     try {
                         lock (this.socket_lock) {
-                            this.socket = new Socket (AddressFamily.InterNetwork,
-                                SocketType.Stream, ProtocolType.Tcp) {
+                            this.socket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) {
                                 ReceiveTimeout = 5 * 1000,
                                 SendTimeout    = 5 * 1000
                             };
@@ -108,11 +107,12 @@ namespace SparkleLib {
                         try {
                             // This blocks the thread
                             int i = 0;
+                            int timeout = 300;
                             while (this.socket.Available < 1) {
                                 try {
                                     // We've timed out, let's ping the server to
                                     // see if the connection is still up
-                                    if (i == 180) {
+                                    if (i == timeout) {
                                         SparkleHelpers.DebugInfo ("ListenerTcp",
                                             "Pinging " + Server);
 
@@ -126,8 +126,7 @@ namespace SparkleLib {
                                             // 10057 means "Socket is not connected"
                                             throw new SocketException (10057);
 
-                                        SparkleHelpers.DebugInfo ("ListenerTcp",
-                                            "Received pong from " + Server);
+                                        SparkleHelpers.DebugInfo ("ListenerTcp", "Received pong from " + Server);
 
                                         i = 0;
                                         this.last_ping = DateTime.Now;
@@ -139,13 +138,12 @@ namespace SparkleLib {
                                         // system likely woke up from sleep and we want to
                                         // simulate a disconnect
                                         int sleepiness = DateTime.Compare (
-                                            this.last_ping.AddMilliseconds (180 * 1000 * 1.2),
+                                            this.last_ping.AddMilliseconds (timeout * 1000 * 1.2),
                                             DateTime.Now
                                         );
 
                                         if (sleepiness <= 0) {
-                                            SparkleHelpers.DebugInfo ("ListenerTcp",
-                                                "System woke up from sleep");
+                                            SparkleHelpers.DebugInfo ("ListenerTcp", "System woke up from sleep");
 
                                             // 10057 means "Socket is not connected"
                                             throw new SocketException (10057);
@@ -153,7 +151,7 @@ namespace SparkleLib {
                                     }
 
                                 // The ping failed: disconnect completely
-                                } catch (SocketException) {
+                                } catch (SocketException e) {
                                     this.is_connected  = false;
                                     this.is_connecting = false;
 
@@ -162,16 +160,15 @@ namespace SparkleLib {
                                         this.socket = null;
                                     }
 
-                                    OnDisconnected ("Ping timeout");
+                                    OnDisconnected ("Ping timeout: " + e.Message);
                                     return;
-
                                 }
 
                                 Thread.Sleep (1000);
                                 i++;
                             }
 
-                        } catch (ObjectDisposedException) {
+                        } catch (Exception) {
                             return;
                         }
 
@@ -207,9 +204,6 @@ namespace SparkleLib {
 
         protected override void AlsoListenToInternal (string folder_identifier)
         {
-            SparkleHelpers.DebugInfo ("ListenerTcp",
-                "Subscribing to channel " + folder_identifier + " on " + Server);
-
             string to_send = "subscribe " + folder_identifier + "\n";
 
             try {
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index 6ca60b5..ec32185 100755
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using System.Timers;
+
+using Timers = System.Timers;
 
 namespace SparkleLib {
 
@@ -36,23 +36,16 @@ namespace SparkleLib {
 
     public abstract class SparkleRepoBase {
 
-        private TimeSpan short_interval = new TimeSpan (0, 0, 3, 0);
-        private TimeSpan long_interval  = new TimeSpan (0, 0, 10, 0);
-        private TimeSpan poll_interval;
-        private SparkleWatcher watcher;
-        private SparkleListenerBase listener;
-        private System.Timers.Timer local_timer  = new System.Timers.Timer () { Interval = 0.25 * 1000 };
-        private System.Timers.Timer remote_timer = new System.Timers.Timer () { Interval = 10 * 1000 };
-        private DateTime last_poll               = DateTime.Now;
-        private List<double> size_buffer         = new List<double> ();
-        private Object change_lock               = new Object ();
-        private Object watch_lock                = new Object ();
-        private double progress_percentage       = 0.0;
-        private string progress_speed            = "";
-        private bool has_changed                 = false;
-        private bool is_buffering                = false;
-        private bool server_online               = true;
-        private SyncStatus status;
+        public abstract string CurrentRevision { get; }
+        public abstract double Size { get; }
+        public abstract double HistorySize { get; }
+        public abstract List<string> ExcludePaths { get; }
+        public abstract bool HasUnsyncedChanges { get; set; }
+        public abstract bool HasLocalChanges { get; }
+        public abstract bool HasRemoteChanges { get; }
+        public abstract bool SyncUp ();
+        public abstract bool SyncDown ();
+        public abstract List<SparkleChangeSet> GetChangeSets (int count);
 
 
         public delegate void SyncStatusChangedEventHandler (SyncStatus new_status);
@@ -70,45 +63,41 @@ namespace SparkleLib {
         public delegate void ChangesDetectedEventHandler ();
         public event ChangesDetectedEventHandler ChangesDetected;
 
-
         public readonly string LocalPath;
         public readonly string Name;
-        public readonly Uri Url;
+        public readonly Uri RemoteUrl;
+        public List<SparkleChangeSet> ChangeSets { get; protected set; }
+        public SyncStatus Status { get; private set; }
+        public bool ServerOnline { get; private set; }
+        public bool IsBuffering { get; private set; }
+        public double ProgressPercentage { get; private set; }
+        public string ProgressSpeed { get; private set; }
+
+        public string Identifier {
+            get {
+                if (this.identifier != null)
+                    return this.identifier;
 
-        public abstract string Identifier { get; }
-        public abstract string CurrentRevision { get; }
-        public abstract double Size { get; }
-        public abstract double HistorySize { get; }
-        public abstract List<string> ExcludePaths { get; }
-        public abstract bool HasUnsyncedChanges { get; set; }
-        public abstract bool HasLocalChanges { get; }
-        public abstract bool HasRemoteChanges { get; }
-        public abstract bool SyncUp ();
-        public abstract bool SyncDown ();
-        public abstract List<SparkleChangeSet> GetChangeSets (int count);
+                string id_path = Path.Combine (LocalPath, ".sparkleshare");
 
+                if (File.Exists (id_path))
+                    this.identifier = File.ReadAllText (id_path).Trim ();
 
-        public bool ServerOnline {
-            get {
-                return this.server_online;
-            }
-        }
+                if (this.identifier != null && this.identifier.Length > 0) {
+                    return this.identifier;
 
-        public SyncStatus Status {
-            get {
-                return this.status;
-            }
-        }
+                } else {
+                    Random random   = new Random ();
+                    string number   = "" + random.Next () + "" + random.Next () + "" + random.Next ();
+                    this.identifier = SparkleHelpers.SHA1 (number);
 
-        public double ProgressPercentage {
-            get {
-                return this.progress_percentage;
-            }
-        }
+                    File.WriteAllText (id_path, this.identifier);
+                    File.SetAttributes (id_path, FileAttributes.Hidden);
 
-        public string ProgressSpeed {
-            get {
-                return this.progress_speed;
+                    SparkleHelpers.DebugInfo ("Local", Name + " | Assigned identifier: " + this.identifier);
+
+                    return this.identifier;
+                }
             }
         }
 
@@ -118,48 +107,64 @@ namespace SparkleLib {
             }
         }
 
-        public bool IsSyncing {
+
+        private string identifier;
+
+        private SparkleWatcher watcher;
+        private SparkleListenerBase listener;
+
+        private TimeSpan poll_interval = PollInterval.Short;
+
+        private Object change_lock = new Object ();
+        private DateTime last_poll = DateTime.Now;
+
+        private Timers.Timer remote_timer = new Timers.Timer () {
+            Interval = 5000
+        };
+
+        private bool is_syncing {
             get {
-                return (Status == SyncStatus.SyncUp   ||
-                        Status == SyncStatus.SyncDown ||
-                        this.is_buffering);
+                return (Status == SyncStatus.SyncUp || Status == SyncStatus.SyncDown || IsBuffering);
             }
         }
 
-        public bool IsBuffering {
-            get {
-                return this.is_buffering;
-            }
+        private static class PollInterval {
+            public static TimeSpan Short { get { return new TimeSpan (0, 0, 5, 0); }}
+            public static TimeSpan Long  { get { return new TimeSpan (0, 0, 15, 0); }}
         }
 
 
         public SparkleRepoBase (string path)
         {
-            LocalPath = path;
-            Name      = Path.GetFileName (LocalPath);
-            Url       = new Uri (SparkleConfig.DefaultConfig.GetUrlForFolder (Name));
-
-            this.poll_interval = this.short_interval;
+            LocalPath    = path;
+            Name         = Path.GetFileName (LocalPath);
+            RemoteUrl    = new Uri (SparkleConfig.DefaultConfig.GetUrlForFolder (Name));
+            IsBuffering  = false;
+            ServerOnline = true;
 
             SyncStatusChanged += delegate (SyncStatus status) {
-                this.status = status;
+                Status = status;
             };
 
+            this.identifier = Identifier;
+
             if (CurrentRevision == null)
                 CreateInitialChangeSet ();
 
-            CreateWatcher ();
-            CreateListener ();
+            ChangeSets = GetChangeSets ();
+            this.watcher = CreateWatcher ();
 
-            this.local_timer.Elapsed += delegate (object o, ElapsedEventArgs args) {
-                CheckForChanges ();
-            };
+            new Thread (
+                new ThreadStart (delegate {
+                    CreateListener ();
+                })
+            ).Start ();
 
             this.remote_timer.Elapsed += delegate {
                 bool time_to_poll = (DateTime.Compare (this.last_poll,
                     DateTime.Now.Subtract (this.poll_interval)) < 0);
 
-                if (time_to_poll) {
+                if (time_to_poll && !is_syncing) {
                     this.last_poll = DateTime.Now;
 
                     if (HasRemoteChanges)
@@ -168,11 +173,9 @@ namespace SparkleLib {
 
                 // In the unlikely case that we haven't synced up our
                 // changes or the server was down, sync up again
-                if (HasUnsyncedChanges && !IsSyncing && this.server_online)
+                if (HasUnsyncedChanges && !is_syncing && ServerOnline)
                     SyncUpBase ();
             };
-
-
         }
 
 
@@ -181,94 +184,120 @@ namespace SparkleLib {
             // Sync up everything that changed
             // since we've been offline
             if (HasLocalChanges) {
-                DisableWatching ();
                 SyncUpBase ();
 
                 while (HasUnsyncedChanges)
                     SyncUpBase ();
-
-                EnableWatching ();
             }
 
             this.remote_timer.Start ();
-            this.local_timer.Start ();
         }
 
 
-        protected void OnConflictResolved ()
+        // Create an initial change set when the
+        // user has fetched an empty remote folder
+        public virtual void CreateInitialChangeSet ()
         {
-            HasUnsyncedChanges = true; // ?
-
-            if (ConflictResolved != null)
-                ConflictResolved ();
+            string file_path = Path.Combine (LocalPath, "SparkleShare.txt");
+            string n         = Environment.NewLine;
+
+            File.WriteAllText (file_path,
+                "Congratulations, you've successfully created a SparkleShare repository!" + n +
+                "" + n +
+                "Any files you add or change in this folder will be automatically synced to " + n +
+                RemoteUrl + " and everyone connected to it." + n +
+                "" + n +
+                "SparkleShare is an Open Source software program that helps people " + n +
+                "collaborate and share files. If you like what we do, please consider a small " + n +
+                "donation to support the project: http://sparkleshare.org/support-us/" + n +
+                "" + n +
+                "Have fun! :)" + n
+            );
         }
 
 
-        // Disposes all resourses of this object
-        public void Dispose ()
-        {
-            this.remote_timer.Dispose ();
-            this.local_timer.Dispose ();
-            this.listener.Dispose ();
+        public List<SparkleChangeSet> GetChangeSets () {
+            return GetChangeSets (30);
         }
 
 
-        // Starts a timer when something changes
         public void OnFileActivity (FileSystemEventArgs args)
         {
             // Check the watcher for the occasions where this
             // method is called directly
-            if (!this.watcher.EnableRaisingEvents)
+            if (!this.watcher.EnableRaisingEvents || IsBuffering)
                 return;
 
-            string relative_path = args.FullPath.Replace (LocalPath, "");
-
-            foreach (string exclude_path in ExcludePaths) {
-                if (relative_path.Contains (exclude_path))
-                    return;
-            }
+            lock (this.change_lock) {
+                string relative_path = args.FullPath.Replace (LocalPath, "");
 
-            WatcherChangeTypes wct = args.ChangeType;
+                foreach (string exclude_path in ExcludePaths) {
+                    if (relative_path.Contains (exclude_path))
+                        return;
+                }
 
-            if (HasLocalChanges) {
-                this.is_buffering = true;
+                if (!IsBuffering && HasLocalChanges) {
+                    IsBuffering = true;
+                    this.watcher.Disable ();
+                    this.remote_timer.Stop ();
 
-                // We want to disable wathcing temporarily, but
-                // not stop the local timer
-                this.watcher.EnableRaisingEvents = false;
+                    SparkleHelpers.DebugInfo ("Local", Name + " | Activity detected, waiting for it to settle...");
 
-                // Only fire the event if the timer has been stopped.
-                // This prevents multiple events from being raised whilst "buffering".
-                if (!this.has_changed) {
                     if (ChangesDetected != null)
                         ChangesDetected ();
-                }
 
-                SparkleHelpers.DebugInfo ("Event", "[" + Name + "] " + wct.ToString () + " '" + args.Name + "'");
-                SparkleHelpers.DebugInfo ("Event", "[" + Name + "] Changes found, checking if settled.");
+                    List<double> size_buffer = new List<double> ();
 
-                this.remote_timer.Stop ();
+                    do {
+                        if (size_buffer.Count >= 4)
+                            size_buffer.RemoveAt (0);
+
+                        DirectoryInfo info = new DirectoryInfo (LocalPath);
+                        size_buffer.Add (CalculateSize (info));
+
+                        if (size_buffer.Count >= 4 &&
+                            size_buffer [0].Equals (size_buffer [1]) &&
+                            size_buffer [1].Equals (size_buffer [2]) &&
+                            size_buffer [2].Equals (size_buffer [3])) {
+
+                            SparkleHelpers.DebugInfo ("Local", Name + " | Activity has settled");
+                            IsBuffering = false;
 
-                lock (this.change_lock) {
-                    this.has_changed = true;
+                            this.watcher.Disable ();
+                            while (HasLocalChanges)
+                                SyncUpBase ();
+                            this.watcher.Enable ();
+
+                        } else {
+                            Thread.Sleep (500);
+                        }
+
+                    } while (IsBuffering);
                 }
             }
         }
 
 
+        protected void OnConflictResolved ()
+        {
+            if (ConflictResolved != null)
+                ConflictResolved ();
+        }
+
+
         private void SyncUpBase ()
         {
             try {
-                DisableWatching ();
+                this.watcher.Disable ();
                 this.remote_timer.Stop ();
 
-                SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Initiated");
+                SparkleHelpers.DebugInfo ("SyncUp", Name + " | Initiated");
 
                 if (SyncStatusChanged != null)
                     SyncStatusChanged (SyncStatus.SyncUp);
 
                 if (SyncUp ()) {
-                    SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Done");
+                    SparkleHelpers.DebugInfo ("SyncUp", Name + " | Done");
 
                     HasUnsyncedChanges = false;
 
@@ -278,13 +307,13 @@ namespace SparkleLib {
                     this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision));
 
                 } else {
-                    SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Error");
+                    SparkleHelpers.DebugInfo ("SyncUp", Name + " | Error");
 
                     HasUnsyncedChanges = true;
                     SyncDownBase ();
-                    DisableWatching ();
+                    this.watcher.Disable ();
 
-                    if (this.server_online && SyncUp ()) {
+                    if (ServerOnline && SyncUp ()) {
                         HasUnsyncedChanges = false;
 
                         if (SyncStatusChanged != null)
@@ -293,7 +322,7 @@ namespace SparkleLib {
                         this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision));
 
                     } else {
-                        this.server_online = false;
+                        ServerOnline = false;
 
                         if (SyncStatusChanged != null)
                             SyncStatusChanged (SyncStatus.Error);
@@ -302,19 +331,19 @@ namespace SparkleLib {
 
             } finally {
                 this.remote_timer.Start ();
-                EnableWatching ();
+                this.watcher.Enable ();
 
-                this.progress_percentage = 0.0;
-                this.progress_speed      = "";
+                ProgressPercentage = 0.0;
+                ProgressSpeed      = "";
             }
         }
 
 
         private void SyncDownBase ()
         {
-            SparkleHelpers.DebugInfo ("SyncDown", "[" + Name + "] Initiated");
+            SparkleHelpers.DebugInfo ("SyncDown", Name + " | Initiated");
             this.remote_timer.Stop ();
-            DisableWatching ();
+            this.watcher.Disable ();
 
             if (SyncStatusChanged != null)
                 SyncStatusChanged (SyncStatus.SyncDown);
@@ -322,15 +351,20 @@ namespace SparkleLib {
             string pre_sync_revision = CurrentRevision;
 
             if (SyncDown ()) {
-                SparkleHelpers.DebugInfo ("SyncDown", "[" + Name + "] Done");
-                this.server_online = true;
+                SparkleHelpers.DebugInfo ("SyncDown", Name + " | Done");
+                ServerOnline = true;
 
                 if (!pre_sync_revision.Equals (CurrentRevision)) {
-                    List<SparkleChangeSet> change_sets = GetChangeSets (1);
-
-                   if (change_sets != null && change_sets.Count > 0) {
-                        if (NewChangeSet != null)
-                            NewChangeSet (change_sets [0]);
+                   if (ChangeSets != null &&
+                       ChangeSets.Count > 0) {
+
+                        bool emit_change_event = true;
+                        foreach (SparkleChange change in ChangeSets [0].Changes)
+                            if (change.Path.EndsWith (".sparkleshare"))
+                                emit_change_event = false;
+                        
+                        if (NewChangeSet != null && emit_change_event)
+                            NewChangeSet (ChangeSets [0]);
                     }
                 }
 
@@ -338,41 +372,44 @@ namespace SparkleLib {
                 // conflict. Tries only once, then lets
                 // the timer try again periodically
                 if (HasUnsyncedChanges) {
-	                if (SyncStatusChanged != null)
-	                    SyncStatusChanged (SyncStatus.SyncUp);
-					
+                    if (SyncStatusChanged != null)
+                        SyncStatusChanged (SyncStatus.SyncUp);
+                    
                     SyncUp ();
-					HasUnsyncedChanges = false;
-				}
-				
+                    HasUnsyncedChanges = false;
+                }
+                
                 if (SyncStatusChanged != null)
                     SyncStatusChanged (SyncStatus.Idle);
 
             } else {
-                SparkleHelpers.DebugInfo ("SyncDown", "[" + Name + "] Error");
-                this.server_online = false;
+                SparkleHelpers.DebugInfo ("SyncDown", Name + " | Error");
+                ServerOnline = false;
 
                 if (SyncStatusChanged != null)
                     SyncStatusChanged (SyncStatus.Error);
             }
 
+            ProgressPercentage = 0.0;
+            ProgressSpeed      = "";
+
             if (SyncStatusChanged != null)
                 SyncStatusChanged (SyncStatus.Idle);
 
             this.remote_timer.Start ();
-            EnableWatching ();
-
-            this.progress_percentage = 0.0;
-            this.progress_speed      = "";    
-		}
+            this.watcher.Enable ();
+        }
 
 
-        private void CreateWatcher ()
+        private SparkleWatcher CreateWatcher ()
         {
-            this.watcher = new SparkleWatcher (LocalPath);
-            this.watcher.ChangeEvent += delegate (FileSystemEventArgs args) {
+            SparkleWatcher watcher = new SparkleWatcher (LocalPath);
+
+            watcher.ChangeEvent += delegate (FileSystemEventArgs args) {
                 OnFileActivity (args);
             };
+
+            return watcher;
         }
 
 
@@ -381,21 +418,22 @@ namespace SparkleLib {
             this.listener = SparkleListenerFactory.CreateListener (Name, Identifier);
 
             if (this.listener.IsConnected) {
-                this.poll_interval = this.long_interval;
-
-                new Thread (new ThreadStart (delegate {
-                    if (!IsSyncing && HasRemoteChanges)
-                        SyncDownBase ();
-                })).Start ();
+                this.poll_interval = PollInterval.Long;
+
+                new Thread (
+                    new ThreadStart (delegate {
+                        if (!is_syncing && HasRemoteChanges)
+                            SyncDownBase ();
+                    })
+                ).Start ();
             }
 
             // Stop polling when the connection to the irc channel is succesful
             this.listener.Connected += delegate {
-                this.poll_interval = this.long_interval;
+                this.poll_interval = PollInterval.Long;
                 this.last_poll = DateTime.Now;
 
-                if (!IsSyncing) {
-
+                if (!is_syncing) {
                     // Check for changes manually one more time
                     if (HasRemoteChanges)
                         SyncDownBase ();
@@ -406,9 +444,9 @@ namespace SparkleLib {
                 }
             };
 
-            // Start polling when the connection to the irc channel is lost
+            // Start polling when the connection to the channel is lost
             this.listener.Disconnected += delegate {
-                this.poll_interval = this.short_interval;
+                this.poll_interval = PollInterval.Short;
                 SparkleHelpers.DebugInfo (Name, "Falling back to polling");
             };
 
@@ -419,7 +457,7 @@ namespace SparkleLib {
                 if (announcement.FolderIdentifier.Equals (identifier) &&
                     !announcement.Message.Equals (CurrentRevision)) {
 
-                    while (this.IsSyncing)
+                    while (this.is_syncing)
                         System.Threading.Thread.Sleep (100);
 
                     SparkleHelpers.DebugInfo ("Listener", "Syncing due to announcement");
@@ -437,108 +475,26 @@ namespace SparkleLib {
         }
 
 
-        private void CheckForChanges ()
-        {
-            lock (this.change_lock) {
-                if (this.has_changed) {
-                    if (this.size_buffer.Count >= 4)
-                        this.size_buffer.RemoveAt (0);
-
-                    DirectoryInfo dir_info = new DirectoryInfo (LocalPath);
-                     this.size_buffer.Add (CalculateSize (dir_info));
-
-                    if (this.size_buffer.Count >= 4 &&
-                        this.size_buffer [0].Equals (this.size_buffer [1]) &&
-                        this.size_buffer [1].Equals (this.size_buffer [2]) &&
-                        this.size_buffer [2].Equals (this.size_buffer [3])) {
-
-                        SparkleHelpers.DebugInfo ("Local", "[" + Name + "] Changes have settled.");
-                        this.is_buffering = false;
-                        this.has_changed  = false;
-
-                        DisableWatching ();
-                        while (HasLocalChanges)
-                            SyncUpBase ();
-                        EnableWatching ();
-                    }
-                }
-            }
-        }
-
-
-        protected void DisableWatching ()
-        {
-            lock (this.watch_lock) {
-                this.watcher.EnableRaisingEvents = false;
-                this.local_timer.Stop ();
-            }
-        }
-
-
-        protected void EnableWatching ()
-        {
-            lock (this.watch_lock) {
-                this.watcher.EnableRaisingEvents = true;
-                this.local_timer.Start ();
-            }
-        }
-
-
         private DateTime progress_last_change     = DateTime.Now;
         private TimeSpan progress_change_interval = new TimeSpan (0, 0, 0, 1);
 
         protected void OnProgressChanged (double progress_percentage, string progress_speed)
         {
-            if (DateTime.Compare (this.progress_last_change,
-                    DateTime.Now.Subtract (this.progress_change_interval)) < 0) {
-
-                if (ProgressChanged != null) {
-                    if (progress_percentage == 100.0)
-                        progress_percentage = 99.0;
-
-                    this.progress_percentage  = progress_percentage;
-                    this.progress_speed       = progress_speed;
-                    this.progress_last_change = DateTime.Now;
-
-                    ProgressChanged (progress_percentage, progress_speed);
-                }
-            }
-        }
-
-
-        // Create an initial change set when the
-        // user has fetched an empty remote folder
-        private void CreateInitialChangeSet ()
-        {
-            string file_path = Path.Combine (LocalPath, "SparkleShare.txt");
-            TextWriter writer = new StreamWriter (file_path);
-
-            writer.WriteLine ("Congratulations, you've successfully created a SparkleShare repository!");
-            writer.WriteLine ("");
-            writer.WriteLine ("Any files you add or change in this folder will be automatically synced to ");
-            writer.WriteLine (Url + " and everyone connected to it.");
-
-            writer.WriteLine ("");
-            writer.WriteLine ("SparkleShare is a Free and Open Source software program that helps people ");
-            writer.WriteLine ("collaborate and share files. If you like what we do, please consider a small ");
-            writer.WriteLine ("donation to support the project: http://sparkleshare.org/support-us/");
-            writer.WriteLine ("");
-            writer.WriteLine ("Have fun! :)");
-            writer.WriteLine ("");
+            // Only trigger the ProgressChanged event once per second
+            if (DateTime.Compare (this.progress_last_change, DateTime.Now.Subtract (this.progress_change_interval)) >= 0)
+                return;
 
-            writer.Close ();
+            if (ProgressChanged != null) {
+                if (progress_percentage == 100.0)
+                    progress_percentage = 99.0;
 
-            SyncUp ();
-        }
+                ProgressPercentage = progress_percentage;
+                ProgressSpeed      = progress_speed;
 
+                this.progress_last_change = DateTime.Now;
 
-        // Creates a SHA-1 hash of input
-        private string SHA1 (string s)
-        {
-            SHA1 sha1 = new SHA1CryptoServiceProvider ();
-            Byte[] bytes = ASCIIEncoding.Default.GetBytes (s);
-            Byte[] encoded_bytes = sha1.ComputeHash (bytes);
-            return BitConverter.ToString (encoded_bytes).ToLower ().Replace ("-", "");
+                ProgressChanged (progress_percentage, progress_speed);
+            }
         }
 
 
@@ -554,7 +510,7 @@ namespace SparkleLib {
                 return 0;
 
             try {
-                foreach (FileInfo file in parent.GetFiles()) {
+                foreach (FileInfo file in parent.GetFiles ()) {
                     if (!file.Exists)
                         return 0;
 
@@ -570,5 +526,12 @@ namespace SparkleLib {
 
             return size;
         }
+
+
+        public void Dispose ()
+        {
+            this.remote_timer.Dispose ();
+            this.listener.Dispose ();
+        }
     }
 }
diff --git a/SparkleLib/SparkleWatcher.cs b/SparkleLib/SparkleWatcher.cs
index f1c477f..4b6d75d 100755
--- a/SparkleLib/SparkleWatcher.cs
+++ b/SparkleLib/SparkleWatcher.cs
@@ -25,6 +25,8 @@ namespace SparkleLib {
         public delegate void ChangeEventEventHandler (FileSystemEventArgs args);
         public event ChangeEventEventHandler ChangeEvent;
 
+        private Object thread_lock = new Object ();
+
 
         public SparkleWatcher (string path) : base (path)
         {
@@ -52,5 +54,19 @@ namespace SparkleLib {
                     ChangeEvent (args);
             };
         }
+
+
+        public void Enable ()
+        {
+            lock (this.thread_lock)
+                EnableRaisingEvents = true;
+        }
+
+
+        public void Disable ()
+        {
+            lock (this.thread_lock)
+                EnableRaisingEvents = false;
+        }
     }
 }
diff --git a/SparkleLib/SparkleWrappers.cs b/SparkleLib/SparkleWrappers.cs
new file mode 100644
index 0000000..82cf026
--- /dev/null
+++ b/SparkleLib/SparkleWrappers.cs
@@ -0,0 +1,78 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+
+namespace SparkleLib {
+
+    public enum SparkleChangeType {
+        Added,
+        Edited,
+        Deleted,
+        Moved
+    }
+
+
+    public class SparkleChangeSet {
+
+        public SparkleUser User = new SparkleUser ("Unknown", "Unknown");
+
+        public SparkleFolder Folder;
+        public string Revision;
+        public DateTime Timestamp;
+        public DateTime FirstTimestamp;
+        public Uri RemoteUrl;
+
+        public List<SparkleChange> Changes = new List<SparkleChange> ();
+    }
+
+
+    public class SparkleChange {
+
+        public SparkleChangeType Type;
+		public DateTime Timestamp;
+		
+        public string Path;
+        public string MovedToPath;
+    }
+
+
+    public class SparkleFolder {
+
+        public string Name;
+        public Uri RemoteAddress;
+
+        public string FullPath {
+            get {
+                string custom_path = SparkleConfig.DefaultConfig.GetFolderOptionalAttribute (Name, "path");
+
+                if (custom_path != null)
+                    return Path.Combine (custom_path, Name);
+                else
+                    return Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, Name);
+            }
+        }
+
+
+        public SparkleFolder (string name)
+        {
+            Name = name;
+        }
+    }
+}
diff --git a/data/html/Makefile.am b/SparkleShare/Common/HTML/Makefile.am
index dffbf0a..dffbf0a 100755
--- a/data/html/Makefile.am
+++ b/SparkleShare/Common/HTML/Makefile.am
diff --git a/data/html/Makefile.in b/SparkleShare/Common/HTML/Makefile.in
index c1799ee..973c08e 100644
--- a/data/html/Makefile.in
+++ b/SparkleShare/Common/HTML/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -32,13 +49,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = data/html
+subdir = SparkleShare/Common/HTML
 DIST_COMMON = $(dist_html_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -53,6 +69,11 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,12 +95,17 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(htmldir)"
 DATA = $(dist_html_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -90,50 +116,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -143,8 +150,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -156,8 +161,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -174,20 +177,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -247,9 +245,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/html/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SparkleShare/Common/HTML/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/html/Makefile
+	  $(AUTOMAKE) --foreign SparkleShare/Common/HTML/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -276,8 +274,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -291,9 +292,7 @@ uninstall-dist_htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -348,10 +347,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/data/html/day-entry.html b/SparkleShare/Common/HTML/day-entry.html
index 9b02332..9b02332 100755
--- a/data/html/day-entry.html
+++ b/SparkleShare/Common/HTML/day-entry.html
diff --git a/data/html/event-entry.html b/SparkleShare/Common/HTML/event-entry.html
index 287cd2d..287cd2d 100755
--- a/data/html/event-entry.html
+++ b/SparkleShare/Common/HTML/event-entry.html
diff --git a/data/html/event-log.html b/SparkleShare/Common/HTML/event-log.html
index 8974fa3..d5b4e5b 100755
--- a/data/html/event-log.html
+++ b/SparkleShare/Common/HTML/event-log.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
     <head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>SparkleShare Event Log</title>
         <script type="text/javascript">
           <!-- $jquery -->
@@ -10,11 +10,11 @@
         <script type="text/javascript">
           $(document).ready(function () {
               $('dl dd:nth-child(-n+10)').css('display', 'block');
-			  $('.day-entry-content .event-entry:last-child').css('border', 'none');
-			
-			  $('dd a.windows').click(function () {
-			      window.external.LinkClicked($(this).attr("href"));
-			  });
+              $('.day-entry-content .event-entry:last-child').css('border', 'none');
+            
+              $('dd a.windows').click(function () {
+                  window.external.LinkClicked($(this).attr("href"));
+              });
 
               // Update the Today and Yesterday labels after midnight
               var midnight_interval = setInterval (function(){
@@ -61,12 +61,11 @@
             }
 
             body {
-                background-color: #fafafa;
+                background-color: #fff;
                 color: <!-- $body-color -->;
                 font-size: <!-- $body-font-size -->;
                 font-family: <!-- $body-font-family -->;
                 margin: 0;
-                padding: 18px;
                 -webkit-user-select: none;
             }
 
@@ -85,14 +84,14 @@
                 margin-right: auto;
                 display: block;
                 text-align: center;
-                margin-bottom: 36px;
+                padding-top: 24px;
                 font-weight: bold;
             }
                         
             a {
                 color:           <!-- $a-color -->;
                 text-decoration: none;
-				outline: 0;
+                outline: 0;
             }
 
             a:hover {
@@ -133,21 +132,18 @@
                 padding: 7px 12px;
                 border-radius: 5px;
                 font-family: sans-serif;
-                font-size: 12px;
+                font-size: <!-- $small-font-size -->;
                 float: right;
             }
 
             .event-entry {
-                margin-bottom: 24px;
-                padding-bottom: 24px;
+                padding-top: 24px;
+                padding-bottom: 14px;
                 border-bottom: 1px #ddd solid;
-                width: 100%;
-                margin-left: auto;
-                margin-right: auto;
-                padding-left: 72px;
-                padding-right: 24px;
+                padding-left: 96px;
+                padding-right: 32px;
                 background-repeat: no-repeat;
-                background-position: 12px top;
+                background-position: 36px 24px;
                 display: block;
             }
 
@@ -185,7 +181,7 @@
                 margin-bottom: 12px;
                 padding-top: 6px;
                 clear: both;
-			    table-layout: fixed;
+                table-layout: fixed;
             }
             
             dd {
@@ -194,11 +190,10 @@
                 text-overflow: ellipsis;
                 width: 90%;
                 padding: 0;
-                padding-top: 2px;
-                padding-bottom: 2px;
+                padding-bottom: 1px;
                 padding-left: 20px;
                 margin: 0;
-                margin-bottom: 1px;
+                margin-bottom: 4px;
                 background-repeat: no-repeat;
                 background-position: center left;
             }
@@ -243,7 +238,7 @@
             }
         </style>
     </head>
-    <body>
+    <body oncontextmenu="return false;">
         <!-- $event-log-content -->
     </body>
 </html>
diff --git a/data/html/jquery.js b/SparkleShare/Common/HTML/jquery.js
index 3a8cd46..3a8cd46 100755
--- a/data/html/jquery.js
+++ b/SparkleShare/Common/HTML/jquery.js
diff --git a/SparkleShare/Common/Makefile.am b/SparkleShare/Common/Makefile.am
new file mode 100644
index 0000000..2f972e5
--- /dev/null
+++ b/SparkleShare/Common/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = HTML \
+	Plugins \
+	Pixmaps
diff --git a/SparkleShare/Common/Makefile.in b/SparkleShare/Common/Makefile.in
new file mode 100644
index 0000000..1711a73
--- /dev/null
+++ b/SparkleShare/Common/Makefile.in
@@ -0,0 +1,591 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = SparkleShare/Common
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
+	$(top_srcdir)/build/m4/shamrock/mono.m4 \
+	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
+	$(top_srcdir)/build/m4/shamrock/programs.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/gtk-sharp.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/nautilus-python.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/notify-sharp.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CXX = @CXX@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+F77 = @F77@
+FC = @FC@
+GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
+GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
+GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
+GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
+GTKSHARP_LIBS = @GTKSHARP_LIBS@
+GUISUBDIRS = @GUISUBDIRS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
+NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
+NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
+NAUTILUS_PYTHON_CFLAGS = @NAUTILUS_PYTHON_CFLAGS@
+NAUTILUS_PYTHON_DIR = @NAUTILUS_PYTHON_DIR@
+NAUTILUS_PYTHON_LIBS = @NAUTILUS_PYTHON_LIBS@
+NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
+NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+Q = @Q@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+V = @V@
+VERSION = @VERSION@
+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = HTML \
+	Plugins \
+	Pixmaps
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SparkleShare/Common/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign SparkleShare/Common/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+
+# 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/SparkleShare/Common/Pixmaps/Makefile.am b/SparkleShare/Common/Pixmaps/Makefile.am
new file mode 100644
index 0000000..4b8fec4
--- /dev/null
+++ b/SparkleShare/Common/Pixmaps/Makefile.am
@@ -0,0 +1,20 @@
+dist_pixmaps_DATA = \
+    tutorial-slide-4.png \
+    side-splash.png \
+    avatar-a.png \
+    avatar-b.png \
+    avatar-c.png \
+    avatar-d.png \
+    avatar-e.png \
+    avatar-f.png \
+    avatar-g.png \
+    avatar-h.png \
+    avatar-i.png \
+    avatar-j.png \
+    avatar-k.png \
+    about.png
+
+pixmapsdir = $(pkgdatadir)/pixmaps/
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
diff --git a/SparkleShare/Common/Pixmaps/Makefile.in b/SparkleShare/Common/Pixmaps/Makefile.in
new file mode 100644
index 0000000..08a75c8
--- /dev/null
+++ b/SparkleShare/Common/Pixmaps/Makefile.in
@@ -0,0 +1,465 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = SparkleShare/Common/Pixmaps
+DIST_COMMON = $(dist_pixmaps_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
+	$(top_srcdir)/build/m4/shamrock/mono.m4 \
+	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
+	$(top_srcdir)/build/m4/shamrock/programs.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/gtk-sharp.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/nautilus-python.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/notify-sharp.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pixmapsdir)"
+DATA = $(dist_pixmaps_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CXX = @CXX@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+F77 = @F77@
+FC = @FC@
+GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
+GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
+GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
+GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
+GTKSHARP_LIBS = @GTKSHARP_LIBS@
+GUISUBDIRS = @GUISUBDIRS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
+NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
+NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
+NAUTILUS_PYTHON_CFLAGS = @NAUTILUS_PYTHON_CFLAGS@
+NAUTILUS_PYTHON_DIR = @NAUTILUS_PYTHON_DIR@
+NAUTILUS_PYTHON_LIBS = @NAUTILUS_PYTHON_LIBS@
+NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
+NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+Q = @Q@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+V = @V@
+VERSION = @VERSION@
+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+dist_pixmaps_DATA = \
+    tutorial-slide-4.png \
+    side-splash.png \
+    avatar-a.png \
+    avatar-b.png \
+    avatar-c.png \
+    avatar-d.png \
+    avatar-e.png \
+    avatar-f.png \
+    avatar-g.png \
+    avatar-h.png \
+    avatar-i.png \
+    avatar-j.png \
+    avatar-k.png \
+    about.png
+
+pixmapsdir = $(pkgdatadir)/pixmaps/
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SparkleShare/Common/Pixmaps/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign SparkleShare/Common/Pixmaps/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_pixmapsDATA: $(dist_pixmaps_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pixmapsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapsdir)" || exit $$?; \
+	done
+
+uninstall-dist_pixmapsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pixmapsdir)'; $(am__uninstall_files_from_dir)
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(pixmapsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_pixmapsDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_pixmapsDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_pixmapsDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-dist_pixmapsDATA
+
+
+# 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/SparkleShare/Common/Pixmaps/about.png b/SparkleShare/Common/Pixmaps/about.png
new file mode 100755
index 0000000..18a6ab0
--- /dev/null
+++ b/SparkleShare/Common/Pixmaps/about.png
diff --git a/data/avatar-a.png b/SparkleShare/Common/Pixmaps/avatar-a.png
index 4ffc65a..4ffc65a 100644
--- a/data/avatar-a.png
+++ b/SparkleShare/Common/Pixmaps/avatar-a.png
diff --git a/data/avatar-b.png b/SparkleShare/Common/Pixmaps/avatar-b.png
index 891fce6..891fce6 100644
--- a/data/avatar-b.png
+++ b/SparkleShare/Common/Pixmaps/avatar-b.png
diff --git a/data/avatar-c.png b/SparkleShare/Common/Pixmaps/avatar-c.png
index 17cc5ef..17cc5ef 100644
--- a/data/avatar-c.png
+++ b/SparkleShare/Common/Pixmaps/avatar-c.png
diff --git a/data/avatar-d.png b/SparkleShare/Common/Pixmaps/avatar-d.png
index af35c7d..af35c7d 100644
--- a/data/avatar-d.png
+++ b/SparkleShare/Common/Pixmaps/avatar-d.png
diff --git a/data/avatar-e.png b/SparkleShare/Common/Pixmaps/avatar-e.png
index 31a98e1..31a98e1 100644
--- a/data/avatar-e.png
+++ b/SparkleShare/Common/Pixmaps/avatar-e.png
diff --git a/data/avatar-f.png b/SparkleShare/Common/Pixmaps/avatar-f.png
index 59cc2e5..59cc2e5 100644
--- a/data/avatar-f.png
+++ b/SparkleShare/Common/Pixmaps/avatar-f.png
diff --git a/data/avatar-g.png b/SparkleShare/Common/Pixmaps/avatar-g.png
index 6abe125..6abe125 100644
--- a/data/avatar-g.png
+++ b/SparkleShare/Common/Pixmaps/avatar-g.png
diff --git a/data/avatar-h.png b/SparkleShare/Common/Pixmaps/avatar-h.png
index 14dd39f..14dd39f 100644
--- a/data/avatar-h.png
+++ b/SparkleShare/Common/Pixmaps/avatar-h.png
diff --git a/data/avatar-i.png b/SparkleShare/Common/Pixmaps/avatar-i.png
index 2f9cc3e..2f9cc3e 100644
--- a/data/avatar-i.png
+++ b/SparkleShare/Common/Pixmaps/avatar-i.png
diff --git a/data/avatar-j.png b/SparkleShare/Common/Pixmaps/avatar-j.png
index 7187ca1..7187ca1 100644
--- a/data/avatar-j.png
+++ b/SparkleShare/Common/Pixmaps/avatar-j.png
diff --git a/data/avatar-k.png b/SparkleShare/Common/Pixmaps/avatar-k.png
index afdc3fe..afdc3fe 100644
--- a/data/avatar-k.png
+++ b/SparkleShare/Common/Pixmaps/avatar-k.png
diff --git a/SparkleShare/Common/Pixmaps/side-splash.png b/SparkleShare/Common/Pixmaps/side-splash.png
new file mode 100755
index 0000000..f5578dd
--- /dev/null
+++ b/SparkleShare/Common/Pixmaps/side-splash.png
diff --git a/data/tutorial-slide-4.png b/SparkleShare/Common/Pixmaps/tutorial-slide-4.png
index 315179b..315179b 100755
--- a/data/tutorial-slide-4.png
+++ b/SparkleShare/Common/Pixmaps/tutorial-slide-4.png
diff --git a/data/plugins/Makefile.am b/SparkleShare/Common/Plugins/Makefile.am
index 45a936a..c0085e2 100644
--- a/data/plugins/Makefile.am
+++ b/SparkleShare/Common/Plugins/Makefile.am
@@ -3,17 +3,19 @@ dist_plugins_in_files = \
     github.xml.in \
     gitorious.xml.in \
     gnome.xml.in \
+    ssnet.xml.in \
     own-server.xml.in
 
 dist_plugins_DATA = \
     $(dist_plugins_in_files:.xml.in=.xml) \
     github.png \
-	gitorious.png \
-	bitbucket.png \
-	gnome.png \
-	own-server.png
+    gitorious.png \
+    bitbucket.png \
+    gnome.png \
+    ssnet.png \
+    own-server.png
 
-@INTLTOOL_XML_RULE@
+#@INTLTOOL_XML_RULE@
 
 pluginsdir = $(pkgdatadir)/plugins/
 
diff --git a/data/plugins/Makefile.in b/SparkleShare/Common/Plugins/Makefile.in
index 3c2314e..f3c35aa 100644
--- a/data/plugins/Makefile.in
+++ b/SparkleShare/Common/Plugins/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -32,13 +49,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = data/plugins
+subdir = SparkleShare/Common/Plugins
 DIST_COMMON = $(dist_plugins_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -53,6 +69,11 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,12 +95,17 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pluginsdir)"
 DATA = $(dist_plugins_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -90,50 +116,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -143,8 +150,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -156,8 +161,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -174,20 +177,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -231,16 +229,20 @@ dist_plugins_in_files = \
     github.xml.in \
     gitorious.xml.in \
     gnome.xml.in \
+    ssnet.xml.in \
     own-server.xml.in
 
 dist_plugins_DATA = \
     $(dist_plugins_in_files:.xml.in=.xml) \
     github.png \
-	gitorious.png \
-	bitbucket.png \
-	gnome.png \
-	own-server.png
+    gitorious.png \
+    bitbucket.png \
+    gnome.png \
+    ssnet.png \
+    own-server.png
 
+
+#@INTLTOOL_XML_RULE@
 pluginsdir = $(pkgdatadir)/plugins/
 EXTRA_DIST = $(dist_plugins_in_files) $(xml_DATA)
 MAINTAINERCLEANFILES = \
@@ -258,9 +260,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/plugins/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SparkleShare/Common/Plugins/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/plugins/Makefile
+	  $(AUTOMAKE) --foreign SparkleShare/Common/Plugins/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -287,8 +289,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-dist_pluginsDATA: $(dist_plugins_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pluginsdir)" || $(MKDIR_P) "$(DESTDIR)$(pluginsdir)"
 	@list='$(dist_plugins_DATA)'; test -n "$(pluginsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pluginsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pluginsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -302,9 +307,7 @@ uninstall-dist_pluginsDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_plugins_DATA)'; test -n "$(pluginsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pluginsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pluginsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pluginsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -359,10 +362,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -456,8 +464,6 @@ uninstall-am: uninstall-dist_pluginsDATA
 	ps ps-am uninstall uninstall-am uninstall-dist_pluginsDATA
 
 
-@INTLTOOL_XML_RULE@
-
 # 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/data/plugins/bitbucket.png b/SparkleShare/Common/Plugins/bitbucket.png
index 223d3fa..223d3fa 100644
--- a/data/plugins/bitbucket.png
+++ b/SparkleShare/Common/Plugins/bitbucket.png
diff --git a/data/plugins/bitbucket.xml b/SparkleShare/Common/Plugins/bitbucket.xml
index 5597916..9d9860a 100644
--- a/data/plugins/bitbucket.xml
+++ b/SparkleShare/Common/Plugins/bitbucket.xml
@@ -28,6 +28,7 @@
         <description xml:lang="zh_CN">免费的Git与Mercurial代码托管</description>
         <icon>bitbucket.png</icon>
         <backend>Git</backend>
+        <fingerprint>97:8c:1b:f2:6f:14:6b:5c:3b:ec:aa:46:46:74:7c:40</fingerprint>
     </info>
     <address>
       <value>ssh://git@bitbucket.org/</value>
@@ -47,6 +48,7 @@
       <example xml:lang="ru">/username/project</example>
       <example xml:lang="sv">/användare/projekt</example>
       <example xml:lang="zh_CN">/username/project</example>
+      <uses_lower_case>True</uses_lower_case>
     </path>
   </plugin>
 </sparkleshare>
 \ No newline at end of file
diff --git a/data/plugins/bitbucket.xml.in b/SparkleShare/Common/Plugins/bitbucket.xml.in
index 800b8bc..7e3a861 100644
--- a/data/plugins/bitbucket.xml.in
+++ b/SparkleShare/Common/Plugins/bitbucket.xml.in
@@ -6,6 +6,7 @@
         <_description>Free code hosting for Git and Mercurial</_description>
         <icon>bitbucket.png</icon>
         <backend>Git</backend>
+        <fingerprint>97:8c:1b:f2:6f:14:6b:5c:3b:ec:aa:46:46:74:7c:40</fingerprint>
     </info>
     <address>
       <value>ssh://git@bitbucket.org/</value>
@@ -14,6 +15,7 @@
     <path>
       <value></value>
       <_example>/username/project</_example>
+      <uses_lower_case>True</uses_lower_case>
     </path>
   </plugin>
 </sparkleshare>
diff --git a/data/plugins/github.png b/SparkleShare/Common/Plugins/github.png
index ca5dda8..ca5dda8 100644
--- a/data/plugins/github.png
+++ b/SparkleShare/Common/Plugins/github.png
diff --git a/data/plugins/github.xml b/SparkleShare/Common/Plugins/github.xml
index fa48799..37aac56 100644
--- a/data/plugins/github.xml
+++ b/SparkleShare/Common/Plugins/github.xml
@@ -15,9 +15,10 @@
         <name xml:lang="ru">Github</name>
         <name xml:lang="sv">Github</name>
         <name xml:lang="zh_CN">Github</name>
-        <description>Collaborate on projects hosted on github.com</description>
+        <description>Collaborate on projects hosted on Github</description>
         <icon>github.png</icon>
         <backend>Git</backend>
+        <fingerprint>16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48</fingerprint>
     </info>
     <address>
       <value>ssh://git@github.com/</value>
diff --git a/data/plugins/github.xml.in b/SparkleShare/Common/Plugins/github.xml.in
index 2978d33..317b58f 100644
--- a/data/plugins/github.xml.in
+++ b/SparkleShare/Common/Plugins/github.xml.in
@@ -3,9 +3,10 @@
   <plugin>
     <info>
         <_name>Github</_name>
-        <_description>Collaborate on projects hosted on github.com</_description>
+        <_description>Collaborate on projects hosted on Github</_description>
         <icon>github.png</icon>
         <backend>Git</backend>
+        <fingerprint>16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48</fingerprint>
     </info>
     <address>
       <value>ssh://git@github.com/</value>
diff --git a/data/plugins/gitorious.png b/SparkleShare/Common/Plugins/gitorious.png
index 0a9ddb5..0a9ddb5 100644
--- a/data/plugins/gitorious.png
+++ b/SparkleShare/Common/Plugins/gitorious.png
diff --git a/data/plugins/gitorious.xml b/SparkleShare/Common/Plugins/gitorious.xml
index 6806b28..a441e6e 100644
--- a/data/plugins/gitorious.xml
+++ b/SparkleShare/Common/Plugins/gitorious.xml
@@ -45,6 +45,7 @@
         <description xml:lang="zh_CN">托管开源项目的开源架构</description>
         <icon>gitorious.png</icon>
         <backend>Git</backend>
+        <fingerprint>7e:af:8d:ec:f0:39:5e:ba:52:16:ce:19:fa:d4:b8:7d</fingerprint>
     </info>
     <address>
       <value>ssh://git@gitorious.org/</value>
diff --git a/data/plugins/gitorious.xml.in b/SparkleShare/Common/Plugins/gitorious.xml.in
index d581fd1..311b094 100644
--- a/data/plugins/gitorious.xml.in
+++ b/SparkleShare/Common/Plugins/gitorious.xml.in
@@ -6,6 +6,7 @@
         <_description>Open source infrastructure for hosting open source projects</_description>
         <icon>gitorious.png</icon>
         <backend>Git</backend>
+        <fingerprint>7e:af:8d:ec:f0:39:5e:ba:52:16:ce:19:fa:d4:b8:7d</fingerprint>
     </info>
     <address>
       <value>ssh://git@gitorious.org/</value>
diff --git a/data/plugins/gnome.png b/SparkleShare/Common/Plugins/gnome.png
index d596c2b..d596c2b 100644
--- a/data/plugins/gnome.png
+++ b/SparkleShare/Common/Plugins/gnome.png
diff --git a/data/plugins/gnome.xml b/SparkleShare/Common/Plugins/gnome.xml
index d6de4bb..909b961 100644
--- a/data/plugins/gnome.xml
+++ b/SparkleShare/Common/Plugins/gnome.xml
@@ -44,6 +44,7 @@
         <description xml:lang="zh_CN">为你的计算机提供一个免费并且简单的接口</description>
         <icon>gnome.png</icon>
         <backend>Git</backend>
+        <fingerprint>00:39:fd:1a:a4:2c:6b:28:b8:2e:95:31:c2:90:72:03</fingerprint>
     </info>
     <address>
       <value>ssh://git@gnome.org/</value>
diff --git a/data/plugins/gnome.xml.in b/SparkleShare/Common/Plugins/gnome.xml.in
index 721b2ca..d56b03c 100644
--- a/data/plugins/gnome.xml.in
+++ b/SparkleShare/Common/Plugins/gnome.xml.in
@@ -6,6 +6,7 @@
         <_description>A free and easy interface for your computer</_description>
         <icon>gnome.png</icon>
         <backend>Git</backend>
+        <fingerprint>00:39:fd:1a:a4:2c:6b:28:b8:2e:95:31:c2:90:72:03</fingerprint>
     </info>
     <address>
       <value>ssh://git@gnome.org/</value>
diff --git a/data/plugins/own-server.png b/SparkleShare/Common/Plugins/own-server.png
index 59044df..59044df 100644
--- a/data/plugins/own-server.png
+++ b/SparkleShare/Common/Plugins/own-server.png
diff --git a/data/plugins/own-server.xml b/SparkleShare/Common/Plugins/own-server.xml
index d0cd064..d0cd064 100644
--- a/data/plugins/own-server.xml
+++ b/SparkleShare/Common/Plugins/own-server.xml
diff --git a/data/plugins/own-server.xml.in b/SparkleShare/Common/Plugins/own-server.xml.in
index c3f854b..c3f854b 100644
--- a/data/plugins/own-server.xml.in
+++ b/SparkleShare/Common/Plugins/own-server.xml.in
diff --git a/SparkleShare/Common/Plugins/ssnet.png b/SparkleShare/Common/Plugins/ssnet.png
new file mode 100644
index 0000000..476d832
--- /dev/null
+++ b/SparkleShare/Common/Plugins/ssnet.png
diff --git a/SparkleShare/Common/Plugins/ssnet.xml b/SparkleShare/Common/Plugins/ssnet.xml
new file mode 100644
index 0000000..8d4ff15
--- /dev/null
+++ b/SparkleShare/Common/Plugins/ssnet.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sparkleshare>
+  <plugin>
+    <info>
+        <name>SparkleShare.Net</name>
+        <description>The easiest way to share projects with SparkleShare</description>
+        <icon>ssnet.png</icon>
+        <backend>Git</backend>
+    </info>
+    <address>
+      <value>ssh://storage@sparkleshare.net/</value>
+      <example/>
+    </address>
+    <path>
+      <value/>
+      <example>/username/project</example>
+      <example xml:lang="de">/username/project</example>
+      <example xml:lang="el">/username/project</example>
+      <example xml:lang="es">/usuario/proyecto</example>
+      <example xml:lang="fr">/nom-d-utilisateur/projet</example>
+      <example xml:lang="it">/nome-utente/progetto</example>
+      <example xml:lang="nl">/gebruikersnaam/project</example>
+      <example xml:lang="pl">/nazwa uzytkownika/projekt</example>
+      <example xml:lang="pt_BR">/usuário/projeto</example>
+      <example xml:lang="ru">/username/project</example>
+      <example xml:lang="sv">/användare/projekt</example>
+      <example xml:lang="zh_CN">/username/project</example>
+    </path>
+  </plugin>
+</sparkleshare>
+\ No newline at end of file
diff --git a/SparkleShare/Common/Plugins/ssnet.xml.in b/SparkleShare/Common/Plugins/ssnet.xml.in
new file mode 100644
index 0000000..dbb88d8
--- /dev/null
+++ b/SparkleShare/Common/Plugins/ssnet.xml.in
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sparkleshare>
+  <plugin>
+    <info>
+        <_name>SparkleShare.Net</_name>
+        <_description>The easiest way to share projects with SparkleShare</_description>
+        <icon>ssnet.png</icon>
+        <backend>Git</backend>
+    </info>
+    <address>
+      <value>ssh://storage@sparkleshare.net/</value>
+      <example></example>
+    </address>
+    <path>
+      <value></value>
+      <_example>/username/project</_example>
+    </path>
+  </plugin>
+</sparkleshare>
+
diff --git a/SparkleShare/Linux/Makefile.am b/SparkleShare/Linux/Makefile.am
index f7f3552..bd6e14e 100644
--- a/SparkleShare/Linux/Makefile.am
+++ b/SparkleShare/Linux/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS =	Nautilus
+SUBDIRS = Nautilus \
+	Pixmaps
 
 ASSEMBLY = SparkleShare
 TARGET = exe
@@ -17,7 +18,6 @@ SOURCES =  \
 	../SparkleEventLogController.cs \
 	../SparkleExtensions.cs \
 	../SparkleInvite.cs \
-	../SparkleOptions.cs \
 	../SparklePlugin.cs \
 	../SparkleSetupController.cs \
 	../SparkleStatusIconController.cs \
diff --git a/SparkleShare/Linux/Makefile.in b/SparkleShare/Linux/Makefile.in
index e4351af..1c17dbe 100644
--- a/SparkleShare/Linux/Makefile.in
+++ b/SparkleShare/Linux/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,7 +59,6 @@ subdir = SparkleShare/Linux
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -76,6 +92,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(moduledir)" \
 	"$(DESTDIR)$(Applicationsdir)"
 SCRIPTS = $(bin_SCRIPTS) $(module_SCRIPTS)
@@ -87,6 +109,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_Applications_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -124,7 +151,6 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -135,50 +161,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -188,8 +195,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -201,8 +206,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -219,20 +222,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -271,7 +269,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = Nautilus
+SUBDIRS = Nautilus \
+	Pixmaps
+
 ASSEMBLY = SparkleShare
 TARGET = exe
 @ENABLE_TESTS_TRUE@LINK = " $(NUNIT_LIBS)"
@@ -285,7 +285,6 @@ SOURCES = \
 	../SparkleEventLogController.cs \
 	../SparkleExtensions.cs \
 	../SparkleInvite.cs \
-	../SparkleOptions.cs \
 	../SparklePlugin.cs \
 	../SparkleSetupController.cs \
 	../SparkleStatusIconController.cs \
@@ -402,6 +401,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/build/build.mk $(top_srcdir)/build/build.environment.mk $(top_srcdir)/build/build.rules.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -415,8 +415,11 @@ sparkleshare: $(top_builddir)/config.status $(srcdir)/sparkleshare.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -444,13 +447,14 @@ uninstall-binSCRIPTS:
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 install-moduleSCRIPTS: $(module_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
 	@list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -478,9 +482,7 @@ uninstall-moduleSCRIPTS:
 	@list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(moduledir)" && rm -f $$files
+	dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,8 +491,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-dist_ApplicationsDATA: $(dist_Applications_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(Applicationsdir)" || $(MKDIR_P) "$(DESTDIR)$(Applicationsdir)"
 	@list='$(dist_Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(Applicationsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(Applicationsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -504,9 +509,7 @@ uninstall-dist_ApplicationsDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Applicationsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Applicationsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(Applicationsdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -675,13 +678,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -719,10 +719,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/SparkleShare/Linux/Nautilus/Makefile.in b/SparkleShare/Linux/Nautilus/Makefile.in
index 911a9e1..38e4dd0 100644
--- a/SparkleShare/Linux/Nautilus/Makefile.in
+++ b/SparkleShare/Linux/Nautilus/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -39,7 +56,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -74,13 +90,23 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(extensiondir)"
 SCRIPTS = $(extension_SCRIPTS)
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -91,50 +117,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -144,8 +151,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -157,8 +162,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -175,20 +178,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -277,8 +275,11 @@ sparkleshare-nautilus3-extension.py: $(top_builddir)/config.status $(srcdir)/spa
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-extensionSCRIPTS: $(extension_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)"
 	@list='$(extension_SCRIPTS)'; test -n "$(extensiondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -306,9 +307,7 @@ uninstall-extensionSCRIPTS:
 	@list='$(extension_SCRIPTS)'; test -n "$(extensiondir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(extensiondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(extensiondir)" && rm -f $$files
+	dir='$(DESTDIR)$(extensiondir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -369,10 +368,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py b/SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
index ec474f4..4906f6d 100644
--- a/SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
+++ b/SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
@@ -29,7 +29,7 @@ import gtk
 SPARKLESHARE_PATH = os.path.join (os.path.expanduser ('~'), "SparkleShare")
 
 import gettext
-gettext.bindtextdomain('sparkleshare', '/usr/share/locale')
+gettext.bindtextdomain('sparkleshare', '/home/carlos/staging/ss/share/locale')
 gettext.textdomain('sparkleshare')
 _ = gettext.gettext
 
@@ -88,7 +88,7 @@ class SparkleShareExtension (nautilus.MenuProvider):
         if "gitorious.org" in url:
 	        url = "http://" + url + "/blobs/master" + relative_path
         if "github.com" in url:
-            url = "http://" + url + "/raw/master" + relative_path
+            url = "https://" + url + "/master" + relative_path
 
         url = url.replace (" ", "%20");
 
diff --git a/SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py.in b/SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py.in
index 717761b..dde1ca8 100755
--- a/SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py.in
+++ b/SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py.in
@@ -88,7 +88,7 @@ class SparkleShareExtension (nautilus.MenuProvider):
         if "gitorious.org" in url:
 	        url = "http://" + url + "/blobs/master" + relative_path
         if "github.com" in url:
-            url = "http://" + url + "/raw/master" + relative_path
+            url = "https://" + url + "/master" + relative_path
 
         url = url.replace (" ", "%20");
 
diff --git a/SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py b/SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py
index 9f21c8e..32b450e 100644
--- a/SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py
+++ b/SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py
@@ -26,7 +26,7 @@ from gi.repository import Nautilus, GObject, Gtk, Gdk
 SPARKLESHARE_PATH = os.path.join (os.path.expanduser ('~'), "SparkleShare")
 
 import gettext
-gettext.bindtextdomain('sparkleshare', '/usr/share/locale')
+gettext.bindtextdomain('sparkleshare', '/home/carlos/staging/ss/share/locale')
 gettext.textdomain('sparkleshare')
 _ = gettext.gettext
 
@@ -83,7 +83,7 @@ class SparkleShareExtension (GObject.GObject, Nautilus.MenuProvider):
         elif "github.com" in host:
             # ssh://git@github.com/hbons/SparkleShare.git
             # https://raw.github.com/hbons/SparkleShare/master/README
-            url = "http://raw.github.com/" + urllib.quote(origin_path.rstrip(".git")) + "/raw/master/" + urllib.quote(relative_path)
+            url = "https://raw.github.com/" + urllib.quote(origin_path.rstrip(".git")) + "/master/" + urllib.quote(relative_path)
         else:
             # https://git.one-gear.com/?p=thansen/Public.git;a=blob;f=SparkleShare.txt;hb=HEAD
             url = "http://" + host + "/?p=" + urllib.quote(origin_path) +";a=blob;f=" + urllib.quote(relative_path) + ";hb=HEAD"
diff --git a/SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py.in b/SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py.in
index e4de79c..f12577e 100755
--- a/SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py.in
+++ b/SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py.in
@@ -83,7 +83,7 @@ class SparkleShareExtension (GObject.GObject, Nautilus.MenuProvider):
         elif "github.com" in host:
             # ssh://git@github.com/hbons/SparkleShare.git
             # https://raw.github.com/hbons/SparkleShare/master/README
-            url = "http://raw.github.com/" + urllib.quote(origin_path.rstrip(".git")) + "/raw/master/" + urllib.quote(relative_path)
+            url = "https://raw.github.com/" + urllib.quote(origin_path.rstrip(".git")) + "/master/" + urllib.quote(relative_path)
         else:
             # https://git.one-gear.com/?p=thansen/Public.git;a=blob;f=SparkleShare.txt;hb=HEAD
             url = "http://" + host + "/?p=" + urllib.quote(origin_path) +";a=blob;f=" + urllib.quote(relative_path) + ";hb=HEAD"
diff --git a/SparkleShare/Linux/Pixmaps/Makefile.am b/SparkleShare/Linux/Pixmaps/Makefile.am
new file mode 100755
index 0000000..e3bb71d
--- /dev/null
+++ b/SparkleShare/Linux/Pixmaps/Makefile.am
@@ -0,0 +1,11 @@
+SUBDIRS = icons
+
+dist_pixmaps_DATA = \
+	tutorial-slide-1.png \
+	tutorial-slide-2.png \
+	tutorial-slide-3.png
+
+pixmapsdir = $(pkgdatadir)/pixmaps/
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
diff --git a/data/Makefile.in b/SparkleShare/Linux/Pixmaps/Makefile.in
index 1a07e71..73f453f 100644
--- a/data/Makefile.in
+++ b/SparkleShare/Linux/Pixmaps/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -32,13 +49,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = data
+subdir = SparkleShare/Linux/Pixmaps
 DIST_COMMON = $(dist_pixmaps_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -60,6 +76,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -81,6 +102,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pixmapsdir)"
 DATA = $(dist_pixmaps_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -119,7 +146,6 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -130,50 +156,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -183,8 +190,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -196,8 +201,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -214,20 +217,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -266,29 +264,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = \
-	icons \
-	html \
-	plugins
-
+SUBDIRS = icons
 dist_pixmaps_DATA = \
-	side-splash.png \
 	tutorial-slide-1.png \
 	tutorial-slide-2.png \
-	tutorial-slide-3.png \
-	tutorial-slide-4.png \
-        avatar-a.png \
-        avatar-b.png \
-        avatar-c.png \
-        avatar-d.png \
-        avatar-e.png \
-        avatar-f.png \
-        avatar-g.png \
-        avatar-h.png \
-        avatar-i.png \
-        avatar-j.png \
-        avatar-k.png \
-	about.png
+	tutorial-slide-3.png
 
 pixmapsdir = $(pkgdatadir)/pixmaps/
 MAINTAINERCLEANFILES = \
@@ -306,9 +286,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SparkleShare/Linux/Pixmaps/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/Makefile
+	  $(AUTOMAKE) --foreign SparkleShare/Linux/Pixmaps/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -335,8 +315,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-dist_pixmapsDATA: $(dist_pixmaps_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)"
 	@list='$(dist_pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pixmapsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -350,9 +333,7 @@ uninstall-dist_pixmapsDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pixmapsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pixmapsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pixmapsdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -521,13 +502,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -565,10 +543,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/SparkleShare/Linux/Pixmaps/icons/Makefile.am b/SparkleShare/Linux/Pixmaps/icons/Makefile.am
new file mode 100755
index 0000000..c949e4b
--- /dev/null
+++ b/SparkleShare/Linux/Pixmaps/icons/Makefile.am
@@ -0,0 +1,52 @@
+SUBDIRS = ubuntu-mono-dark \
+	ubuntu-mono-light
+
+theme = hicolor
+system_themedir = $(datadir)/icons/$(theme)
+app_themedir = $(pkgdatadir)/icons/$(theme)
+
+system_theme_icons = \
+	apps,folder-sparkleshare-16.png \
+	apps,folder-sparkleshare-22.png	\
+	apps,folder-sparkleshare-24.png \
+	apps,folder-sparkleshare-256.png \
+	apps,folder-sparkleshare-32.png \
+	apps,folder-sparkleshare-48.png
+
+app_theme_icons = \
+	animations,process-working-22.png \
+	places,folder-sparkleshare-16.png \
+	places,folder-sparkleshare-22.png \
+	places,folder-sparkleshare-24.png \
+	places,folder-sparkleshare-256.png \
+	places,folder-sparkleshare-32.png \
+	places,folder-sparkleshare-48.png \
+	status,process-syncing-i-24.png \
+	status,process-syncing-ii-24.png \
+	status,process-syncing-iii-24.png \
+	status,process-syncing-iiii-24.png \
+	status,process-syncing-iiiii-24.png \
+	status,process-syncing-error-24.png	\
+	status,document-added-12.png \
+	status,document-edited-12.png \
+	status,document-deleted-12.png \
+	status,document-moved-12.png \
+	status,list-point-16.png
+
+install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
+	-t "$(theme)" \
+	-s "$(srcdir)" \
+	-d "x$(DESTDIR)" \
+	-m "$(mkinstalldirs)" \
+	-x "$(INSTALL_DATA)"
+
+install-data-local:
+	@-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons)
+	@-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons)
+
+uninstall-hook:
+	@-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons)
+	@-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons)
+
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = $(wildcard *.png *.svg)
diff --git a/SparkleShare/Linux/Pixmaps/icons/Makefile.in b/SparkleShare/Linux/Pixmaps/icons/Makefile.in
new file mode 100644
index 0000000..16d4141
--- /dev/null
+++ b/SparkleShare/Linux/Pixmaps/icons/Makefile.in
@@ -0,0 +1,640 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = SparkleShare/Linux/Pixmaps/icons
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
+	$(top_srcdir)/build/m4/shamrock/mono.m4 \
+	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
+	$(top_srcdir)/build/m4/shamrock/programs.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/gtk-sharp.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/nautilus-python.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/notify-sharp.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CXX = @CXX@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+F77 = @F77@
+FC = @FC@
+GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
+GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
+GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
+GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
+GTKSHARP_LIBS = @GTKSHARP_LIBS@
+GUISUBDIRS = @GUISUBDIRS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
+NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
+NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
+NAUTILUS_PYTHON_CFLAGS = @NAUTILUS_PYTHON_CFLAGS@
+NAUTILUS_PYTHON_DIR = @NAUTILUS_PYTHON_DIR@
+NAUTILUS_PYTHON_LIBS = @NAUTILUS_PYTHON_LIBS@
+NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
+NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+Q = @Q@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+V = @V@
+VERSION = @VERSION@
+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = ubuntu-mono-dark \
+	ubuntu-mono-light
+
+theme = hicolor
+system_themedir = $(datadir)/icons/$(theme)
+app_themedir = $(pkgdatadir)/icons/$(theme)
+system_theme_icons = \
+	apps,folder-sparkleshare-16.png \
+	apps,folder-sparkleshare-22.png	\
+	apps,folder-sparkleshare-24.png \
+	apps,folder-sparkleshare-256.png \
+	apps,folder-sparkleshare-32.png \
+	apps,folder-sparkleshare-48.png
+
+app_theme_icons = \
+	animations,process-working-22.png \
+	places,folder-sparkleshare-16.png \
+	places,folder-sparkleshare-22.png \
+	places,folder-sparkleshare-24.png \
+	places,folder-sparkleshare-256.png \
+	places,folder-sparkleshare-32.png \
+	places,folder-sparkleshare-48.png \
+	status,process-syncing-i-24.png \
+	status,process-syncing-ii-24.png \
+	status,process-syncing-iii-24.png \
+	status,process-syncing-iiii-24.png \
+	status,process-syncing-iiiii-24.png \
+	status,process-syncing-error-24.png	\
+	status,document-added-12.png \
+	status,document-edited-12.png \
+	status,document-deleted-12.png \
+	status,document-moved-12.png \
+	status,list-point-16.png
+
+install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
+	-t "$(theme)" \
+	-s "$(srcdir)" \
+	-d "x$(DESTDIR)" \
+	-m "$(mkinstalldirs)" \
+	-x "$(INSTALL_DATA)"
+
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = $(wildcard *.png *.svg)
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SparkleShare/Linux/Pixmaps/icons/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign SparkleShare/Linux/Pixmaps/icons/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive uninstall-am
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-hook
+
+
+install-data-local:
+	@-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons)
+	@-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons)
+
+uninstall-hook:
+	@-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons)
+	@-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons)
+
+# 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/data/icons/document-added-12.png b/SparkleShare/Linux/Pixmaps/icons/document-added-12.png
index b30995a..b30995a 100755
--- a/data/icons/document-added-12.png
+++ b/SparkleShare/Linux/Pixmaps/icons/document-added-12.png
diff --git a/data/icons/document-deleted-12.png b/SparkleShare/Linux/Pixmaps/icons/document-deleted-12.png
index 0e3253b..0e3253b 100755
--- a/data/icons/document-deleted-12.png
+++ b/SparkleShare/Linux/Pixmaps/icons/document-deleted-12.png
diff --git a/data/icons/document-edited-12.png b/SparkleShare/Linux/Pixmaps/icons/document-edited-12.png
index 610af6e..610af6e 100755
--- a/data/icons/document-edited-12.png
+++ b/SparkleShare/Linux/Pixmaps/icons/document-edited-12.png
diff --git a/data/icons/document-moved-12.png b/SparkleShare/Linux/Pixmaps/icons/document-moved-12.png
index d68102f..d68102f 100755
--- a/data/icons/document-moved-12.png
+++ b/SparkleShare/Linux/Pixmaps/icons/document-moved-12.png
diff --git a/data/icons/folder-sparkleshare-16.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-16.png
index 0d4905c..0d4905c 100755
--- a/data/icons/folder-sparkleshare-16.png
+++ b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-16.png
diff --git a/data/icons/folder-sparkleshare-22.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-22.png
index 89f6ad2..89f6ad2 100755
--- a/data/icons/folder-sparkleshare-22.png
+++ b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-22.png
diff --git a/data/icons/folder-sparkleshare-24.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-24.png
index a98e206..a98e206 100755
--- a/data/icons/folder-sparkleshare-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-24.png
diff --git a/data/icons/folder-sparkleshare-256.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-256.png
index 6041b5b..6041b5b 100755
--- a/data/icons/folder-sparkleshare-256.png
+++ b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-256.png
diff --git a/data/icons/folder-sparkleshare-32.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-32.png
index 8a28c73..8a28c73 100755
--- a/data/icons/folder-sparkleshare-32.png
+++ b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-32.png
diff --git a/data/icons/folder-sparkleshare-48.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-48.png
index b1976dd..b1976dd 100755
--- a/data/icons/folder-sparkleshare-48.png
+++ b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-48.png
diff --git a/data/icons/list-point-16.png b/SparkleShare/Linux/Pixmaps/icons/list-point-16.png
index 6ef8de7..6ef8de7 100755
--- a/data/icons/list-point-16.png
+++ b/SparkleShare/Linux/Pixmaps/icons/list-point-16.png
diff --git a/data/icons/process-syncing-sparkleshare-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-24.png
index 632a3e2..632a3e2 100755..100644
--- a/data/icons/process-syncing-sparkleshare-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/process-syncing-24.png
diff --git a/data/icons/sparkleshare-syncing-error-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-24.png
index f306498..f306498 100755
--- a/data/icons/sparkleshare-syncing-error-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-24.png
diff --git a/data/icons/process-syncing-sparkleshare-i-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-i-24.png
index 286e79d..286e79d 100755
--- a/data/icons/process-syncing-sparkleshare-i-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/process-syncing-i-24.png
diff --git a/data/icons/process-syncing-sparkleshare-ii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-ii-24.png
index 83dd2cf..83dd2cf 100755
--- a/data/icons/process-syncing-sparkleshare-ii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/process-syncing-ii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-iii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iii-24.png
index 6f6b9e5..6f6b9e5 100755
--- a/data/icons/process-syncing-sparkleshare-iii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-iiii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iiii-24.png
index 31f9a53..31f9a53 100755
--- a/data/icons/process-syncing-sparkleshare-iiii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iiii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-iiiii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iiiii-24.png
index a0e2476..a0e2476 100755
--- a/data/icons/process-syncing-sparkleshare-iiiii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iiiii-24.png
diff --git a/data/icons/process-working-22.png b/SparkleShare/Linux/Pixmaps/icons/process-working-22.png
index 9005de7..9005de7 100755
--- a/data/icons/process-working-22.png
+++ b/SparkleShare/Linux/Pixmaps/icons/process-working-22.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am
new file mode 100644
index 0000000..3ea62a9
--- /dev/null
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am
@@ -0,0 +1,26 @@
+dark_theme = ubuntu-mono-dark
+dark_themedir = /usr/share/icons/$(dark_theme)
+
+dark_theme_icons = \
+	status,process-syncing-i-24.png \
+	status,process-syncing-ii-24.png \
+	status,process-syncing-iii-24.png \
+	status,process-syncing-iiii-24.png \
+	status,process-syncing-iiiii-24.png \
+	status,process-syncing-error-24.png
+
+install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
+	-t "$(dark_theme)" \
+	-s "$(srcdir)" \
+	-d "x$(DESTDIR)" \
+	-m "$(mkinstalldirs)" \
+	-x "$(INSTALL_DATA)"
+
+install-data-local:
+	@-$(install_icon_exec) -i -b "$(dark_themedir)" $(dark_theme_icons)
+
+uninstall-hook:
+	@-$(install_icon_exec) -u -b "$(dark_themedir)" $(dark_theme_icons)
+
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = $(wildcard *.png *.svg)
diff --git a/data/icons/Makefile.in b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.in
index 2f3f04f..9f1256f 100644
--- a/data/icons/Makefile.in
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -31,12 +48,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = data/icons
+subdir = SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -51,10 +67,14 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -65,50 +85,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -118,8 +119,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -131,8 +130,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -149,20 +146,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -201,47 +193,18 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-theme = hicolor
-system_themedir = $(datadir)/icons/$(theme)
-app_themedir = $(pkgdatadir)/icons/$(theme)
-system_theme_icons = \
-	apps,folder-sparkleshare-16.png			\
-	apps,folder-sparkleshare-22.png			\
-	apps,folder-sparkleshare-24.png			\
-	apps,folder-sparkleshare-256.png		\
-	apps,folder-sparkleshare-32.png			\
-	apps,folder-sparkleshare-48.png			\
-	status,process-syncing-sparkleshare-i-24.png \
-	status,process-syncing-sparkleshare-ii-24.png \
-	status,process-syncing-sparkleshare-iii-24.png \
-	status,process-syncing-sparkleshare-iiii-24.png \
-	status,process-syncing-sparkleshare-iiiii-24.png
-
-app_theme_icons = \
-	animations,process-syncing-sparkleshare-24.png	\
-	animations,process-working-22.png		\
-	places,folder-sparkleshare-16.png		\
-	places,folder-sparkleshare-22.png		\
-	places,folder-sparkleshare-24.png		\
-	places,folder-sparkleshare-256.png		\
-	places,folder-sparkleshare-32.png		\
-	places,folder-sparkleshare-48.png		\
-	status,sparkleshare-syncing-error-24.png	\
-	status,avatar-default-16.png			\
-	status,avatar-default-22.png			\
-	status,avatar-default-24.png			\
-	status,avatar-default-32.png			\
-	status,avatar-default-48.png			\
-	status,document-added-12.png			\
-	status,document-edited-12.png			\
-	status,document-deleted-12.png			\
-	status,document-moved-12.png			\
-	status,dialog-error-16.png			\
-	status,list-point-16.png			\
-	status,dialog-error-24.png
+dark_theme = ubuntu-mono-dark
+dark_themedir = /usr/share/icons/$(dark_theme)
+dark_theme_icons = \
+	status,process-syncing-i-24.png \
+	status,process-syncing-ii-24.png \
+	status,process-syncing-iii-24.png \
+	status,process-syncing-iiii-24.png \
+	status,process-syncing-iiiii-24.png \
+	status,process-syncing-error-24.png
 
 install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
-	-t "$(theme)" \
+	-t "$(dark_theme)" \
 	-s "$(srcdir)" \
 	-d "x$(DESTDIR)" \
 	-m "$(mkinstalldirs)" \
@@ -261,9 +224,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/icons/Makefile
+	  $(AUTOMAKE) --foreign SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -339,10 +302,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -438,12 +406,10 @@ uninstall-am:
 
 
 install-data-local:
-	@-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons)
-	@-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons)
+	@-$(install_icon_exec) -i -b "$(dark_themedir)" $(dark_theme_icons)
 
 uninstall-hook:
-	@-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons)
-	@-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons)
+	@-$(install_icon_exec) -u -b "$(dark_themedir)" $(dark_theme_icons)
 
 # 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.
diff --git a/data/icons/sparkleshare-syncing-error-mono-light-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-error-24.png
index bf32f25..bf32f25 100644
--- a/data/icons/sparkleshare-syncing-error-mono-light-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-error-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-light-i-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-i-24.png
index 2bd345c..2bd345c 100644
--- a/data/icons/process-syncing-sparkleshare-mono-light-i-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-i-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-light-ii-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-ii-24.png
index f980edb..f980edb 100644
--- a/data/icons/process-syncing-sparkleshare-mono-light-ii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-ii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-light-iii-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-iii-24.png
index bccefce..bccefce 100644
--- a/data/icons/process-syncing-sparkleshare-mono-light-iii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-iii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-light-iiii-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-iiii-24.png
index 52c0a75..52c0a75 100644
--- a/data/icons/process-syncing-sparkleshare-mono-light-iiii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-iiii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-light-iiiii-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-iiiii-24.png
index 375f0d3..375f0d3 100644
--- a/data/icons/process-syncing-sparkleshare-mono-light-iiiii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-iiiii-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile.am b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile.am
new file mode 100644
index 0000000..aa9cf7e
--- /dev/null
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile.am
@@ -0,0 +1,26 @@
+light_theme = ubuntu-mono-light
+light_themedir = /usr/share/icons/$(light_theme)
+
+light_theme_icons = \
+	status,process-syncing-i-24.png \
+	status,process-syncing-ii-24.png \
+	status,process-syncing-iii-24.png \
+	status,process-syncing-iiii-24.png \
+	status,process-syncing-iiiii-24.png \
+	status,process-syncing-error-24.png
+
+install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
+	-t "$(light_theme)" \
+	-s "$(srcdir)" \
+	-d "x$(DESTDIR)" \
+	-m "$(mkinstalldirs)" \
+	-x "$(INSTALL_DATA)"
+
+install-data-local:
+	@-$(install_icon_exec) -i -b "$(light_themedir)" $(light_theme_icons)
+
+uninstall-hook:
+	@-$(install_icon_exec) -u -b "$(light_themedir)" $(light_theme_icons)
+
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = $(wildcard *.png *.svg)
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile.in b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile.in
new file mode 100644
index 0000000..e85cd48
--- /dev/null
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile.in
@@ -0,0 +1,416 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
+	$(top_srcdir)/build/m4/shamrock/mono.m4 \
+	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
+	$(top_srcdir)/build/m4/shamrock/programs.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/gtk-sharp.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/nautilus-python.m4 \
+	$(top_srcdir)/build/m4/sparkleshare/notify-sharp.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CXX = @CXX@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+F77 = @F77@
+FC = @FC@
+GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
+GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
+GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
+GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
+GTKSHARP_LIBS = @GTKSHARP_LIBS@
+GUISUBDIRS = @GUISUBDIRS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MKDIR_P = @MKDIR_P@
+MONO = @MONO@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
+NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
+NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
+NAUTILUS_PYTHON_CFLAGS = @NAUTILUS_PYTHON_CFLAGS@
+NAUTILUS_PYTHON_DIR = @NAUTILUS_PYTHON_DIR@
+NAUTILUS_PYTHON_LIBS = @NAUTILUS_PYTHON_LIBS@
+NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
+NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+Q = @Q@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+V = @V@
+VERSION = @VERSION@
+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+light_theme = ubuntu-mono-light
+light_themedir = /usr/share/icons/$(light_theme)
+light_theme_icons = \
+	status,process-syncing-i-24.png \
+	status,process-syncing-ii-24.png \
+	status,process-syncing-iii-24.png \
+	status,process-syncing-iiii-24.png \
+	status,process-syncing-iiiii-24.png \
+	status,process-syncing-error-24.png
+
+install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
+	-t "$(light_theme)" \
+	-s "$(srcdir)" \
+	-d "x$(DESTDIR)" \
+	-m "$(mkinstalldirs)" \
+	-x "$(INSTALL_DATA)"
+
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = $(wildcard *.png *.svg)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-strip uninstall-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-hook
+
+
+install-data-local:
+	@-$(install_icon_exec) -i -b "$(light_themedir)" $(light_theme_icons)
+
+uninstall-hook:
+	@-$(install_icon_exec) -u -b "$(light_themedir)" $(light_theme_icons)
+
+# 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/data/icons/sparkleshare-syncing-error-mono-dark-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-error-24.png
index 920b4c4..920b4c4 100644
--- a/data/icons/sparkleshare-syncing-error-mono-dark-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-error-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-i-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-i-24.png
index c938836..c938836 100644
--- a/data/icons/process-syncing-sparkleshare-mono-dark-i-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-i-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-ii-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-ii-24.png
index 380ab88..380ab88 100644
--- a/data/icons/process-syncing-sparkleshare-mono-dark-ii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-ii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-iii-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-iii-24.png
index 81934ab..81934ab 100644
--- a/data/icons/process-syncing-sparkleshare-mono-dark-iii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-iii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-iiii-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-iiii-24.png
index 9d236ff..9d236ff 100644
--- a/data/icons/process-syncing-sparkleshare-mono-dark-iiii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-iiii-24.png
diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-iiiii-24.png b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-iiiii-24.png
index 30ac179..30ac179 100644
--- a/data/icons/process-syncing-sparkleshare-mono-dark-iiiii-24.png
+++ b/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-iiiii-24.png
diff --git a/data/tutorial-slide-1.png b/SparkleShare/Linux/Pixmaps/tutorial-slide-1.png
index 7defc57..7defc57 100755
--- a/data/tutorial-slide-1.png
+++ b/SparkleShare/Linux/Pixmaps/tutorial-slide-1.png
diff --git a/data/tutorial-slide-2.png b/SparkleShare/Linux/Pixmaps/tutorial-slide-2.png
index 565b6ec..565b6ec 100755
--- a/data/tutorial-slide-2.png
+++ b/SparkleShare/Linux/Pixmaps/tutorial-slide-2.png
diff --git a/data/tutorial-slide-3.png b/SparkleShare/Linux/Pixmaps/tutorial-slide-3.png
index 05078b5..05078b5 100755
--- a/data/tutorial-slide-3.png
+++ b/SparkleShare/Linux/Pixmaps/tutorial-slide-3.png
diff --git a/SparkleShare/Linux/SparkleAbout.cs b/SparkleShare/Linux/SparkleAbout.cs
index 7bdad22..c6c1168 100755
--- a/SparkleShare/Linux/SparkleAbout.cs
+++ b/SparkleShare/Linux/SparkleAbout.cs
@@ -137,7 +137,7 @@ namespace SparkleShare {
                 LineWrap     = true,
                 LineWrapMode = Pango.WrapMode.Word,
                 Markup       = "<span font_size='small' fgcolor='white'>" +
-                               "SparkleShare is Free and Open Source Software. You are free to use, modify, " +
+                               "SparkleShare Open Source software. You are free to use, modify, " +
                                "and redistribute it under the GNU General Public License version 3 or later." +
                                "</span>",
                 WidthRequest = 330,
diff --git a/SparkleShare/Linux/SparkleController.cs b/SparkleShare/Linux/SparkleController.cs
index be4814d..9e13b5d 100755
--- a/SparkleShare/Linux/SparkleController.cs
+++ b/SparkleShare/Linux/SparkleController.cs
@@ -204,22 +204,17 @@ namespace SparkleShare {
         }
 
             
-        public override void OpenSparkleShareFolder (string subfolder)
+        public override void OpenFolder (string path)
         {
-            string folder = Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, subfolder);
-
-            Process process = new Process ();
-            process.StartInfo.FileName  = "xdg-open";
-            process.StartInfo.Arguments = "\"" + folder + "\"";
-            process.Start ();
+            OpenFile (path);
         }
 
 
-        public override void OpenFile (string url)
+        public override void OpenFile (string path)
         {
             Process process = new Process ();
             process.StartInfo.FileName = "xdg-open";
-            process.StartInfo.Arguments = "\"" + url + "\"";
+            process.StartInfo.Arguments = "\"" + path + "\"";
             process.Start ();
         }
     }
diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs
index 12c76e5..f8b83e1 100755
--- a/SparkleShare/Linux/SparkleEventLog.cs
+++ b/SparkleShare/Linux/SparkleEventLog.cs
@@ -40,7 +40,6 @@ namespace SparkleShare {
         private ScrolledWindow scrolled_window;
         private WebView web_view;
         private SparkleSpinner spinner;
-        private string link_status;
 
 
         // Short alias for the translations
@@ -52,8 +51,12 @@ namespace SparkleShare {
 
         public SparkleEventLog () : base ("")
         {
-            SetSizeRequest (480, 640);
-            SetPosition (WindowPosition.Center);
+            SetSizeRequest (480, (int) (Gdk.Screen.Default.Height * 0.8));
+
+            int x = (int) (Gdk.Screen.Default.Width * 0.61);
+            int y = (int) (Gdk.Screen.Default.Height * 0.5 - (HeightRequest * 0.5));
+            
+            Move (x, y);
 
             Resizable   = true;
             BorderWidth = 0;
@@ -65,6 +68,15 @@ namespace SparkleShare {
                 Controller.WindowClosed ();
                 args.RetVal = true;
             };
+            
+            KeyPressEvent += delegate (object o, KeyPressEventArgs args) {
+                if (args.Event.Key == Gdk.Key.Escape ||
+                    (args.Event.State == Gdk.ModifierType.ControlMask) &&
+                     args.Event.Key == Gdk.Key.w) {
+                    
+                    Controller.WindowClosed ();
+                }
+            };
 
             this.size_label = new Label () {
                 Markup = "<b>Size:</b> …",
@@ -85,22 +97,17 @@ namespace SparkleShare {
             this.content_wrapper = new EventBox ();
             this.scrolled_window = new ScrolledWindow ();
 
+            Gdk.Color white = new Gdk.Color();
+            Gdk.Color.Parse ("white", ref white);
+
+            this.content_wrapper.ModifyBg (StateType.Normal, white);
+
             this.web_view = new WebView () {
                 Editable = false
             };
 
-            this.web_view.HoveringOverLink += delegate (object o, WebKit.HoveringOverLinkArgs args) {
-                this.link_status = args.Link;
-            };
 
-            this.web_view.NavigationRequested += delegate (object o, WebKit.NavigationRequestedArgs args) {
-                if (args.Request.Uri == this.link_status)
-                    Controller.LinkClicked (args.Request.Uri);
-
-                // Don't follow HREFs (as this would cause a page refresh)
-                if (!args.Request.Uri.Equals ("file:"))
-                    args.RetVal = 1;
-            };
+            this.web_view.NavigationRequested += WebViewNavigationRequested;
 
             this.scrolled_window.Add (this.web_view);
             this.content_wrapper.Add (this.spinner);
@@ -111,18 +118,16 @@ namespace SparkleShare {
             this.layout_horizontal.PackStart (layout_sizes, true, true, 12);
 
             layout_vertical.PackStart (this.layout_horizontal, false, false, 0);
-            layout_vertical.PackStart (CreateShortcutsBar (), false, false, 0);
             layout_vertical.PackStart (this.content_wrapper, true, true, 0);
 
             Add (layout_vertical);
 
 
-            // Hook up the controller events
             Controller.HideWindowEvent += delegate {
                 Application.Invoke (delegate {
                     HideAll ();
-					
-					if (this.content_wrapper.Child != null)
+                    
+                    if (this.content_wrapper.Child != null)
                         this.content_wrapper.Remove (this.content_wrapper.Child);
                 });
             };
@@ -131,9 +136,6 @@ namespace SparkleShare {
                 Application.Invoke (delegate {
                     ShowAll ();
                     Present ();
-
-                    UpdateChooser (null);
-                    UpdateContent (null);
                 });
             };
 
@@ -170,6 +172,15 @@ namespace SparkleShare {
                 });
             };
         }
+        
+        
+        private void WebViewNavigationRequested (object o, WebKit.NavigationRequestedArgs args) {
+            Controller.LinkClicked (args.Request.Uri.Substring (7));
+
+            // Don't follow HREFs (as this would cause a page refresh)
+            if (!args.Request.Uri.Equals ("file:"))
+                args.RetVal = 1;
+        }
 
 
         public void UpdateChooser (string [] folders)
@@ -191,21 +202,21 @@ namespace SparkleShare {
 
             ListStore store = new ListStore (typeof (string));
 
-            store.AppendValues (_("All Projects"));
+            store.AppendValues (_("Summary"));
             store.AppendValues ("---");
-			
-			this.combo_box.Model  = store;
-			this.combo_box.Active = 0;
-			
-			int row = 2;
-       		foreach (string folder in folders) {
-				store.AppendValues (folder);
-				
-				if (folder.Equals (Controller.SelectedFolder))
-					this.combo_box.Active = row;
-				
-				row++;
-        	}
+            
+            this.combo_box.Model  = store;
+            this.combo_box.Active = 0;
+            
+            int row = 2;
+               foreach (string folder in folders) {
+                store.AppendValues (folder);
+                
+                if (folder.Equals (Controller.SelectedFolder))
+                    this.combo_box.Active = row;
+                
+                row++;
+            }
 
             this.combo_box.RowSeparatorFunc = delegate (TreeModel model, TreeIter iter) {
                 string item = (string) this.combo_box.Model.GetValue (iter, 0);
@@ -241,10 +252,10 @@ namespace SparkleShare {
 
                 if (html == null)
                     return;
-				
-				string pixmaps_path = IO.Path.Combine (SparkleUI.AssetsPath, "pixmaps");
-				string icons_path  = new string [] {SparkleUI.AssetsPath, "icons",
-                	"hicolor", "12x12", "status"}.Combine ();
+                
+                string pixmaps_path = IO.Path.Combine (SparkleUI.AssetsPath, "pixmaps");
+                string icons_path  = new string [] {SparkleUI.AssetsPath, "icons",
+                    "hicolor", "12x12", "status"}.Combine ();
 
                 html = html.Replace ("<!-- $body-font-size -->", (double) (Style.FontDescription.Size / 1024 + 3) + "px");
                 html = html.Replace ("<!-- $day-entry-header-font-size -->", (Style.FontDescription.Size / 1024 + 3) + "px");
@@ -257,24 +268,26 @@ namespace SparkleShare {
                 html = html.Replace ("<!-- $secondary-font-color -->", SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive)));
                 html = html.Replace ("<!-- $small-color -->", SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive)));
              
-				html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path);
+                html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path);
+                
+                html = html.Replace ("<!-- $document-added-background-image -->", 
+                    "file://" + IO.Path.Combine (icons_path, "document-added.png"));
+
+                html = html.Replace ("<!-- $document-edited-background-image -->", 
+                    "file://" + IO.Path.Combine (icons_path, "document-edited.png"));
                 
-				html = html.Replace ("<!-- $document-added-background-image -->", 
-					"file://" + IO.Path.Combine (icons_path + "document-added.png"));
-				
-				html = html.Replace ("<!-- $document-edited-background-image -->", 
-					"file://" + IO.Path.Combine (icons_path + "document-edited.png"));
-				
-				html = html.Replace ("<!-- $document-deleted-background-image -->", 
-					"file://" + IO.Path.Combine (icons_path + "document-deleted.png"));
-				
-				html = html.Replace ("<!-- $document-moved-background-image -->", 
-					"file://" + IO.Path.Combine (icons_path + "document-moved.png"));
+                html = html.Replace ("<!-- $document-deleted-background-image -->", 
+                    "file://" + IO.Path.Combine (icons_path, "document-deleted.png"));
+                
+                html = html.Replace ("<!-- $document-moved-background-image -->", 
+                    "file://" + IO.Path.Combine (icons_path, "document-moved.png"));
                         
                 
                 Application.Invoke (delegate {
                     this.spinner.Stop ();
-                    this.web_view.LoadString (html, null, null, "file://");
+                                this.web_view.NavigationRequested -= WebViewNavigationRequested;
+                    this.web_view.LoadHtmlString (html, "file://");
+                                this.web_view.NavigationRequested += WebViewNavigationRequested;
                     this.content_wrapper.Remove (this.content_wrapper.Child);
                     this.content_wrapper.Add (this.scrolled_window);
                     this.content_wrapper.ShowAll ();
@@ -283,49 +296,5 @@ namespace SparkleShare {
 
             thread.Start ();
         }
-
-
-        private MenuBar CreateShortcutsBar ()
-        {
-            // Adds a hidden menubar that contains to enable keyboard
-            // shortcuts to close the log
-            MenuBar menu_bar = new MenuBar ();
-
-                MenuItem file_item = new MenuItem ("File");
-
-                    Menu file_menu = new Menu ();
-
-                        MenuItem close_1 = new MenuItem ("Close1");
-                        MenuItem close_2 = new MenuItem ("Close2");
-        
-                        // adds specific Ctrl+W and Esc key accelerators to Log Window
-                        AccelGroup accel_group = new AccelGroup ();
-                        AddAccelGroup (accel_group);
-
-                        // Close on Esc
-                        close_1.AddAccelerator ("activate", accel_group, new AccelKey (Gdk.Key.W,
-                            Gdk.ModifierType.ControlMask, AccelFlags.Visible));
-
-                        close_1.Activated += delegate { Controller.WindowClosed (); };
-
-                        // Close on Ctrl+W
-                        close_2.AddAccelerator ("activate", accel_group, new AccelKey (Gdk.Key.Escape,
-                            Gdk.ModifierType.None, AccelFlags.Visible));
-                        close_2.Activated += delegate { Controller.WindowClosed (); };
-
-                    file_menu.Append (close_1);
-                    file_menu.Append (close_2);
-
-                file_item.Submenu = file_menu;
-
-            menu_bar.Append (file_item);
-
-            // Hacky way to hide the menubar, but the accellerators
-            // will simply be disabled when using Hide ()
-            menu_bar.HeightRequest = 1;
-            menu_bar.ModifyBg (StateType.Normal, Style.Background (StateType.Normal));
-
-            return menu_bar;
-        }
     }
 }
diff --git a/SparkleShare/Linux/SparkleSetup.cs b/SparkleShare/Linux/SparkleSetup.cs
index 2cab295..695e8a3 100755
--- a/SparkleShare/Linux/SparkleSetup.cs
+++ b/SparkleShare/Linux/SparkleSetup.cs
@@ -64,9 +64,7 @@ namespace SparkleShare {
                     case PageType.Setup: {
 
                         Header = _("Welcome to SparkleShare!");
-                        Description  = "Before we get started, what's your name and email? " +
-                            "Don't worry, this information will only visible to your team members.";
-
+                        Description  = "First off, what's your name and email?\nThis information is only visible to team members.";
 
                         Table table = new Table (2, 3, true) {
                             RowSpacing    = 6,
@@ -79,11 +77,13 @@ namespace SparkleShare {
                             };
 
                             Entry name_entry = new Entry (Controller.GuessedUserName) {
-                                Xalign = 0
+                                Xalign = 0,
+                                ActivatesDefault = true
                             };
 
                             Entry email_entry = new Entry (Controller.GuessedUserEmail) {
-                                Xalign = 0
+                                Xalign = 0,
+                                ActivatesDefault = true
                             };
                             
                             name_entry.Changed += delegate {
@@ -106,13 +106,13 @@ namespace SparkleShare {
                         
                         VBox wrapper = new VBox (false, 9);
                         wrapper.PackStart (table, true, false, 0);
-						
-							Button cancel_button = new Button (_("Cancel"));
+                        
+                            Button cancel_button = new Button (_("Cancel"));
 
                             cancel_button.Clicked += delegate {
                                 Controller.SetupPageCancelled ();
                             };
-						
+                        
                             Button continue_button = new Button (_("Continue")) {
                                 Sensitive = false
                             };
@@ -123,7 +123,7 @@ namespace SparkleShare {
 
                                 Controller.SetupPageCompleted (full_name, email);
                             };
-						
+                        
                         AddButton (cancel_button);
                         AddButton (continue_button);
                         Add (wrapper);
@@ -180,15 +180,17 @@ namespace SparkleShare {
                         tree.AppendColumn (service_column);
 
                         Entry address_entry = new Entry () {
-							Text = Controller.PreviousAddress,
-							Sensitive = (Controller.SelectedPlugin.Address == null)
-						};
-						
+                            Text = Controller.PreviousAddress,
+                            Sensitive = (Controller.SelectedPlugin.Address == null),
+                            ActivatesDefault = true
+                        };
+                        
                         Entry path_entry = new Entry () {
-			         	    Text = Controller.PreviousPath,
-							Sensitive = (Controller.SelectedPlugin.Path == null)
-						};
-						
+                            Text = Controller.PreviousPath,
+                            Sensitive = (Controller.SelectedPlugin.Path == null),
+                            ActivatesDefault = true
+                        };
+                        
                         Label address_example = new Label () {
                             Xalign = 0,
                             UseMarkup = true,
@@ -216,8 +218,8 @@ namespace SparkleShare {
                             Application.Invoke (delegate {
                                 address_entry.Text      = text;
                                 address_entry.Sensitive = (state == FieldState.Enabled);
-                                address_example.Markup  =  "<span size=\"small\" fgcolor=\""
-                                    + SecondaryTextColor + "\">" + example_text + "</span>";
+                                address_example.Markup  =  "<span size=\"small\" fgcolor=\"" +
+                                    SecondaryTextColor + "\">" + example_text + "</span>";
                             });
                         };
 
@@ -233,7 +235,7 @@ namespace SparkleShare {
                         };
 
                         Controller.CheckAddPage (address_entry.Text, path_entry.Text, 1);
-
+                        
                         // Update the address field text when the selection changes
                         tree.CursorChanged += delegate (object sender, EventArgs e) {
                             Controller.SelectedPluginChanged (tree.SelectedRow);
@@ -313,7 +315,9 @@ namespace SparkleShare {
                                 Controller.PageCancelled ();
                             };
 
-                            Button add_button = new Button (_("Add"));
+                            Button add_button = new Button (_("Add")) {
+                                Sensitive = false
+                            };
 
                             add_button.Clicked += delegate {
                                 string server         = address_entry.Text;
@@ -327,11 +331,21 @@ namespace SparkleShare {
                                 add_button.Sensitive = button_enabled;                            
                             });
                         };
+                        
 
-                        AddButton (cancel_button);
-                        AddButton (add_button);
+                        CheckButton check_button = new CheckButton ("Fetch prior history") {
+                            Active = false
+                        };
 
+                        check_button.Toggled += delegate {
+                            Controller.HistoryItemChanged (check_button.Active);
+                        };
 
+                        AddOption (check_button);
+                        AddButton (cancel_button);
+                        AddButton (add_button);
+                        
+                        Controller.CheckAddPage (address_entry.Text, path_entry.Text, 1);
 
                         break;
                     }
@@ -395,8 +409,9 @@ namespace SparkleShare {
                     case PageType.Syncing: {
 
                         Header      = String.Format (_("Adding project ‘{0}’…"), Controller.SyncingFolder);
-                        Description = _("This may take a while.") + Environment.NewLine +
-                                      _("Are you sure it’s not coffee o'clock?");
+                        Description = _("This may either take a short or a long time depending on the project's size.");
+
+                        this.progress_bar.Fraction = Controller.ProgressBarPercentage / 100;
 
                         Button finish_button = new Button () {
                             Sensitive = false,
@@ -423,8 +438,8 @@ namespace SparkleShare {
                         if (this.progress_bar.Parent != null)
                            (this.progress_bar.Parent as Container).Remove (this.progress_bar);
 
-                        VBox bar_wrapper = new VBox (false , 0);
-                        bar_wrapper.PackStart (this.progress_bar, false, false, 0);
+                        VBox bar_wrapper = new VBox (false, 0);
+                        bar_wrapper.PackStart (this.progress_bar, false, false, 15);
 
                         Add (bar_wrapper);
 
@@ -432,60 +447,65 @@ namespace SparkleShare {
                     }
 
                     case PageType.Error: {
+                    
+                        Header = _("Oops! Something went wrong") + "…";
 
-                        Header      = _("Something went wrong") + "…";
-
-						VBox points = new VBox (false, 0);
-						Image list_point_one   = new Image (SparkleUIHelpers.GetIcon ("list-point", 16)) {  };
-						Image list_point_two   = new Image (SparkleUIHelpers.GetIcon ("list-point", 16)) {  };
-						Image list_point_three = new Image (SparkleUIHelpers.GetIcon ("list-point", 16)) {  };
+                        VBox points = new VBox (false, 0);
+                        Image list_point_one   = new Image (SparkleUIHelpers.GetIcon ("go-next", 16));
+                        Image list_point_two   = new Image (SparkleUIHelpers.GetIcon ("go-next", 16));
+                        Image list_point_three = new Image (SparkleUIHelpers.GetIcon ("go-next", 16));
 
                         Label label_one = new Label () {
-                            Text   = "Is the host online?",
-                            Wrap   = true,
-                            Xalign = 0
-                        };
-
-                        Label label_two = new Label () {
                             Markup = "<b>" + Controller.PreviousUrl + "</b> is the address we've compiled. " +
-                                     "Does this look alright?",
+                            "Does this look alright?",
                             Wrap   = true,
                             Xalign = 0
                         };
 
-                        Label label_three = new Label () {
-                            Text   = "The host needs to know who you are. Did you upload the key that's in " +
-                                     "your SparkleShare folder?",
+                        Label label_two = new Label () {
+                            Text   = "Do you have access rights to this remote project?",
                             Wrap   = true,
                             Xalign = 0
                         };
-
-						
+                        
                         points.PackStart (new Label ("Please check the following:") { Xalign = 0 }, false, false, 6);
 
                         HBox point_one = new HBox (false, 0);
-						point_one.PackStart (list_point_one, false, false, 0);
-						point_one.PackStart (label_one, true, true, 12);
-						points.PackStart (point_one, false, false, 12);
-						
-						HBox point_two = new HBox (false, 0);
-						point_two.PackStart (list_point_two, false, false, 0);
-						point_two.PackStart (label_two, true, true, 12);
-						points.PackStart (point_two, false, false, 12);
-                          
-                        HBox point_three = new HBox (false, 0);
-						point_three.PackStart (list_point_three, false, false, 0);
-						point_three.PackStart (label_three, true, true, 12);
-						points.PackStart (point_three, false, false, 12);
+                        point_one.PackStart (list_point_one, false, false, 0);
+                        point_one.PackStart (label_one, true, true, 12);
+                        points.PackStart (point_one, false, false, 12);
+                        
+                        HBox point_two = new HBox (false, 0);
+                        point_two.PackStart (list_point_two, false, false, 0);
+                        point_two.PackStart (label_two, true, true, 12);
+                        points.PackStart (point_two, false, false, 12);
+
+                        if (warnings.Length > 0) {
+                            string warnings_markup = "";
+
+                            foreach (string warning in warnings)
+                                warnings_markup += "\n<b>" + warning + "</b>";
+
+                            Label label_three = new Label () {
+                                Markup = "Here's the raw error message:" + warnings_markup,
+                                Wrap   = true,
+                                Xalign = 0
+                            };
+
+                            HBox point_three = new HBox (false, 0);
+                            point_three.PackStart (list_point_three, false, false, 0);
+                            point_three.PackStart (label_three, true, true, 12);
+                            points.PackStart (point_three, false, false, 12);
+                        }
 
                         points.PackStart (new Label (""), true, true, 0);
 
-						Button cancel_button = new Button (_("Cancel"));
+                        Button cancel_button = new Button (_("Cancel"));
 
                             cancel_button.Clicked += delegate {
                                 Controller.PageCancelled ();
                             };
-						
+                        
                         Button try_again_button = new Button (_("Try Again…")) {
                             Sensitive = true
                         };
@@ -493,31 +513,197 @@ namespace SparkleShare {
                         try_again_button.Clicked += delegate {
                             Controller.ErrorPageCompleted ();
                         };
-						
-						AddButton (cancel_button);
+                        
+                        AddButton (cancel_button);
                         AddButton (try_again_button);
                         Add (points);
 
                         break;
                     }
+    
+                    case PageType.CryptoSetup: {
 
+                        Header       = "Set up file encryption";
+                        Description  = "This project is supposed to be encrypted, but it doesn't yet have a password set. Please provide one below.";
+                        
+                        Label password_label = new Label ("<b>" + _("Password:") + "</b>") {
+                            UseMarkup = true,
+                            Xalign    = 1
+                        };
+
+                        Entry password_entry = new Entry () {
+                            Xalign = 0,
+                            Visibility = false,
+                            ActivatesDefault = true
+                        };
+                        
+                        CheckButton show_password_check_button = new CheckButton ("Show password") {
+                            Active = false,
+                            Xalign = 0,
+                        };
+                        
+                        show_password_check_button.Toggled += delegate {
+                            password_entry.Visibility = !password_entry.Visibility;
+                        };
+
+                        password_entry.Changed += delegate {
+                            Controller.CheckCryptoSetupPage (password_entry.Text);
+                        };
+                         
+
+                        Button continue_button = new Button ("Continue") {
+                            Sensitive = false
+                        };
+
+                        continue_button.Clicked += delegate {
+                           Controller.CryptoSetupPageCompleted (password_entry.Text);
+                        };
+
+                        Button cancel_button = new Button ("Cancel");
+
+                        cancel_button.Clicked += delegate {
+                            Controller.CryptoPageCancelled ();
+                        };
+
+                        Controller.UpdateCryptoSetupContinueButtonEvent += delegate (bool button_enabled) {
+                            Application.Invoke (delegate {
+                                continue_button.Sensitive = button_enabled;
+                            });
+                        };
+                        
+                        
+                        Table table = new Table (2, 3, true) {
+                            RowSpacing    = 6,
+                            ColumnSpacing = 6
+                        };
+
+
+                        table.Attach (password_label, 0, 1, 0, 1);
+                        table.Attach (password_entry, 1, 2, 0, 1);
+                        
+                        table.Attach (show_password_check_button, 1, 2, 1, 2);
+                        
+                        VBox wrapper = new VBox (false, 9);
+                        wrapper.PackStart (table, true, false, 0);
+
+                        
+                        Image warning_image = new Image (
+                            SparkleUIHelpers.GetIcon ("dialog-information", 24)
+                        );
+
+                        Label warning_label = new Label () {
+                            Xalign = 0,
+                            Wrap   = true,
+                            Text   = "This password can't be changed later, and your files can't be recovered if it's forgotten."
+                        };
+
+                        HBox warning_layout = new HBox (false, 0);
+                        warning_layout.PackStart (warning_image, false, false, 15);
+                        warning_layout.PackStart (warning_label, true, true, 0);
+                        
+                        VBox warning_wrapper = new VBox (false, 0);
+                        warning_wrapper.PackStart (warning_layout, false, false, 15);
+
+                        wrapper.PackStart (warning_wrapper, false, false, 0);
+                    
+                        
+                        Add (wrapper);
+
+
+
+                        AddButton (cancel_button);
+                        AddButton (continue_button);
+
+                        break;
+                    }
+
+                    case PageType.CryptoPassword: {
+
+                        Header       = "This project contains encrypted files";
+                        Description  = "Please enter the password to see their contents.";
+                        
+                        Label password_label = new Label ("<b>" + _("Password:") + "</b>") {
+                            UseMarkup = true,
+                            Xalign    = 1
+                        };
+
+                        Entry password_entry = new Entry () {
+                            Xalign = 0,
+                            Visibility = false,
+                            ActivatesDefault = true
+                        };
+                        
+                        CheckButton show_password_check_button = new CheckButton ("Show password") {
+                            Active = false,
+                            Xalign = 0
+                        };
+                        
+                        show_password_check_button.Toggled += delegate {
+                            password_entry.Visibility = !password_entry.Visibility;
+                        };
+
+                        password_entry.Changed += delegate {
+                            Controller.CheckCryptoPasswordPage (password_entry.Text);
+                        };
+                         
+
+                        Button continue_button = new Button ("Continue") {
+                            Sensitive = false
+                        };
+
+                        continue_button.Clicked += delegate {
+                           Controller.CryptoPasswordPageCompleted (password_entry.Text);
+                        };
+
+                        Button cancel_button = new Button ("Cancel");
+
+                        cancel_button.Clicked += delegate {
+                            Controller.CryptoPageCancelled ();
+                        };
+
+                        Controller.UpdateCryptoPasswordContinueButtonEvent += delegate (bool button_enabled) {
+                            Application.Invoke (delegate {
+                                continue_button.Sensitive = button_enabled;
+                            });
+                        };
+                        
+                        Table table = new Table (2, 3, true) {
+                            RowSpacing    = 6,
+                            ColumnSpacing = 6
+                        };
+
+                        table.Attach (password_label, 0, 1, 0, 1);
+                        table.Attach (password_entry, 1, 2, 0, 1);
+                        
+                        table.Attach (show_password_check_button, 1, 2, 1, 2);
+                        
+                        VBox wrapper = new VBox (false, 9);
+                        wrapper.PackStart (table, true, false, 0);
+
+                        Add (wrapper);
+
+                        AddButton (cancel_button);
+                        AddButton (continue_button);
+
+                        break;
+                    }
+                        
                     case PageType.Finished: {
 
                         UrgencyHint = true;
 
                         if (!HasToplevelFocus) {
-                            string title   = _("Project successfully added!");
-                            string subtext = "";
+                            string title   = _("Your shared project is ready!");
+                            string subtext = _("You can find the files in your SparkleShare folder.");
 
                             SparkleUI.Bubbles.Controller.ShowBubble (title, subtext, null);
                         }
 
-                        Header      = _("Project ‘" + System.IO.Path.GetFileName (Controller.PreviousPath) +
-                                        "’ successfully added!");
-                        Description = _("Access the files from your SparkleShare folder.");
+                        Header      = _("Your shared project is ready!");
+                        Description = _("You can find it in your SparkleShare folder");
 
                         // A button that opens the synced folder
-                        Button open_folder_button = new Button (_("Open Folder"));
+                        Button open_folder_button = new Button (string.Format ("Open {0}", System.IO.Path.GetFileName (Controller.PreviousPath)));
 
                         open_folder_button.Clicked += delegate {
                             Controller.OpenFolderClicked ();
@@ -530,9 +716,9 @@ namespace SparkleShare {
                         };
 
 
-                        if (warnings != null) {
+                        if (warnings.Length > 0) {
                             Image warning_image = new Image (
-                                SparkleUIHelpers.GetIcon ("dialog-warning", 24)
+                                SparkleUIHelpers.GetIcon ("dialog-information", 24)
                             );
 
                             Label warning_label = new Label (warnings [0]) {
@@ -541,8 +727,8 @@ namespace SparkleShare {
                             };
 
                             HBox warning_layout = new HBox (false, 0);
-                            warning_layout.PackStart (warning_image, false, false, 0);
-                            warning_layout.PackStart (warning_label, true, true, 15);
+                            warning_layout.PackStart (warning_image, false, false, 15);
+                            warning_layout.PackStart (warning_label, true, true, 0);
                             
                             VBox warning_wrapper = new VBox (false, 0);
                             warning_wrapper.PackStart (warning_layout, false, false, 0);
@@ -663,17 +849,21 @@ namespace SparkleShare {
             };
         }
 
-
+    
         private void RenderServiceColumn (TreeViewColumn column, CellRenderer cell,
             TreeModel model, TreeIter iter)
         {
             string markup           = (string) model.GetValue (iter, 1);
             TreeSelection selection = (column.TreeView as TreeView).Selection;
 
-            if (selection.IterIsSelected (iter))
-                markup = markup.Replace (SecondaryTextColor, SecondaryTextColorSelected);
-            else
+            if (selection.IterIsSelected (iter)) {
+                if (column.TreeView.HasFocus)
+                    markup = markup.Replace (SecondaryTextColor, SecondaryTextColorSelected);
+                else
+                    markup = markup.Replace (SecondaryTextColorSelected, SecondaryTextColor);
+            } else {
                 markup = markup.Replace (SecondaryTextColorSelected, SecondaryTextColor);
+            }
 
             (cell as CellRendererText).Markup = markup;
         }
diff --git a/SparkleShare/Linux/SparkleSetupWindow.cs b/SparkleShare/Linux/SparkleSetupWindow.cs
index a8eb506..583e24f 100755
--- a/SparkleShare/Linux/SparkleSetupWindow.cs
+++ b/SparkleShare/Linux/SparkleSetupWindow.cs
@@ -34,11 +34,10 @@ namespace SparkleShare {
         private VBox VBox;
         private VBox Wrapper;
         private VBox OptionArea;
-        private HButtonBox Buttons;
+        private HBox Buttons;
 
         public string Header;
         public string Description;
-        
         public string SecondaryTextColor;
         public string SecondaryTextColorSelected;
 
@@ -108,11 +107,12 @@ namespace SparkleShare {
         }
 
 
-        private HButtonBox CreateButtonBox ()
+        private HBox CreateButtonBox ()
         {
-            return new HButtonBox () {
+            return new HBox () {
                 BorderWidth = 0,
-                Layout      = ButtonBoxStyle.End,
+                //Layout      = ButtonBoxStyle.End,
+                Homogeneous = false,
                 Spacing     = 6
             };
         }
@@ -120,15 +120,14 @@ namespace SparkleShare {
 
         public void AddButton (Button button)
         {
+            (button.Child as Label).Xpad = 15;
             Buttons.Add (button);
-            ShowAll ();
         }
 
 
         public void AddOption (Widget widget)
-        {
+        {            
             OptionArea.Add (widget);
-            ShowAll ();
         }
 
 
@@ -140,15 +139,16 @@ namespace SparkleShare {
             };
 
             VBox layout_vertical = new VBox (false, 0);
-            layout_vertical.PackStart (new Label (""), false, false, 0);
+            layout_vertical.PackStart (new Label (""), false, false, 6);
             layout_vertical.PackStart (header, false, false, 0);
 
             if (!string.IsNullOrEmpty (Description)) {
                 Label description = new Label (Description) {
                     Xalign = 0,
-                    Wrap   = true
+                    LineWrap = true,
+                    LineWrapMode = Pango.WrapMode.WordChar
                 };
-
+                
                 layout_vertical.PackStart (description, false, false, 21);
             }
 
@@ -159,12 +159,15 @@ namespace SparkleShare {
             ShowAll ();
         }
 
-
+    
         public void Reset ()
         {
             Header      = "";
             Description = "";
 
+            if (OptionArea.Children.Length > 0)
+                OptionArea.Remove (OptionArea.Children [0]);
+
             if (Wrapper.Children.Length > 0)
                 Wrapper.Remove (Wrapper.Children [0]);
 
@@ -177,6 +180,13 @@ namespace SparkleShare {
         
         new public void ShowAll ()
         {
+            if (Buttons.Children.Length > 0) {
+                Button default_button = (Button) Buttons.Children [Buttons.Children.Length - 1];
+            
+                default_button.CanDefault = true;
+                Default = default_button;
+            }
+        
             Present ();
             base.ShowAll ();
         }
diff --git a/SparkleShare/Linux/SparkleStatusIcon.cs b/SparkleShare/Linux/SparkleStatusIcon.cs
index 15bd327..dc71709 100644
--- a/SparkleShare/Linux/SparkleStatusIcon.cs
+++ b/SparkleShare/Linux/SparkleStatusIcon.cs
@@ -16,8 +16,6 @@
 
 
 using System;
-using System.IO;
-using System.Timers;
 
 #if HAVE_APP_INDICATOR
 using AppIndicator;
@@ -27,18 +25,16 @@ using Mono.Unix;
 
 namespace SparkleShare {
 
-    // The statusicon that stays in the
-    // user's notification area
     public class SparkleStatusIcon {
 
         public SparkleStatusIconController Controller = new SparkleStatusIconController ();
 
-        private Timer animation;
         private Gdk.Pixbuf [] animation_frames;
-        private int frame_number;
-        private string state_text;
+
         private Menu menu;
+        private MenuItem recent_events_item;
         private MenuItem quit_item;
+        private MenuItem state_item;
 
         #if HAVE_APP_INDICATOR
         private ApplicationIndicator indicator;
@@ -46,6 +42,7 @@ namespace SparkleShare {
         private StatusIcon status_icon;
         #endif
         
+
         // Short alias for the translations
         public static string _ (string s)
         {
@@ -56,160 +53,92 @@ namespace SparkleShare {
         public SparkleStatusIcon ()
         {
             CreateAnimationFrames ();
-            CreateAnimation ();
 
             #if HAVE_APP_INDICATOR
             this.indicator = new ApplicationIndicator ("sparkleshare",
-                "process-syncing-sparkleshare-i", Category.ApplicationStatus) {
+                "process-syncing-i", Category.ApplicationStatus);
 
-                Status = Status.Attention
-            };
+            this.indicator.Status = Status.Active;
             #else
-            this.status_icon = new StatusIcon ();
+            this.status_icon        = new StatusIcon ();
+            this.status_icon.Pixbuf = this.animation_frames [0];
 
-            this.status_icon.Activate += ShowMenu; // Primary mouse button click
+            this.status_icon.Activate  += ShowMenu; // Primary mouse button click
             this.status_icon.PopupMenu += ShowMenu; // Secondary mouse button click
-            this.status_icon.Pixbuf = this.animation_frames [0];
             #endif
 
-            if (Controller.Folders.Length == 0)
-                this.state_text = _("Welcome to SparkleShare!");
-            else
-                this.state_text = _("Files up to date") + Controller.FolderSize;
-
             CreateMenu ();
 
 
-            Controller.UpdateQuitItemEvent += delegate (bool quit_item_enabled) {
-                Application.Invoke (delegate {
-                    if (this.quit_item != null) {
-                        this.quit_item.Sensitive = quit_item_enabled;
-                        this.menu.ShowAll ();
-                    }
-                });
-            };
-
-            Controller.UpdateMenuEvent += delegate (IconState state) {
+            Controller.UpdateIconEvent += delegate (int icon_frame) {
                 Application.Invoke (delegate {
-                    switch (state) {
-                    case IconState.Idle:
-
-                        this.animation.Stop ();
+                    if (icon_frame > -1) {
+                        #if HAVE_APP_INDICATOR
+                        string icon_name = "process-syncing-";
+                        for (int i = 0; i <= icon_frame; i++)
+                            icon_name += "i";
 
-                        if (Controller.Folders.Length == 0)
-                            this.state_text = _("Welcome to SparkleShare!");
-                        else
-                            this.state_text = _("Files up to date") + Controller.FolderSize;
+                        this.indicator.IconName = icon_name;
 
-                        #if HAVE_APP_INDICATOR
-                        this.indicator.IconName = "process-syncing-sparkleshare-i";
+                        // Force update of the icon
+                        this.indicator.Status = Status.Attention;
+                        this.indicator.Status = Status.Active;
                         #else
-                        this.status_icon.Pixbuf = this.animation_frames [0];
+                        this.status_icon.Pixbuf = this.animation_frames [icon_frame];
                         #endif
 
-                        UpdateStateText ();
-                        CreateMenu ();
-
-                        break;
-
-                    default:
-						string state_text;
-						
-							if (state == IconState.SyncingUp)
-								state_text = _("Sending files…");
-							else if (state == IconState.SyncingDown)
-								state_text = _("Receiving files…");
-							else
-								state_text = _("Syncing…");
-
-                        this.state_text = state_text +
-                                    Controller.ProgressPercentage + "%  " +
-                                    Controller.ProgressSpeed;
-
-                        UpdateStateText ();
-
-                        if (!this.animation.Enabled)
-                            this.animation.Start ();
-
-                        break;
-
-                    case IconState.Error:
-
-                        this.animation.Stop ();
-
-                        this.state_text = _("Not everything is synced");
-                        UpdateStateText ();
-                        CreateMenu ();
-
+                    } else {
                         #if HAVE_APP_INDICATOR
-                        this.indicator.IconName = "sparkleshare-syncing-error";
+                        this.indicator.IconName = "process-syncing-error";
+
+                        // Force update of the icon
+                        this.indicator.Status = Status.Attention;
+                        this.indicator.Status = Status.Active;
                         #else
-                        this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon ("sparkleshare-syncing-error", 24);
+						this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon ("process-syncing-error", 24);
                         #endif
-
-                        break;
                     }
-
-                    this.menu.ShowAll ();
                 });
             };
-        }
-
 
-        // Slices up the graphic that contains the
-        // animation frames.
-        private void CreateAnimationFrames ()
-        {
-            this.animation_frames    = new Gdk.Pixbuf [5];
-            Gdk.Pixbuf frames_pixbuf = SparkleUIHelpers.GetIcon ("process-syncing-sparkleshare", 24);
-            
-            for (int i = 0; i < this.animation_frames.Length; i++)
-                animation_frames [i] = new Gdk.Pixbuf (frames_pixbuf, (i * 24), 0, 24, 24);
-        }
-
-
-        // Creates the animation that handles the syncing animation
-        private void CreateAnimation ()
-        {
-            this.frame_number = 0;
-
-            this.animation = new Timer () {
-                Interval = 35
+            Controller.UpdateStatusItemEvent += delegate (string state_text) {
+                Application.Invoke (delegate {
+                    (this.state_item.Child as Label).Text = state_text;
+                    this.state_item.ShowAll ();
+                });
             };
 
-            this.animation.Elapsed += delegate {
-                if (this.frame_number < this.animation_frames.Length - 1)
-                    this.frame_number++;
-                else
-                    this.frame_number = 0;
+            Controller.UpdateQuitItemEvent += delegate (bool item_enabled) {
+                Application.Invoke (delegate {
+                    this.quit_item.Sensitive = item_enabled;
+                    this.quit_item.ShowAll ();
+                });
+            };
 
-                string icon_name = "process-syncing-sparkleshare-"; 
-                for (int i = 0; i <= this.frame_number; i++)
-                    icon_name += "i";
+            Controller.UpdateOpenRecentEventsItemEvent += delegate (bool item_enabled) {
+                Application.Invoke (delegate {
+                    this.recent_events_item.Sensitive = item_enabled;
+                    this.recent_events_item.ShowAll ();
+                });
+            };
 
+            Controller.UpdateMenuEvent += delegate (IconState state) {
                 Application.Invoke (delegate {
-                    #if HAVE_APP_INDICATOR
-                    this.indicator.IconName = icon_name;
-                    #else
-                    this.status_icon.Pixbuf = this.animation_frames [this.frame_number];
-                    #endif
+                    CreateMenu ();
                 });
             };
         }
 
 
-        // Creates the menu that is popped up when the
-        // user clicks the status icon
         public void CreateMenu ()
         {
             this.menu = new Menu ();
 
-                // The menu item showing the status and size of the SparkleShare folder
-                MenuItem status_menu_item = new MenuItem (this.state_text) {
+                this.state_item = new MenuItem (Controller.StateText) {
                     Sensitive = false
                 };
 
-            this.menu.Add (status_menu_item);
+            this.menu.Add (this.state_item);
             this.menu.Add (new SeparatorMenuItem ());
 
                 ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare"){
@@ -223,9 +152,7 @@ namespace SparkleShare {
             this.menu.Add (folder_item);
 
                 if (Program.Controller.Folders.Count > 0) {
-            
-                    // Creates a menu item for each repository with a link to their logs
-                    foreach (string folder_name in Program.Controller.Folders) {
+                    foreach (string folder_name in Controller.Folders) {
                         Gdk.Pixbuf folder_icon;
 
                         if (Program.Controller.UnsyncedFolders.Contains (folder_name)) {
@@ -245,17 +172,41 @@ namespace SparkleShare {
                         this.menu.Add (subfolder_item);
                     }
 
-                } else {
-                    MenuItem no_folders_item = new MenuItem (_("No projects yet")) {
-                        Sensitive   = false
-                    };
+                    Menu submenu = new Menu ();
+
+                    foreach (string folder_name in Controller.OverflowFolders) {
+                        Gdk.Pixbuf folder_icon;
+
+                        if (Program.Controller.UnsyncedFolders.Contains (folder_name)) {
+                            folder_icon = IconTheme.Default.LoadIcon ("dialog-error", 16,
+                                IconLookupFlags.GenericFallback);
+
+                        } else {
+                            folder_icon = IconTheme.Default.LoadIcon ("folder", 16,
+                                IconLookupFlags.GenericFallback);
+                        }
+
+                        ImageMenuItem subfolder_item = new SparkleMenuItem (folder_name) {
+                            Image = new Image (folder_icon)
+                        };
+
+                        subfolder_item.Activated += OpenFolderDelegate (folder_name);
+                        submenu.Add (subfolder_item);
+                    }
+
+                    if (submenu.Children.Length > 0) {
+                        SparkleMenuItem more_item = new SparkleMenuItem ("More Projects") {
+                            Submenu = submenu
+                        };
+
+                        this.menu.Add (new SeparatorMenuItem ());
+                        this.menu.Add (more_item);
+                    }
 
-                    this.menu.Add (no_folders_item);
                 }
 
                 this.menu.Add (new SeparatorMenuItem ());
 
-                // Opens the wizard to add a new remote folder
                 MenuItem sync_item = new MenuItem (_("Add Hosted Project…"));
 
                 sync_item.Activated += delegate {
@@ -264,30 +215,40 @@ namespace SparkleShare {
 
             this.menu.Add (sync_item);
 
-            MenuItem recent_events_item = new MenuItem (_("View Recent Changes…"));
+            this.recent_events_item = new MenuItem (_("Recent Changes…"));
 
-                recent_events_item.Sensitive = (Controller.Folders.Length > 0);
+                this.recent_events_item.Sensitive = Controller.OpenRecentEventsItemEnabled;
 
-                recent_events_item.Activated += delegate {
+                this.recent_events_item.Activated += delegate {
                     Controller.OpenRecentEventsClicked ();
                 };
 
-            this.menu.Add (recent_events_item);
+            this.menu.Add (this.recent_events_item);
             this.menu.Add (new SeparatorMenuItem ());
 
-            CheckMenuItem notify_item = new CheckMenuItem (_("Notifications")) {
-				Active = Program.Controller.NotificationsEnabled	
-			};
-                                      
+            
+            MenuItem notify_item;
+                                                             
+                if (Program.Controller.NotificationsEnabled)
+                    notify_item = new MenuItem (_("Turn Notifications Off"));
+                else
+                    notify_item = new MenuItem (_("Turn Notifications On"));
+
                 notify_item.Activated += delegate {
-                    Program.Controller.ToggleNotifications ();
-                  //  CreateMenu ();
+					Application.Invoke (delegate {
+	                    Program.Controller.ToggleNotifications ();
+					
+					    if (Program.Controller.NotificationsEnabled)
+	                    	(notify_item.Child as Label).Text = _("Turn Notifications Off");
+	                	else
+	                    	(notify_item.Child as Label).Text = _("Turn Notifications On");
+					});
                 };
 
             this.menu.Add (notify_item);
             this.menu.Add (new SeparatorMenuItem ());
 
-                // A menu item that takes the user to http://www.sparkleshare.org/
+
                 MenuItem about_item = new MenuItem (_("About SparkleShare"));
 
                 about_item.Activated += delegate {
@@ -297,7 +258,7 @@ namespace SparkleShare {
             this.menu.Add (about_item);
             this.menu.Add (new SeparatorMenuItem ());
 
-                // A menu item that quits the application
+
                 this.quit_item = new MenuItem (_("Quit")) {
                     Sensitive = Controller.QuitItemEnabled
                 };
@@ -325,12 +286,17 @@ namespace SparkleShare {
         }
 
 
-        public void UpdateStateText ()
+        private void CreateAnimationFrames ()
         {
-            ((this.menu.Children [0] as MenuItem).Child as Label).Text = this.state_text;
-            this.menu.ShowAll ();
+            this.animation_frames     = new Gdk.Pixbuf [5];
+            this.animation_frames [0] = SparkleUIHelpers.GetIcon ("process-syncing-i", 24);
+            this.animation_frames [0] = SparkleUIHelpers.GetIcon ("process-syncing-ii", 24);
+            this.animation_frames [0] = SparkleUIHelpers.GetIcon ("process-syncing-iii", 24);
+            this.animation_frames [0] = SparkleUIHelpers.GetIcon ("process-syncing-iiii", 24);
+            this.animation_frames [0] = SparkleUIHelpers.GetIcon ("process-syncing-iiiii", 24);
         }
 
+
         #if !HAVE_APP_INDICATOR
         // Makes the menu visible
         private void ShowMenu (object o, EventArgs args)
diff --git a/SparkleShare/Linux/sparkleshare.in b/SparkleShare/Linux/sparkleshare.in
index d73b277..adf3a2e 100755
--- a/SparkleShare/Linux/sparkleshare.in
+++ b/SparkleShare/Linux/sparkleshare.in
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [[ $UID -eq 0 ]]; then
-  echo "Cannot run as root. Things would go utterly wrong."
+  echo "SparkleShare can't be run as root. Things would go utterly wrong."
   exit 1
 fi
 
@@ -18,7 +18,7 @@ start() {
       echo "SparkleShare is already running."
       exit 0
     else
-      echo "SparkleShare stale pid file found, starting a new instance."
+      echo "Stale SparkleShare PID file found, starting a new instance..."
       rm -f $pidfile
     fi
   fi
@@ -42,7 +42,7 @@ stop() {
       rm -f ${pidfile}
       echo "Done."
     else
-      echo "SparkleShare is not running, removing stale pid file..."
+      echo "SparkleShare is not running, removing stale PID file..."
       rm -f ${pidfile}
     fi
   else
@@ -65,13 +65,7 @@ case $1 in
     invite=`date -u +%N`
     curl -o ~/SparkleShare/$invite.xml `echo $2 | sed s/sparkleshare:/https:/`
     ;;
-  help|--help|-h)
-    mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" --help
-    ;;
-  version|--version|-v)
-    mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" --version
-    ;;
   *)
-    echo "Usage: sparkleshare {start|stop|restart|help|version}"
+    mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" --help
     ;;
 esac
diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am
index 26452b7..79812a5 100755
--- a/SparkleShare/Makefile.am
+++ b/SparkleShare/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS =	Linux
+SUBDIRS = Linux \
+	Common
 
 ASSEMBLY = SparkleShare
 TARGET = exe
@@ -17,7 +18,6 @@ SOURCES =  \
 	SparkleEventLogController.cs \
 	SparkleExtensions.cs \
 	SparkleInvite.cs \
-	SparkleOptions.cs \
 	SparklePlugin.cs \
 	SparkleSetupController.cs \
 	SparkleStatusIconController.cs
@@ -25,5 +25,5 @@ SOURCES =  \
 include $(top_srcdir)/build/build.mk
 	
 install-data-hook:
-	update-desktop-database $(datadir)/applications
-	echo "Installed protocol handler sparkleshare://"
+	test -f $(datadir)/applications/defaults.list && \
+	test -z $(DESTDIR) && update-desktop-database $(datadir)/applications || :
diff --git a/SparkleShare/Makefile.in b/SparkleShare/Makefile.in
index 20e1922..c7f4380 100644
--- a/SparkleShare/Makefile.in
+++ b/SparkleShare/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -40,7 +57,6 @@ subdir = SparkleShare
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -74,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(moduledir)"
 SCRIPTS = $(module_SCRIPTS)
 DIST_SOURCES =
@@ -84,6 +106,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -120,7 +147,6 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -131,50 +157,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -184,8 +191,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -197,8 +202,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -215,20 +218,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -267,7 +265,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = Linux
+SUBDIRS = Linux \
+	Common
+
 ASSEMBLY = SparkleShare
 TARGET = exe
 @ENABLE_TESTS_TRUE@LINK = " $(NUNIT_LIBS)"
@@ -281,7 +281,6 @@ SOURCES = \
 	SparkleEventLogController.cs \
 	SparkleExtensions.cs \
 	SparkleInvite.cs \
-	SparkleOptions.cs \
 	SparklePlugin.cs \
 	SparkleSetupController.cs \
 	SparkleStatusIconController.cs
@@ -383,6 +382,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/build/build.mk $(top_srcdir)/build/build.environment.mk $(top_srcdir)/build/build.rules.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -394,8 +394,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-moduleSCRIPTS: $(module_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
 	@list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -423,9 +426,7 @@ uninstall-moduleSCRIPTS:
 	@list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(moduledir)" && rm -f $$files
+	dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -600,13 +601,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -644,10 +642,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -786,8 +789,8 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 	fi;
 
 install-data-hook:
-	update-desktop-database $(datadir)/applications
-	echo "Installed protocol handler sparkleshare://"
+	test -f $(datadir)/applications/defaults.list && \
+	test -z $(DESTDIR) && update-desktop-database $(datadir)/applications || :
 
 # 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.
diff --git a/SparkleShare/Program.cs b/SparkleShare/Program.cs
index 89ba64f..b339512 100644
--- a/SparkleShare/Program.cs
+++ b/SparkleShare/Program.cs
@@ -21,7 +21,6 @@ using System.Threading;
 #if __MonoCS__
 using Mono.Unix;
 #endif
-using SparkleLib;
 
 namespace SparkleShare {
 
@@ -30,18 +29,18 @@ namespace SparkleShare {
 
         public static SparkleController Controller;
         public static SparkleUI UI;
-		
-		public static Mutex ProgramMutex = new Mutex (false, "SparkleShare");
+
+        private static Mutex program_mutex = new Mutex (false, "SparkleShare");
 		
 		
         // Short alias for the translations
         public static string _ (string s)
         {
-        #if __MonoCS__
+            #if __MonoCS__
             return Catalog.GetString (s);
-         #else
-            return Strings.T (s);
-         #endif
+            #else
+            return s;
+            #endif
         }
         
      
@@ -50,33 +49,30 @@ namespace SparkleShare {
         #endif
         public static void Main (string [] args)
         {
-            // Parse the command line options
-            bool show_help       = false;
-            OptionSet option_set = new OptionSet () {
-                { "v|version", _("Print version information"), v => { PrintVersion (); } },
-                { "h|help", _("Show this help text"), v => show_help = v != null }
-            };
+            if (args.Length != 0 && !args [0].Equals ("start")) {
+                Console.WriteLine (" ");
+                Console.WriteLine ("SparkleShare is a collaboration and sharing tool that is ");
+                Console.WriteLine ("designed to keep things simple and to stay out of your way.");
+                Console.WriteLine (" ");
+                Console.WriteLine ("Version: " + SparkleLib.Defines.VERSION);
+                Console.WriteLine ("Copyright (C) 2010 Hylke Bons");
+                Console.WriteLine (" ");
+                Console.WriteLine ("This program comes with ABSOLUTELY NO WARRANTY.");
+                Console.WriteLine (" ");
+                Console.WriteLine ("This is free software, and you are welcome to redistribute it ");
+                Console.WriteLine ("under certain conditions. Please read the GNU GPLv3 for details.");
+                Console.WriteLine (" ");
+                Console.WriteLine ("Usage: sparkleshare [start|stop|restart]");
 
-            try {
-                option_set.Parse (args);
-
-            } catch (OptionException e) {
-                Console.Write ("SparkleShare: ");
-                Console.WriteLine (e.Message);
-                Console.WriteLine ("Try `sparkleshare --help' for more information.");
+                Environment.Exit (-1);
             }
-
-            if (show_help)
-                ShowHelp (option_set);
-
 			
-			// Only allow one instance of SparkleShare
-			if (!ProgramMutex.WaitOne (0, false)) {
+			// Only allow one instance of SparkleShare (on Windows)
+			if (!program_mutex.WaitOne (0, false)) {
 				Console.WriteLine ("SparkleShare is already running.");
 				Environment.Exit (-1);
 			}
-				
-			
+
             // Initialize the controller this way so that
             // there aren't any exceptions in the OS specific UI's
             Controller = new SparkleController ();
@@ -93,37 +89,5 @@ namespace SparkleShare {
             GC.WaitForPendingFinalizers ();
             #endif
         }
-
-
-        // Prints the help output
-        public static void ShowHelp (OptionSet option_set)
-        {
-            Console.WriteLine (" ");
-            Console.WriteLine (_("SparkleShare, a collaboration and sharing tool."));
-            Console.WriteLine (_("Copyright (C) 2010 Hylke Bons"));
-            Console.WriteLine (" ");
-            Console.WriteLine (_("This program comes with ABSOLUTELY NO WARRANTY."));
-            Console.WriteLine (" ");
-            Console.WriteLine (_("This is free software, and you are welcome to redistribute it "));
-            Console.WriteLine (_("under certain conditions. Please read the GNU GPLv3 for details."));
-            Console.WriteLine (" ");
-            Console.WriteLine (_("SparkleShare is a collaboration and sharing tool that is "));
-            Console.WriteLine (_("designed to keep things simple and to stay out of your way."));
-            Console.WriteLine (" ");
-            Console.WriteLine (_("Usage: sparkleshare [start|stop|restart|version] [OPTION]..."));
-            Console.WriteLine (_("Sync SparkleShare folder with remote repositories."));
-            Console.WriteLine (" ");
-            Console.WriteLine (_("Arguments:"));
-
-            option_set.WriteOptionDescriptions (Console.Out);
-            Environment.Exit (0);
-        }
-
-
-        public static void PrintVersion ()
-        {
-            Console.WriteLine (_("SparkleShare " + Defines.VERSION));
-            Environment.Exit (0);
-        }
     }
 }
diff --git a/SparkleShare/SparkleAboutController.cs b/SparkleShare/SparkleAboutController.cs
index fb9fa5e..4a490f0 100755
--- a/SparkleShare/SparkleAboutController.cs
+++ b/SparkleShare/SparkleAboutController.cs
@@ -1,108 +1,129 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
-//
-//   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.Net;
-using System.Threading;
-using System.Timers;
-
-using SparkleLib;
-
-namespace SparkleShare {
-
-    public class SparkleAboutController {
-
-        public event ShowWindowEventHandler ShowWindowEvent;
-        public delegate void ShowWindowEventHandler ();
-
-        public event HideWindowEventHandler HideWindowEvent;
-        public delegate void HideWindowEventHandler ();
-
-        public event NewVersionEventHandler NewVersionEvent;
-        public delegate void NewVersionEventHandler (string new_version);
-
-        public event VersionUpToDateEventHandler VersionUpToDateEvent;
-        public delegate void VersionUpToDateEventHandler ();
-
-        public event CheckingForNewVersionEventHandler CheckingForNewVersionEvent;
-        public delegate void CheckingForNewVersionEventHandler ();
-
-
-        public string RunningVersion {
-            get {
-                return SparkleBackend.Version;
-            }
-        }
-
-
-        public SparkleAboutController ()
-        {
-            Program.Controller.ShowAboutWindowEvent += delegate {
-                if (ShowWindowEvent != null)
-                    ShowWindowEvent ();
-
-                CheckForNewVersion ();
-            };
-        }
-
-
-        public void WindowClosed ()
-        {
-            if (HideWindowEvent != null)
-                HideWindowEvent ();
-        }
-
-
-        public void CheckForNewVersion ()
-        {
-            if (CheckingForNewVersionEvent != null)
-                CheckingForNewVersionEvent ();
-
-            WebClient web_client = new WebClient ();
-            Uri uri = new Uri ("http://www.sparkleshare.org/version");
-
-            web_client.DownloadStringCompleted += delegate (object o, DownloadStringCompletedEventArgs args) {
-                if (args.Error != null)
-                    return;
-
-                int running_version = int.Parse (
-                    "" + RunningVersion [0] + RunningVersion [2] + RunningVersion [4]
-                );
-
-                string result = args.Result.Trim ();
-                int new_version = int.Parse (
-                    "" + result [0] + result [2] + result [4]
-                );
-
-                // Add a little delay, making it seems we're
-                // actually doing hard work
-                Thread.Sleep (1000);
-
-                if (running_version >= new_version) {
-                    if (VersionUpToDateEvent != null)
-                        VersionUpToDateEvent ();
-
-                } else {
-                    if (NewVersionEvent != null)
-                        NewVersionEvent (result);
-                }
-            };
-
-            web_client.DownloadStringAsync (uri);
-        }
-    }
-}
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.Net;
+using System.Threading;
+
+using SparkleLib;
+
+namespace SparkleShare {
+
+    public class SparkleAboutController {
+
+        public event Action ShowWindowEvent = delegate { };
+        public event Action HideWindowEvent = delegate { };
+        public event Action VersionUpToDateEvent = delegate { };
+        public event Action CheckingForNewVersionEvent = delegate { };
+
+        public event NewVersionEventDelegate NewVersionEvent = delegate { };
+        public delegate void NewVersionEventDelegate (string new_version_string);
+
+        public string RunningVersion {
+            get {
+                return SparkleBackend.Version;
+            }
+        }
+
+
+        public SparkleAboutController ()
+        {
+            Program.Controller.ShowAboutWindowEvent += delegate {
+                ShowWindowEvent ();
+                CheckForNewVersion ();
+            };
+        }
+
+
+        public void WindowClosed ()
+        {
+            HideWindowEvent ();
+        }
+
+
+        private void CheckForNewVersion ()
+        {
+            CheckingForNewVersionEvent ();
+
+            WebClient web_client = new WebClient ();
+            Uri uri = new Uri ("http://www.sparkleshare.org/version");
+
+            web_client.DownloadStringCompleted += delegate (object o, DownloadStringCompletedEventArgs args) {
+                if (args.Error != null)
+                    return;
+
+                string latest_version_string = args.Result.Trim ();
+                Thread.Sleep (750);
+
+                if (UpdateRequired (RunningVersion, latest_version_string))
+                    NewVersionEvent (latest_version_string);
+                else
+                    VersionUpToDateEvent ();                    
+            };
+
+            web_client.DownloadStringAsync (uri);
+        }
+
+
+        private bool UpdateRequired (string running_version_string, string latest_version_string)
+        {
+            if (running_version_string == null)
+                throw new ArgumentNullException ("running_version_string");
+
+            if (string.IsNullOrWhiteSpace (running_version_string))
+                throw new ArgumentException ("running_version_string");
+
+            if (latest_version_string == null)
+                throw new ArgumentNullException ("latest_version_string");
+
+            if (string.IsNullOrWhiteSpace (latest_version_string))
+                throw new ArgumentException ("latest_version_string");
+
+            int running_major;
+            int running_minor;
+            int running_build;
+            try {
+                string[] running_split = running_version_string.Split ('.');
+                running_major = int.Parse (running_split [0]);
+                running_minor = int.Parse (running_split [1]);
+                running_build = int.Parse (running_split [2]);
+
+            } catch (Exception e) {
+                throw new FormatException ("running_version_string", e);
+            }
+
+            int latest_major;
+            int latest_minor;
+            int latest_build;
+            try {
+                string[] latest_split = latest_version_string.Split ('.');
+                latest_major = int.Parse (latest_split [0]);
+                latest_minor = int.Parse (latest_split [1]);
+                latest_build = int.Parse (latest_split [2]);
+
+            } catch (Exception e) {
+                throw new FormatException ("latest_version_string", e);
+            }
+
+            bool higher_major = latest_major > running_major;
+            bool higher_minor = latest_major == running_major && latest_minor > running_minor;
+            bool higher_build = latest_major == running_major && latest_minor == running_minor && latest_build > running_build;
+
+            return higher_major || higher_minor || higher_build;
+        }
+    }
+}
+\ No newline at end of file
diff --git a/SparkleShare/SparkleBubblesController.cs b/SparkleShare/SparkleBubblesController.cs
index e000086..2b682d2 100755
--- a/SparkleShare/SparkleBubblesController.cs
+++ b/SparkleShare/SparkleBubblesController.cs
@@ -33,15 +33,16 @@ namespace SparkleShare {
             };
 
             Program.Controller.NotificationRaised += delegate (SparkleChangeSet change_set) {
-                ShowBubble (change_set.User.Name, FormatMessage (change_set),
-                    Program.Controller.GetAvatar (change_set.User.Email, 36));
+                if (Program.Controller.NotificationsEnabled)
+                    ShowBubble (change_set.User.Name, FormatMessage (change_set),
+                        Program.Controller.GetAvatar (change_set.User.Email, 48));
             };
         }
 
 
         public void ShowBubble (string title, string subtext, string image_path)
         {
-            if (ShowBubbleEvent != null && Program.Controller.NotificationsEnabled)
+            if (ShowBubbleEvent != null)
                 ShowBubbleEvent (title, subtext, image_path);
         }
 
@@ -54,40 +55,26 @@ namespace SparkleShare {
 
         private string FormatMessage (SparkleChangeSet change_set)
         {
-            string file_name = "";
-            string message   = "";
+            string message = "";
 
-            if (change_set.Added.Count > 0) {
-                file_name = change_set.Added [0];
-                message = String.Format ("added ‘{0}’", file_name);
-            }
+            if (change_set.Changes [0].Type == SparkleChangeType.Deleted)
+                message = string.Format ("moved ‘{0}’", change_set.Changes [0].Path);
 
-            if (change_set.MovedFrom.Count > 0) {
-                file_name = change_set.MovedFrom [0];
-                message = String.Format ("moved ‘{0}’", file_name);
-            }
+            if (change_set.Changes [0].Type == SparkleChangeType.Moved)
+                message = string.Format ("moved ‘{0}’", change_set.Changes [0].Path);
 
-            if (change_set.Edited.Count > 0) {
-                file_name = change_set.Edited [0];
-                message = String.Format ("edited ‘{0}’", file_name);
-            }
-
-            if (change_set.Deleted.Count > 0) {
-                file_name = change_set.Deleted [0];
-                message = String.Format ("deleted ‘{0}’", file_name);
-            }
+            if (change_set.Changes [0].Type == SparkleChangeType.Added)
+                message = string.Format ("added ‘{0}’", change_set.Changes [0].Path);
 
-            int changes_count = (change_set.Added.Count +
-                                 change_set.Edited.Count +
-                                 change_set.Deleted.Count +
-                                 change_set.MovedFrom.Count) - 1;
+            if (change_set.Changes [0].Type == SparkleChangeType.Edited)
+                message = string.Format ("moved ‘{0}’", change_set.Changes [0].Path);
 
-            if (changes_count > 0) {
-                string msg = string.Format ("and {0} more", changes_count);
-                message += " " + String.Format (msg, changes_count);
+            if (change_set.Changes.Count > 0) {
+                string msg = string.Format ("and {0} more", change_set.Changes.Count);
+                message    = message + " " + string.Format (msg, change_set.Changes.Count);
 
-            } else if (changes_count < 0) {
-                message += "did something magical";
+            } else {
+                message = "did something magical";
             }
 
             return message;
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index d13e441..ba6316a 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -32,7 +32,20 @@ namespace SparkleShare {
 
     public abstract class SparkleControllerBase {
 
-        public List<SparkleRepoBase> Repositories = new List<SparkleRepoBase> ();
+        public SparkleRepoBase [] Repositories {
+            get {
+                lock (this.repo_lock) {
+                    SparkleRepoBase [] repositories =
+                        this.repositories.GetRange (0, this.repositories.Count).ToArray ();
+
+                    return repositories;
+                }
+            }
+        }
+
+        public bool RepositoriesLoaded { get; private set;}
+
+        public List<SparkleRepoBase> repositories = new List<SparkleRepoBase> ();
         public readonly string SparklePath = SparkleConfig.DefaultConfig.FoldersPath;
 
         public double ProgressPercentage = 0.0;
@@ -53,7 +66,7 @@ namespace SparkleShare {
         public delegate void FolderFetchedEventHandler (string remote_url, string [] warnings);
         
         public event FolderFetchErrorHandler FolderFetchError;
-        public delegate void FolderFetchErrorHandler (string remote_url);
+        public delegate void FolderFetchErrorHandler (string remote_url, string [] errors);
         
         public event FolderFetchingHandler FolderFetching;
         public delegate void FolderFetchingHandler (double percentage);
@@ -89,7 +102,6 @@ namespace SparkleShare {
             }
         }
 
-
         public List<string> Folders {
             get {
                 List<string> folders = SparkleConfig.DefaultConfig.Folders;
@@ -99,23 +111,44 @@ namespace SparkleShare {
             }
         }
 
-
         public List<string> UnsyncedFolders {
             get {
                 List<string> unsynced_folders = new List<string> ();
 
-                lock (this.repo_lock) {
-                    foreach (SparkleRepoBase repo in Repositories) {
-                        if (repo.HasUnsyncedChanges)
-                            unsynced_folders.Add (repo.Name);
-                    }
+                foreach (SparkleRepoBase repo in Repositories) {
+                    if (repo.HasUnsyncedChanges)
+                        unsynced_folders.Add (repo.Name);
                 }
 
                 return unsynced_folders;
             }
         }
 
-        
+        public SparkleUser CurrentUser {
+            get {
+                return SparkleConfig.DefaultConfig.User;
+            }
+
+            set {
+                SparkleConfig.DefaultConfig.User = value;
+            }
+        }
+
+        public bool NotificationsEnabled {
+            get {
+                string notifications_enabled = SparkleConfig.DefaultConfig.GetConfigOption ("notifications");
+
+                if (string.IsNullOrEmpty (notifications_enabled)) {
+                    SparkleConfig.DefaultConfig.SetConfigOption ("notifications", bool.TrueString);
+                    return true;
+
+                } else {
+                    return notifications_enabled.Equals (bool.TrueString);
+                }
+            }
+        }
+
+
         // Path where the plugins are kept
         public abstract string PluginsPath { get; }
 
@@ -133,17 +166,17 @@ namespace SparkleShare {
         public abstract bool CreateSparkleShareFolder ();
 
         // Opens the SparkleShare folder or an (optional) subfolder
-        public abstract void OpenSparkleShareFolder (string subfolder);
+        public abstract void OpenFolder (string path);
 
         // Opens a file with the appropriate application
-        public abstract void OpenFile (string url);
+        public abstract void OpenFile (string path);
 
 
         private SparkleFetcherBase fetcher;
         private List<string> failed_avatars = new List<string> ();
-
-        private Object avatar_lock = new Object ();
-        private Object repo_lock   = new Object ();
+        private Object avatar_lock          = new Object ();
+        private Object repo_lock            = new Object ();
+        private Object delete_watcher_lock  = new Object ();
 
 
         // Short alias for the translations
@@ -179,13 +212,20 @@ namespace SparkleShare {
                 Filter                = "*"
             };
 
-            // Remove the repository when a delete event occurs
             watcher.Deleted += delegate (object o, FileSystemEventArgs args) {
-                RemoveRepository (args.FullPath);
-                SparkleConfig.DefaultConfig.RemoveFolder (Path.GetFileName (args.Name));
+                lock (this.delete_watcher_lock) {
+                    foreach (string folder_name in SparkleConfig.DefaultConfig.Folders) {
+                        string folder_path = new SparkleFolder (folder_name).FullPath;
 
-                if (FolderListChanged != null)
-                    FolderListChanged ();
+                        if (!Directory.Exists (folder_path)) {
+                            SparkleConfig.DefaultConfig.RemoveFolder (folder_name);
+                            RemoveRepository (folder_path);
+                        }
+                    }
+
+                    if (FolderListChanged != null)
+                        FolderListChanged ();
+                }
             };
 
             watcher.Created += delegate (object o, FileSystemEventArgs args) {
@@ -229,15 +269,15 @@ namespace SparkleShare {
                     }
                 }
             };
-
-            new Thread (new ThreadStart (PopulateRepositories)).Start ();
         }
-        
-        
+
+
         public void UIHasLoaded ()
-		{
-        	if (FirstRun)
-        		ShowSetupWindow (PageType.Setup);
+        {
+            if (FirstRun)
+                ShowSetupWindow (PageType.Setup);
+            else
+                new Thread (new ThreadStart (PopulateRepositories)).Start ();
         }
 
 
@@ -262,20 +302,17 @@ namespace SparkleShare {
         }
 
 
-
         public List<SparkleChangeSet> GetLog ()
         {
             List<SparkleChangeSet> list = new List<SparkleChangeSet> ();
 
-            lock (this.repo_lock) {
-                foreach (SparkleRepoBase repo in Repositories) {
-                    List<SparkleChangeSet> change_sets = repo.GetChangeSets (30);
-    
-                    if (change_sets != null)
-                        list.AddRange (change_sets);
-                    else
-                        SparkleHelpers.DebugInfo ("Log", "Could not create log for " + repo.Name);
-                }
+            foreach (SparkleRepoBase repo in Repositories) {
+                List<SparkleChangeSet> change_sets = repo.ChangeSets;
+
+                if (change_sets != null)
+                    list.AddRange (change_sets);
+                else
+                    SparkleHelpers.DebugInfo ("Log", "Could not create log for " + repo.Name);
             }
 
             list.Sort ((x, y) => (x.Timestamp.CompareTo (y.Timestamp)));
@@ -293,13 +330,12 @@ namespace SparkleShare {
             if (name == null)
                 return GetLog ();
 
-            string path = Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, name);
-            int log_size = 50;
+            string path  = new SparkleFolder (name).FullPath;
 
             lock (this.repo_lock) {
                 foreach (SparkleRepoBase repo in Repositories) {
-                    if (repo.LocalPath.Equals (path))            
-                        return repo.GetChangeSets (log_size);
+                    if (repo.LocalPath.Equals (path))
+                        return repo.ChangeSets;
                 }
             }
 
@@ -328,41 +364,11 @@ namespace SparkleShare {
 
                 bool change_set_inserted = false;
                 foreach (ActivityDay stored_activity_day in activity_days) {
-                    if (stored_activity_day.DateTime.Year  == change_set.Timestamp.Year &&
-                        stored_activity_day.DateTime.Month == change_set.Timestamp.Month &&
-                        stored_activity_day.DateTime.Day   == change_set.Timestamp.Day) {
-
-                        bool squash = false;
-                        foreach (SparkleChangeSet existing_set in stored_activity_day) {
-                            if (change_set.User.Name.Equals (existing_set.User.Name) &&
-                                change_set.User.Email.Equals (existing_set.User.Email) &&
-                                change_set.Folder.Equals (existing_set.Folder)) {
-
-                                existing_set.Added.AddRange (change_set.Added);
-                                existing_set.Edited.AddRange (change_set.Edited);
-                                existing_set.Deleted.AddRange (change_set.Deleted);
-                                existing_set.MovedFrom.AddRange (change_set.MovedFrom);
-                                existing_set.MovedTo.AddRange (change_set.MovedTo);
-                                
-                                existing_set.Added   = existing_set.Added.Distinct ().ToList ();
-                                existing_set.Edited  = existing_set.Edited.Distinct ().ToList ();
-                                existing_set.Deleted = existing_set.Deleted.Distinct ().ToList ();
-
-                                if (DateTime.Compare (existing_set.Timestamp, change_set.Timestamp) < 1) {
-                                    existing_set.FirstTimestamp = existing_set.Timestamp;
-                                    existing_set.Timestamp      = change_set.Timestamp;
-                                    existing_set.Revision       = change_set.Revision;
-
-                                } else {
-                                    existing_set.FirstTimestamp = change_set.Timestamp;
-                                }
-
-                                squash = true;
-                            }
-                        }
+                    if (stored_activity_day.Date.Year  == change_set.Timestamp.Year &&
+                        stored_activity_day.Date.Month == change_set.Timestamp.Month &&
+                        stored_activity_day.Date.Day   == change_set.Timestamp.Day) {
 
-                        if (!squash)
-                            stored_activity_day.Add (change_set);
+                        stored_activity_day.Add (change_set);
 
                         change_set_inserted = true;
                         break;
@@ -376,11 +382,6 @@ namespace SparkleShare {
                 }
             }
 
-            new Thread (new ThreadStart (delegate {
-                FetchAvatars (emails, 48);
-                FetchAvatars (emails, 36);
-            })).Start ();
-
             string event_log_html   = EventLogHTML;
             string day_entry_html   = DayEntryHTML;
             string event_entry_html = EventEntryHTML;
@@ -392,70 +393,23 @@ namespace SparkleShare {
                 foreach (SparkleChangeSet change_set in activity_day) {
                     string event_entry = "<dl>";
 
-                    if (change_set.IsMagical) {
-                        event_entry += "<dd>Did something magical</dd>";
+                    foreach (SparkleChange change in change_set.Changes) {
+                        if (change.Type != SparkleChangeType.Moved) {
 
-                    } else {
-                        if (change_set.Added.Count > 0) {
-                            foreach (string file_path in change_set.Added) {
-                                event_entry += "<dd class='document added'>";
-								
-                                event_entry += FormatBreadCrumbs (
-                                    Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
-                                    file_path
-                                );
-
-                                event_entry += "</dd>";
-                            }
-                        }
-						
-                        if (change_set.Edited.Count > 0) {
-                            foreach (string file_path in change_set.Edited) {
-                                event_entry += "<dd class='document edited'>";
-
-                                event_entry += FormatBreadCrumbs (
-                                    Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
-                                    file_path
-                                );
-
-                                event_entry += "</dd>";
-                            }
-                        }
-    
-                        if (change_set.Deleted.Count > 0) {
-                            foreach (string file_path in change_set.Deleted) {
-                                event_entry += "<dd class='document deleted'>";
-								
-                                event_entry += FormatBreadCrumbs (
-                                    Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
-                                    file_path
-                                );
-
-                                event_entry += "</dd>";
-                            }
-                        }
+                            event_entry += "<dd class='document " + change.Type.ToString ().ToLower () + "'>";
+                            event_entry += "<small>" + change.Timestamp.ToString ("HH:mm") +"</small> &nbsp;";
+                            event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.Path);
+                            event_entry += "</dd>";
+
+                        } else {
+
+                    		event_entry += "<dd class='document moved'>";
+                            event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.Path);
+                            event_entry += "<br>";
+                            event_entry += "<small>" + change.Timestamp.ToString ("HH:mm") +"</small> &nbsp;";
+                            event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.MovedToPath);
+                            event_entry += "</dd>";
 
-                        if (change_set.MovedFrom.Count > 0) {
-                            int i = 0;
-                            foreach (string file_path in change_set.MovedFrom) {
-                                string to_file_path = change_set.MovedTo [i];
-								event_entry += "<dd class='document moved'>";
-								
-                                event_entry += FormatBreadCrumbs (
-                                        Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
-                                        file_path
-                                );
-
-                                event_entry += "<br>";
-                                event_entry += FormatBreadCrumbs (
-                                        Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, change_set.Folder),
-                                        to_file_path
-                                );
-
-                                event_entry += "</dd>";
-
-                                i++;
-                            }
                         }
                     }
 
@@ -469,56 +423,54 @@ namespace SparkleShare {
 							AssignAvatar (change_set.User.Email);
 					}
 					
-                    event_entry   += "</dl>";
+                    event_entry += "</dl>";
 
                     string timestamp = change_set.Timestamp.ToString ("H:mm");
 
-                    if (!change_set.FirstTimestamp.Equals (new DateTime ()))
-                        timestamp = change_set.FirstTimestamp.ToString ("H:mm") +
-                                    " – " + timestamp;
+                    if (!change_set.FirstTimestamp.Equals (new DateTime ()) &&
+                        !change_set.Timestamp.ToString ("H:mm").Equals (change_set.FirstTimestamp.ToString ("H:mm")))
+                        timestamp = change_set.FirstTimestamp.ToString ("H:mm") + " – " + timestamp;
 
                     event_entries += event_entry_html.Replace ("<!-- $event-entry-content -->", event_entry)
                         .Replace ("<!-- $event-user-name -->", change_set.User.Name)
                         .Replace ("<!-- $event-avatar-url -->", change_set_avatar)
-                        .Replace ("<!-- $event-time -->", timestamp)
-                        .Replace ("<!-- $event-folder -->", change_set.Folder)
-                        .Replace ("<!-- $event-url -->", change_set.Url.ToString ())
-                        .Replace ("<!-- $event-revision -->", change_set.Revision)
-                        .Replace ("<!-- $event-folder-color -->", AssignColor (change_set.Folder));
+                        .Replace ("<!-- $event-folder -->", change_set.Folder.Name)
+                        .Replace ("<!-- $event-url -->", change_set.RemoteUrl.ToString ())
+                        .Replace ("<!-- $event-revision -->", change_set.Revision);
                 }
 
                 string day_entry   = "";
                 DateTime today     = DateTime.Now;
                 DateTime yesterday = DateTime.Now.AddDays (-1);
 
-                if (today.Day   == activity_day.DateTime.Day &&
-                    today.Month == activity_day.DateTime.Month && 
-                    today.Year  == activity_day.DateTime.Year) {
+                if (today.Day   == activity_day.Date.Day &&
+                    today.Month == activity_day.Date.Month &&
+                    today.Year  == activity_day.Date.Year) {
 
                     day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->",
-                        "<span id='today' name='" + activity_day.DateTime.ToString (_("dddd, MMMM d")) + "'>"
+                        "<span id='today' name='" + activity_day.Date.ToString (_("dddd, MMMM d")) + "'>"
                         + _("Today") + "</span>");
 
-                } else if (yesterday.Day   == activity_day.DateTime.Day &&
-                           yesterday.Month == activity_day.DateTime.Month &&
-                           yesterday.Year  == activity_day.DateTime.Year) {
+                } else if (yesterday.Day   == activity_day.Date.Day &&
+                           yesterday.Month == activity_day.Date.Month &&
+                           yesterday.Year  == activity_day.Date.Year) {
 
                     day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->",
-                        "<span id='yesterday' name='" + activity_day.DateTime.ToString (_("dddd, MMMM d")) + "'>"
+                        "<span id='yesterday' name='" + activity_day.Date.ToString (_("dddd, MMMM d")) + "'>"
                         + _("Yesterday") + "</span>");
 
                 } else {
-                    if (activity_day.DateTime.Year != DateTime.Now.Year) {
+                    if (activity_day.Date.Year != DateTime.Now.Year) {
 
                         // TRANSLATORS: This is the date in the event logs
                         day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->",
-                            activity_day.DateTime.ToString (_("dddd, MMMM d, yyyy")));
+                            activity_day.Date.ToString (_("dddd, MMMM d, yyyy")));
 
                     } else {
 
                         // TRANSLATORS: This is the date in the event logs, without the year
                         day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->",
-                            activity_day.DateTime.ToString (_("dddd, MMMM d")));
+                            activity_day.Date.ToString (_("dddd, MMMM d")));
                     }
                 }
 
@@ -529,10 +481,16 @@ namespace SparkleShare {
             int midnight = (int) (DateTime.Today.AddDays (1) - new DateTime (1970, 1, 1)).TotalSeconds;
 
             string html = event_log_html.Replace ("<!-- $event-log-content -->", event_log)
-                .Replace ("<!-- $username -->", UserName)
-                .Replace ("<!-- $user-avatar-url -->", "file://" + GetAvatar (UserEmail, 48))
+                .Replace ("<!-- $username -->", CurrentUser.Name)
+                .Replace ("<!-- $user-avatar-url -->", "file://" + GetAvatar (CurrentUser.Email, 48))
                 .Replace ("<!-- $midnight -->", midnight.ToString ());
 
+            new Thread (
+                new ThreadStart (delegate {
+                    FetchAvatars (emails, 48);
+                })
+            ).Start ();
+
             return html;
         }
 
@@ -543,17 +501,15 @@ namespace SparkleShare {
             bool has_syncing_repos  = false;
             bool has_unsynced_repos = false;
 
-            lock (this.repo_lock) {
-                foreach (SparkleRepoBase repo in Repositories) {
-                    if (repo.Status == SyncStatus.SyncDown ||
-                        repo.Status == SyncStatus.SyncUp   ||
-                        repo.IsBuffering) {
-    
-                        has_syncing_repos = true;
-    
-                    } else if (repo.HasUnsyncedChanges) {
-                        has_unsynced_repos = true;
-                    }
+            foreach (SparkleRepoBase repo in Repositories) {
+                if (repo.Status == SyncStatus.SyncDown ||
+                    repo.Status == SyncStatus.SyncUp   ||
+                    repo.IsBuffering) {
+
+                    has_syncing_repos = true;
+
+                } else if (repo.HasUnsyncedChanges) {
+                    has_unsynced_repos = true;
                 }
             }
 
@@ -600,7 +556,7 @@ namespace SparkleShare {
 
             repo.ConflictResolved += delegate {
                 if (AlertNotificationRaised != null)
-                    AlertNotificationRaised ("Conflict detected.",
+                    AlertNotificationRaised ("Conflict detected",
                         "Don't worry, SparkleShare made a copy of each conflicting file.");
             };
 
@@ -630,11 +586,7 @@ namespace SparkleShare {
                 UpdateState ();
             };
 
-
-            lock (this.repo_lock) {
-                Repositories.Add (repo);
-            }
-
+            this.repositories.Add (repo);
             repo.Initialize ();
         }
 
@@ -645,18 +597,21 @@ namespace SparkleShare {
         {
             string folder_name = Path.GetFileName (folder_path);
 
-            lock (this.repo_lock) {
-                for (int i = 0; i < Repositories.Count; i++) {
-                    SparkleRepoBase repo = Repositories [i];
-    
-                    if (repo.Name.Equals (folder_name)) {
-                        repo.Dispose ();
-                        Repositories.Remove (repo);
-                        repo = null;
-                        break;
+            for (int i = 0; i < Repositories.Length; i++) {
+                SparkleRepoBase repo = Repositories [i];
+
+                if (repo.Name.Equals (folder_name)) {
+                    repo.Dispose ();
+
+                    lock (this.repo_lock) {
+                        this.repositories.Remove (repo);
                     }
+
+                    repo = null;
+                    break;
                 }
             }
+
         }
 
 
@@ -664,36 +619,24 @@ namespace SparkleShare {
         // folders in the SparkleShare folder
         private void PopulateRepositories ()
         {
-            foreach (string folder_name in SparkleConfig.DefaultConfig.Folders) {
-                string folder_path = new SparkleFolder (folder_name).FullPath;
+            lock (this.repo_lock) {
+                foreach (string folder_name in SparkleConfig.DefaultConfig.Folders) {
+                    string folder_path = new SparkleFolder (folder_name).FullPath;
 
-                if (Directory.Exists (folder_path))
-                    AddRepository (folder_path);
-                else
-                    SparkleConfig.DefaultConfig.RemoveFolder (folder_name);
+                    if (Directory.Exists (folder_path))
+                        AddRepository (folder_path);
+                    else
+                        SparkleConfig.DefaultConfig.RemoveFolder (folder_name);
+                }
             }
 
+            RepositoriesLoaded = true;
+
             if (FolderListChanged != null)
                 FolderListChanged ();
         }
 
 
-        public bool NotificationsEnabled {
-            get {
-                string notifications_enabled =
-                    SparkleConfig.DefaultConfig.GetConfigOption ("notifications");
-
-                if (String.IsNullOrEmpty (notifications_enabled)) {
-                    SparkleConfig.DefaultConfig.SetConfigOption ("notifications", bool.TrueString);
-                    return true;
-
-                } else {
-                    return notifications_enabled.Equals (bool.TrueString);
-                }
-            }
-        } 
-
-
         public void ToggleNotifications () {
             bool notifications_enabled =
                 SparkleConfig.DefaultConfig.GetConfigOption ("notifications")
@@ -725,7 +668,13 @@ namespace SparkleShare {
 
         public void OpenSparkleShareFolder ()
         {
-            OpenSparkleShareFolder ("");
+            OpenFolder (SparkleConfig.DefaultConfig.FoldersPath);
+        }
+
+
+        public void OpenSparkleShareFolder (string name)
+        {
+            OpenFolder (new SparkleFolder (name).FullPath);
         }
 
         
@@ -734,7 +683,7 @@ namespace SparkleShare {
         public void ImportPrivateKey ()
         {
             string keys_path     = Path.GetDirectoryName (SparkleConfig.DefaultConfig.FullPath);
-            string key_file_name = "sparkleshare." + UserEmail + ".key";
+            string key_file_name = "sparkleshare." + CurrentUser.Email + ".key";
             string key_file_path = Path.Combine (keys_path, key_file_name);
 
             if (!File.Exists (key_file_path)) {
@@ -743,6 +692,7 @@ namespace SparkleShare {
                         file_name.EndsWith (".key")) {
 
                         key_file_path = Path.Combine (keys_path, file_name);
+                        break;
                     }
                 }
             }
@@ -756,85 +706,92 @@ namespace SparkleShare {
 
             process.Start ();
             process.WaitForExit ();
-        }
 
+            string pubkey_file_path = key_file_path + ".pub";
 
-        // Looks up the user's name from the global configuration
-        public string UserName
-        {
-            get {
-                return SparkleConfig.DefaultConfig.User.Name;
-            }
+            // Create an easily accessible copy of the public
+            // key in the user's SparkleShare folder
+            if (!File.Exists (pubkey_file_path))
+                File.Copy (pubkey_file_path,
+                    Path.Combine (SparklePath, CurrentUser.Name + "'s key.txt"), true); // Overwriting is allowed
 
-            set {
-                SparkleConfig.DefaultConfig.User = new SparkleUser (value, UserEmail);
-            }
+            ListPrivateKeys ();
         }
 
 
-        // Looks up the user's email from the global configuration
-        public string UserEmail
+        private void ListPrivateKeys ()
         {
-            get {
-                return SparkleConfig.DefaultConfig.User.Email;
-            }
-                    
-            set {
-                SparkleConfig.DefaultConfig.User = new SparkleUser (UserName, value);
-            }
+            Process process = new Process () {
+                EnableRaisingEvents = true
+            };
+
+            process.StartInfo.WorkingDirectory       = SparkleConfig.DefaultConfig.TmpPath;
+            process.StartInfo.UseShellExecute        = false;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.CreateNoWindow         = true;
+
+            process.StartInfo.FileName = "ssh-add";
+            process.StartInfo.Arguments = "-l";
+
+            process.Start ();
+
+            // Reading the standard output HAS to go before
+            // WaitForExit, or it will hang forever on output > 4096 bytes
+            string keys_in_use = process.StandardOutput.ReadToEnd ().Trim ();
+            process.WaitForExit ();
+
+            SparkleHelpers.DebugInfo ("Auth",
+                "The following keys will be available to SparkleShare: " + Environment.NewLine + keys_in_use);
         }
-        
+
 
         // Generates and installs an RSA keypair to identify this system
         public void GenerateKeyPair ()
         {
             string keys_path     = Path.GetDirectoryName (SparkleConfig.DefaultConfig.FullPath);
-            string key_file_name = "sparkleshare." + UserEmail + ".key";
+            string key_file_name = "sparkleshare." + CurrentUser.Email + ".key";
             string key_file_path = Path.Combine (keys_path, key_file_name);
 
             if (File.Exists (key_file_path)) {
-                SparkleHelpers.DebugInfo ("Auth", "Key already exists ('" + key_file_name + "'), " +
-                                          "leaving it untouched");
+                SparkleHelpers.DebugInfo ("Auth", "Keypair exists ('" + key_file_name + "'), leaving it untouched");
                 return;
-            }
 
-            if (!Directory.Exists (keys_path))
-                Directory.CreateDirectory (keys_path);
-
-            if (!File.Exists (key_file_name)) {
-                Process process = new Process () {
-                    EnableRaisingEvents = true
-                };
-                
-                process.StartInfo.WorkingDirectory       = keys_path;
-                process.StartInfo.UseShellExecute        = false;
-                process.StartInfo.RedirectStandardOutput = true;
-                process.StartInfo.FileName               = "ssh-keygen";
-                process.StartInfo.CreateNoWindow         = true;
-
-                // -t is the crypto type
-                // -P is the password (none)
-                // -f is the file name to store the private key in
-                process.StartInfo.Arguments = "-t rsa -P \"\" -f " + key_file_name;
-
-                process.Start ();
-                process.WaitForExit ();
-
-                SparkleHelpers.DebugInfo ("Auth", "Created private key '" + key_file_name + "'");
-                SparkleHelpers.DebugInfo ("Auth", "Created public key  '" + key_file_name + ".pub'");
-
-                // Add some restrictions to what the key can
-                // do when uploaded to the server
-                // string public_key = File.ReadAllText (key_file_path + ".pub");
-                // public_key = "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty " + public_key;
-                // File.WriteAllText (key_file_path + ".pub", public_key);
-
-                // Create an easily accessible copy of the public
-                // key in the user's SparkleShare folder
-                File.Copy (key_file_path + ".pub",
-                    Path.Combine (SparklePath, UserName + "'s key.txt"),
-                    true); // Overwriting is allowed
+            } else {
+                if (!Directory.Exists (keys_path))
+                    Directory.CreateDirectory (keys_path);
             }
+
+            Process process = new Process () {
+                EnableRaisingEvents = true
+            };
+
+            process.StartInfo.WorkingDirectory       = keys_path;
+            process.StartInfo.UseShellExecute        = false;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.FileName               = "ssh-keygen";
+            process.StartInfo.CreateNoWindow         = true;
+
+            string computer_name = System.Net.Dns.GetHostName ();
+
+            if (computer_name.EndsWith (".local"))
+                computer_name = computer_name.Replace (".local", "");
+
+            process.StartInfo.Arguments = "-t rsa " + // crypto type
+                "-P \"\" " + // password (none)
+                "-C \"" + computer_name + "\" " + // key comment
+                "-f " + key_file_name; // file name
+
+            process.Start ();
+            process.WaitForExit ();
+
+            if (process.ExitCode == 0)
+                SparkleHelpers.DebugInfo ("Auth", "Created keypair '" + key_file_name + "'");
+            else
+                SparkleHelpers.DebugInfo ("Auth", "Could not create keypair '" + key_file_name + "'");
+
+            // Create an easily accessible copy of the public
+            // key in the user's SparkleShare folder
+            File.Copy (key_file_path + ".pub", Path.Combine (SparklePath, CurrentUser.Name + "'s link code.txt"), true);
         }
 
 
@@ -846,6 +803,15 @@ namespace SparkleShare {
         // Gets the avatar for a specific email address and size
         public void FetchAvatars (List<string> emails, int size)
         {
+            string fetch_gravatars_option = SparkleConfig.DefaultConfig.GetConfigOption ("fetch_gravatars");
+
+            if (fetch_gravatars_option != null &&
+                fetch_gravatars_option.Equals (bool.FalseString)) {
+
+                SparkleHelpers.DebugInfo ("Avatar", "Not fetching gravatars");
+                return;
+            }
+
             List<string> old_avatars = new List<string> ();
             bool avatar_fetched      = false;
             string avatar_path       = new string [] {
@@ -888,7 +854,7 @@ namespace SparkleShare {
                     // Fetch the avatar
                     byte [] buffer = client.DownloadData (url);
 
-                    // Write the avatar data to a
+                    // Write the avatar data to a file
                     // if not empty
                     if (buffer.Length > 255) {
                         avatar_fetched = true;
@@ -896,11 +862,12 @@ namespace SparkleShare {
                         lock (this.avatar_lock)
                             File.WriteAllBytes (avatar_file_path, buffer);
 
-                        SparkleHelpers.DebugInfo ("Avatar", "Fetched gravatar for " + email);
+                        SparkleHelpers.DebugInfo ("Avatar", "Fetched " + size + "x" + size + " gravatar for " + email);
                     }
 
                   } catch (WebException e) {
-                        SparkleHelpers.DebugInfo ("Avatar", "Failed fetching gravatar for " + email);
+                        SparkleHelpers.DebugInfo ("Avatar",
+                            "Failed fetching " + size + "x" + size + " gravatar for " + email);
 
                         // Stop downloading further avatars if we have no internet access
                         if (e.Status == WebExceptionStatus.Timeout)
@@ -927,21 +894,15 @@ namespace SparkleShare {
                 Path.GetDirectoryName (SparkleConfig.DefaultConfig.FullPath), "icons",
                 size + "x" + size, "status", "avatar-" + email);
 
-            if (File.Exists (avatar_file_path)) {
+            if (File.Exists (avatar_file_path))
                 return avatar_file_path;
-
-            } else {
-                FetchAvatars (email, size);
-
-                if (File.Exists (avatar_file_path))
-                    return avatar_file_path;
-                else
-                    return null;
-            }
+            else
+                return null;
         }
 
 
-        public void FetchFolder (string address, string remote_path, string announcements_url)
+        public void StartFetcher (string address, string required_fingerprint,
+            string remote_path, string announcements_url, bool fetch_prior_history)
         {
             if (announcements_url != null)
                 announcements_url = announcements_url.Trim ();
@@ -950,30 +911,22 @@ namespace SparkleShare {
 
 			if (!Directory.Exists (tmp_path)) {
                 Directory.CreateDirectory (tmp_path);
-                File.SetAttributes (tmp_path, // FIXME: Doesn't seem to be hidden
+                File.SetAttributes (tmp_path,
 					File.GetAttributes (tmp_path) | FileAttributes.Hidden);
             }
 
             string canonical_name = Path.GetFileNameWithoutExtension (remote_path);
             string tmp_folder     = Path.Combine (tmp_path, canonical_name);
-            string backend        = Path.GetExtension (remote_path);
-			
-            if (!string.IsNullOrEmpty (backend)) {
-                backend         = backend.Substring (1);
-                char [] letters = backend.ToCharArray ();
-                letters [0]     = char.ToUpper (letters [0]);
-                backend         = new string (letters);
-
-            } else {
-                backend = "Git";
-            }
+            string backend        = SparkleFetcherBase.GetBackend (remote_path);
 
             try {
                 this.fetcher = (SparkleFetcherBase) Activator.CreateInstance (
                         Type.GetType ("SparkleLib." + backend + ".SparkleFetcher, SparkleLib." + backend),
                             address,
+                            required_fingerprint,
                             remote_path,
-                            tmp_folder
+                            tmp_folder,
+                            fetch_prior_history
                 );
 
             } catch {
@@ -981,73 +934,33 @@ namespace SparkleShare {
                     "Failed to load \"" + backend + "\" backend for \"" + canonical_name + "\"");
 
                 if (FolderFetchError != null)
-                    FolderFetchError (Path.Combine (address, remote_path).Replace (@"\", "/"));
+                    FolderFetchError (
+                        Path.Combine (address, remote_path).Replace (@"\", "/"),
+                        new string [] {"Failed to load \"" + backend + "\" backend for \"" + canonical_name + "\""});
 
                 return;
             }
 
-            bool target_folder_exists = Directory.Exists (
-                Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, canonical_name));
 
-            // Add a numbered suffix to the name if a folder with the same name
-            // already exists. Example: "Folder (2)"
-            int i = 1;
-            while (target_folder_exists) {
-                i++;
-                target_folder_exists = Directory.Exists (
-                    Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, canonical_name + " (" + i + ")"));
-            }
-
-            string target_folder_name = canonical_name;
-            if (i > 1)
-                target_folder_name += " (" + i + ")";
-
-            this.fetcher.Finished += delegate (string [] warnings) {
+            this.fetcher.Finished += delegate (bool repo_is_encrypted, bool repo_is_empty, string [] warnings) {
+                if (repo_is_encrypted && repo_is_empty) {
+                    if (ShowSetupWindowEvent != null)
+                        ShowSetupWindowEvent (PageType.CryptoSetup);
 
-                // Needed to do the moving
-                SparkleHelpers.ClearAttributes (tmp_folder);
-                string target_folder_path = Path.Combine (
-                    SparkleConfig.DefaultConfig.FoldersPath, target_folder_name);
-
-                try {
-                    Directory.Move (tmp_folder, target_folder_path);
+                } else if (repo_is_encrypted) {
+                    if (ShowSetupWindowEvent != null)
+                        ShowSetupWindowEvent (PageType.CryptoPassword);
 
-                    SparkleConfig.DefaultConfig.AddFolder (target_folder_name, this.fetcher.RemoteUrl, backend);
-    
-                    if (!string.IsNullOrEmpty (announcements_url)) {
-                        SparkleConfig.DefaultConfig.SetFolderOptionalAttribute (target_folder_name,
-                            "announcements_url", announcements_url);
-                    }
-
-                    AddRepository (target_folder_path);
-
-                    if (FolderFetched != null)
-                        FolderFetched (this.fetcher.RemoteUrl, warnings);
-
-                    if (FolderListChanged != null)
-                    FolderListChanged ();
-
-                } catch (Exception e) {
-                    SparkleHelpers.DebugInfo ("Controller", "Error moving folder: " + e.Message);
+                } else {
+                    FinishFetcher ();
                 }
-
-                this.fetcher.Dispose ();
-                this.fetcher = null;
-				
-				// TODO: only remove stale repos
-                //if (Directory.Exists (tmp_path))
-                //    Directory.Delete (tmp_path, true);
             };
 
             this.fetcher.Failed += delegate {
                 if (FolderFetchError != null)
-                    FolderFetchError (this.fetcher.RemoteUrl);
+                    FolderFetchError (this.fetcher.RemoteUrl.ToString (), this.fetcher.Errors);
 
-                this.fetcher.Dispose ();
-				this.fetcher = null;
-
-                if (Directory.Exists (tmp_path))
-                    Directory.Delete (tmp_path, true);
+                StopFetcher ();
             };
             
             this.fetcher.ProgressChanged += delegate (double percentage) {
@@ -1061,53 +974,104 @@ namespace SparkleShare {
 
         public void StopFetcher ()
         {
-            if (fetcher != null)
-                fetcher.Stop ();
-        }
+            this.fetcher.Stop ();
 
+            if (Directory.Exists (this.fetcher.TargetFolder)) {
+                try {
+                    Directory.Delete (this.fetcher.TargetFolder, true);
+                    SparkleHelpers.DebugInfo ("Controller",
+                        "Deleted " + this.fetcher.TargetFolder);
 
-        // Checks whether there are any folders syncing and
-        // quits if safe
-        public void TryQuit ()
-        {
-            lock (this.repo_lock) {
-                foreach (SparkleRepoBase repo in Repositories) {
-                    if (repo.Status == SyncStatus.SyncUp   ||
-                        repo.Status == SyncStatus.SyncDown ||
-                        repo.IsBuffering) {
-    
-                        return;
-                    }
+                } catch (Exception e) {
+                    SparkleHelpers.DebugInfo ("Controller",
+                        "Failed to delete " + this.fetcher.TargetFolder + ": " + e.Message);
                 }
             }
-            
-            Quit ();
+
+            this.fetcher.Dispose ();
+            this.fetcher = null;
         }
 
 
-        public virtual void Quit ()
+        public void FinishFetcher (string password)
         {
-            lock (this.repo_lock) {
-                foreach (SparkleRepoBase repo in Repositories)
-                    repo.Dispose ();
+            this.fetcher.EnableFetchedRepoCrypto (password);
+            FinishFetcher ();
+        }
+
+
+        public void FinishFetcher ()
+        {
+            this.fetcher.Complete ();
+            string canonical_name = Path.GetFileNameWithoutExtension (this.fetcher.RemoteUrl.AbsolutePath);
+
+            bool target_folder_exists = Directory.Exists (
+                Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, canonical_name));
+
+            // Add a numbered suffix to the name if a folder with the same name
+            // already exists. Example: "Folder (2)"
+            int suffix = 1;
+            while (target_folder_exists) {
+                suffix++;
+                target_folder_exists = Directory.Exists (
+                    Path.Combine (
+                        SparkleConfig.DefaultConfig.FoldersPath,
+                        canonical_name + " (" + suffix + ")"
+                    )
+                );
             }
 
-            Environment.Exit (0);
+            string target_folder_name = canonical_name;
+
+            if (suffix > 1)
+                target_folder_name += " (" + suffix + ")";
+
+            string target_folder_path = Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, target_folder_name);
+
+            try {
+                SparkleHelpers.ClearAttributes (this.fetcher.TargetFolder);
+                Directory.Move (this.fetcher.TargetFolder, target_folder_path);
+
+                string backend = SparkleFetcherBase.GetBackend (this.fetcher.RemoteUrl.AbsolutePath);
+                SparkleConfig.DefaultConfig.AddFolder (target_folder_name, this.fetcher.RemoteUrl.ToString (), backend);
+
+                if (FolderFetched != null)
+                    FolderFetched (this.fetcher.RemoteUrl.ToString (), this.fetcher.Warnings.ToArray ());
+
+                /* TODO
+                if (!string.IsNullOrEmpty (announcements_url)) {
+                    SparkleConfig.DefaultConfig.SetFolderOptionalAttribute (
+                        target_folder_name, "announcements_url", announcements_url);
+                */
+
+                lock (this.repo_lock) {
+                    AddRepository (target_folder_path);
+                }
+
+                if (FolderListChanged != null)
+                    FolderListChanged ();
+
+                this.fetcher.Dispose ();
+                this.fetcher = null;
+
+            } catch (Exception e) {
+                SparkleHelpers.DebugInfo ("Controller", "Error adding folder: " + e.Message);
+            }
         }
 
 
-        private string [] tango_palette = new string [] {"#eaab00", "#e37222",
-            "#3892ab", "#33c2cb", "#19b271", "#9eab05", "#8599a8", "#9ca696",
-            "#b88454", "#cc0033", "#8f6678", "#8c6cd0", "#796cbf", "#4060af",
-            "#aa9c8f", "#818a8f"};
+        public bool CheckPassword (string password)
+        {
+            return this.fetcher.IsFetchedRepoPasswordCorrect (password);
+        }
+
 
-        private string AssignColor (string s)
+        public virtual void Quit ()
         {
-            string hash    = "0" + GetMD5 (s).Substring (0, 8);
-            string numbers = Regex.Replace (hash, "[a-z]", "");
-            int number     = int.Parse (numbers);
+            foreach (SparkleRepoBase repo in Repositories)
+                repo.Dispose ();
 
-            return this.tango_palette [number % this.tango_palette.Length];
+            Environment.Exit (0);
         }
 
 
@@ -1134,11 +1098,8 @@ namespace SparkleShare {
 
         private string FormatBreadCrumbs (string path_root, string path)
         {
-			path_root = path_root.Replace ("/",
-				Path.DirectorySeparatorChar.ToString ());
-			
-			path = path.Replace ("/",
-				Path.DirectorySeparatorChar.ToString ());
+			path_root = path_root.Replace ("/", Path.DirectorySeparatorChar.ToString ());
+			path = path.Replace ("/", Path.DirectorySeparatorChar.ToString ());
 			
             string link      = "";
             string [] crumbs = path.Split (Path.DirectorySeparatorChar);
@@ -1175,21 +1136,17 @@ namespace SparkleShare {
 
             return link;
         }
-    }
-
-
-    public class ChangeSet : SparkleChangeSet { }
-    
-    
-    // All change sets that happened on a day
-    public class ActivityDay : List <SparkleChangeSet>
-    {
-        public DateTime DateTime;
 
-        public ActivityDay (DateTime date_time)
+        
+        // All change sets that happened on a day
+        private class ActivityDay : List <SparkleChangeSet>
         {
-            DateTime = date_time;
-            DateTime = new DateTime (DateTime.Year, DateTime.Month, DateTime.Day);
+            public DateTime Date;
+    
+            public ActivityDay (DateTime date_time)
+            {
+                Date = new DateTime (date_time.Year, date_time.Month, date_time.Day);
+            }
         }
     }
 }
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
index ea8a248..f9bb5b1 100755
--- a/SparkleShare/SparkleEventLogController.cs
+++ b/SparkleShare/SparkleEventLogController.cs
@@ -72,7 +72,7 @@ namespace SparkleShare {
 
                     // A short delay is less annoying than
                     // a flashing window
-					int delay = 1000;
+					int delay = 500;
 					
                     if (watch.ElapsedMilliseconds < delay)
                         Thread.Sleep (delay - (int) watch.ElapsedMilliseconds);
@@ -155,6 +155,14 @@ namespace SparkleShare {
         public SparkleEventLogController ()
         {
             Program.Controller.ShowEventLogWindowEvent += delegate {
+                if (this.selected_folder == null) {
+                    if (UpdateChooserEvent != null)
+                        UpdateChooserEvent (Folders);
+
+                    if (UpdateContentEvent != null)
+                        UpdateContentEvent (HTML);
+                }
+
                 if (ShowWindowEvent != null)
                     ShowWindowEvent ();
             };
@@ -199,9 +207,11 @@ namespace SparkleShare {
 
         public void LinkClicked (string url)
         {
+            url = url.Replace ("%20", " ");
+        
             if (url.StartsWith (Path.VolumeSeparatorChar.ToString ()) ||
 			    url.Substring (1, 1).Equals (":")) {
-				
+
                 Program.Controller.OpenFile (url);
             }
         }
diff --git a/SparkleShare/SparkleInvite.cs b/SparkleShare/SparkleInvite.cs
index c5c8146..0c287c4 100644
--- a/SparkleShare/SparkleInvite.cs
+++ b/SparkleShare/SparkleInvite.cs
@@ -29,6 +29,7 @@ namespace SparkleShare {
 
         public string Address { get; private set; }
         public string RemotePath { get; private set; }
+        public string Fingerprint { get; private set; }
         public string AcceptUrl { get; private set; }
         public string AnnouncementsUrl { get; private set; }
 
@@ -41,20 +42,6 @@ namespace SparkleShare {
         }
 
 
-        public SparkleInvite (string address, string remote_path,
-            string accept_url)
-        {
-            Initialize (address, remote_path, accept_url, null);
-        }
-
-
-        public SparkleInvite (string address, string remote_path,
-            string accept_url, string announcements_url)
-        {
-            Initialize (address, remote_path, accept_url, announcements_url);
-        }
-
-
         public SparkleInvite (string xml_file_path)
         {
             XmlDocument xml_document = new XmlDocument ();
@@ -64,11 +51,11 @@ namespace SparkleShare {
             string remote_path       = "";
             string accept_url        = "";
             string announcements_url = "";
+            string fingerprint       = "";
 
             try {
                 xml_document.Load (xml_file_path);
 
-                
                 node = xml_document.SelectSingleNode ("/sparkleshare/invite/address/text()");
                 if (node != null) { address = node.Value; }
 
@@ -81,8 +68,10 @@ namespace SparkleShare {
                 node = xml_document.SelectSingleNode ("/sparkleshare/invite/announcements_url/text()");
                 if (node != null) { announcements_url = node.Value; }
 
+                node = xml_document.SelectSingleNode ("/sparkleshare/invite/fingerprint/text()");
+                if (node != null) { fingerprint = node.Value; }
 
-                Initialize (address, remote_path, accept_url, announcements_url);
+                Initialize (address, remote_path, accept_url, announcements_url, fingerprint);
 
             } catch (XmlException e) {
                 SparkleHelpers.DebugInfo ("Invite", "Invalid XML: " + e.Message);
@@ -131,12 +120,13 @@ namespace SparkleShare {
 
 
         private void Initialize (string address, string remote_path,
-            string accept_url, string announcements_url)
+            string accept_url, string announcements_url, string fingerprint)
         {
             Address          = address;
             RemotePath       = remote_path;
             AcceptUrl        = accept_url;
             AnnouncementsUrl = announcements_url;
+            Fingerprint      = fingerprint;
         }
     }
 }
diff --git a/SparkleShare/SparkleOptions.cs b/SparkleShare/SparkleOptions.cs
deleted file mode 100644
index 4e83507..0000000
--- a/SparkleShare/SparkleOptions.cs
+++ /dev/null
@@ -1,1101 +0,0 @@
-//
-// Options.cs
-//
-// Authors:
-//  Jonathan Pryor <jpryor@novell.com>
-//
-// Copyright (C) 2008 Novell (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-// Compile With:
-//   gmcs -debug+ -r:System.Core Options.cs -o:NDesk.Options.dll
-//   gmcs -debug+ -d:LINQ -r:System.Core Options.cs -o:NDesk.Options.dll
-//
-// The LINQ version just changes the implementation of
-// OptionSet.Parse(IEnumerable<string>), and confers no semantic changes.
-
-//
-// A Getopt::Long-inspired option parsing library for C#.
-//
-// NDesk.Options.OptionSet is built upon a key/value table, where the
-// key is a option format string and the value is a delegate that is 
-// invoked when the format string is matched.
-//
-// Option format strings:
-//  Regex-like BNF Grammar: 
-//    name: .+
-//    type: [=:]
-//    sep: ( [^{}]+ | '{' .+ '}' )?
-//    aliases: ( name type sep ) ( '|' name type sep )*
-// 
-// Each '|'-delimited name is an alias for the associated action.  If the
-// format string ends in a '=', it has a required value.  If the format
-// string ends in a ':', it has an optional value.  If neither '=' or ':'
-// is present, no value is supported.  `=' or `:' need only be defined on one
-// alias, but if they are provided on more than one they must be consistent.
-//
-// Each alias portion may also end with a "key/value separator", which is used
-// to split option values if the option accepts > 1 value.  If not specified,
-// it defaults to '=' and ':'.  If specified, it can be any character except
-// '{' and '}' OR the *string* between '{' and '}'.  If no separator should be
-// used (i.e. the separate values should be distinct arguments), then "{}"
-// should be used as the separator.
-//
-// Options are extracted either from the current option by looking for
-// the option name followed by an '=' or ':', or is taken from the
-// following option IFF:
-//  - The current option does not contain a '=' or a ':'
-//  - The current option requires a value (i.e. not a Option type of ':')
-//
-// The `name' used in the option format string does NOT include any leading
-// option indicator, such as '-', '--', or '/'.  All three of these are
-// permitted/required on any named option.
-//
-// Option bundling is permitted so long as:
-//   - '-' is used to start the option group
-//   - all of the bundled options are a single character
-//   - at most one of the bundled options accepts a value, and the value
-//     provided starts from the next character to the end of the string.
-//
-// This allows specifying '-a -b -c' as '-abc', and specifying '-D name=value'
-// as '-Dname=value'.
-//
-// Option processing is disabled by specifying "--".  All options after "--"
-// are returned by OptionSet.Parse() unchanged and unprocessed.
-//
-// Unprocessed options are returned from OptionSet.Parse().
-//
-// Examples:
-//  int verbose = 0;
-//  OptionSet p = new OptionSet ()
-//    .Add ("v", v => ++verbose)
-//    .Add ("name=|value=", v => Console.WriteLine (v));
-//  p.Parse (new string[]{"-v", "--v", "/v", "-name=A", "/name", "B", "extra"});
-//
-// The above would parse the argument string array, and would invoke the
-// lambda expression three times, setting `verbose' to 3 when complete.  
-// It would also print out "A" and "B" to standard output.
-// The returned array would contain the string "extra".
-//
-// C# 3.0 collection initializers are supported and encouraged:
-//  var p = new OptionSet () {
-//    { "h|?|help", v => ShowHelp () },
-//  };
-//
-// System.ComponentModel.TypeConverter is also supported, allowing the use of
-// custom data types in the callback type; TypeConverter.ConvertFromString()
-// is used to convert the value option to an instance of the specified
-// type:
-//
-//  var p = new OptionSet () {
-//    { "foo=", (Foo f) => Console.WriteLine (f.ToString ()) },
-//  };
-//
-// Random other tidbits:
-//  - Boolean options (those w/o '=' or ':' in the option format string)
-//    are explicitly enabled if they are followed with '+', and explicitly
-//    disabled if they are followed with '-':
-//      string a = null;
-//      var p = new OptionSet () {
-//        { "a", s => a = s },
-//      };
-//      p.Parse (new string[]{"-a"});   // sets v != null
-//      p.Parse (new string[]{"-a+"});  // sets v != null
-//      p.Parse (new string[]{"-a-"});  // sets v == null
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Globalization;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Text;
-using System.Text.RegularExpressions;
-
-#if LINQ
-using System.Linq;
-#endif
-
-#if TEST
-using NDesk.Options;
-#endif
-
-#if NDESK_OPTIONS
-namespace NDesk.Options
-#else
-namespace SparkleShare
-#endif
-{
-    public class OptionValueCollection : IList, IList<string> {
-
-        List<string> values = new List<string> ();
-        OptionContext c;
-
-        internal OptionValueCollection (OptionContext c)
-        {
-            this.c = c;
-        }
-
-        #region ICollection
-        void ICollection.CopyTo (Array array, int index)  {(values as ICollection).CopyTo (array, index);}
-        bool ICollection.IsSynchronized                   {get {return (values as ICollection).IsSynchronized;}}
-        object ICollection.SyncRoot                       {get {return (values as ICollection).SyncRoot;}}
-        #endregion
-
-        #region ICollection<T>
-        public void Add (string item)                       {values.Add (item);}
-        public void Clear ()                                {values.Clear ();}
-        public bool Contains (string item)                  {return values.Contains (item);}
-        public void CopyTo (string[] array, int arrayIndex) {values.CopyTo (array, arrayIndex);}
-        public bool Remove (string item)                    {return values.Remove (item);}
-        public int Count                                    {get {return values.Count;}}
-        public bool IsReadOnly                              {get {return false;}}
-        #endregion
-
-        #region IEnumerable
-        IEnumerator IEnumerable.GetEnumerator () {return values.GetEnumerator ();}
-        #endregion
-
-        #region IEnumerable<T>
-        public IEnumerator<string> GetEnumerator () {return values.GetEnumerator ();}
-        #endregion
-
-        #region IList
-        int IList.Add (object value)                {return (values as IList).Add (value);}
-        bool IList.Contains (object value)          {return (values as IList).Contains (value);}
-        int IList.IndexOf (object value)            {return (values as IList).IndexOf (value);}
-        void IList.Insert (int index, object value) {(values as IList).Insert (index, value);}
-        void IList.Remove (object value)            {(values as IList).Remove (value);}
-        void IList.RemoveAt (int index)             {(values as IList).RemoveAt (index);}
-        bool IList.IsFixedSize                      {get {return false;}}
-        object IList.this [int index]               {get {return this [index];} set {(values as IList)[index] = value;}}
-        #endregion
-
-        #region IList<T>
-        public int IndexOf (string item)            {return values.IndexOf (item);}
-        public void Insert (int index, string item) {values.Insert (index, item);}
-        public void RemoveAt (int index)            {values.RemoveAt (index);}
-
-        private void AssertValid (int index)
-        {
-            if (c.Option == null)
-                throw new InvalidOperationException ("OptionContext.Option is null.");
-            if (index >= c.Option.MaxValueCount)
-                throw new ArgumentOutOfRangeException ("index");
-            if (c.Option.OptionValueType == OptionValueType.Required &&
-                    index >= values.Count)
-                throw new OptionException (string.Format (
-                            c.OptionSet.MessageLocalizer ("Missing required value for option '{0}'."), c.OptionName), 
-                        c.OptionName);
-        }
-
-        public string this [int index] {
-            get {
-                AssertValid (index);
-                return index >= values.Count ? null : values [index];
-            }
-            set {
-                values [index] = value;
-            }
-        }
-        #endregion
-
-        public List<string> ToList ()
-        {
-            return new List<string> (values);
-        }
-
-        public string[] ToArray ()
-        {
-            return values.ToArray ();
-        }
-
-        public override string ToString ()
-        {
-            return string.Join (", ", values.ToArray ());
-        }
-    }
-
-    public class OptionContext {
-        private Option                option;
-        private string                name;
-        private int                   index;
-        private OptionSet             set;
-        private OptionValueCollection c;
-
-        public OptionContext (OptionSet set)
-        {
-            this.set = set;
-            this.c   = new OptionValueCollection (this);
-        }
-
-        public Option Option {
-            get {return option;}
-            set {option = value;}
-        }
-
-        public string OptionName { 
-            get {return name;}
-            set {name = value;}
-        }
-
-        public int OptionIndex {
-            get {return index;}
-            set {index = value;}
-        }
-
-        public OptionSet OptionSet {
-            get {return set;}
-        }
-
-        public OptionValueCollection OptionValues {
-            get {return c;}
-        }
-    }
-
-    public enum OptionValueType {
-        None, 
-        Optional,
-        Required,
-    }
-
-    public abstract class Option {
-        string prototype, description;
-        string[] names;
-        OptionValueType type;
-        int count;
-        string[] separators;
-
-        protected Option (string prototype, string description)
-            : this (prototype, description, 1)
-        {
-        }
-
-        protected Option (string prototype, string description, int maxValueCount)
-        {
-            if (prototype == null)
-                throw new ArgumentNullException ("prototype");
-            if (prototype.Length == 0)
-                throw new ArgumentException ("Cannot be the empty string.", "prototype");
-            if (maxValueCount < 0)
-                throw new ArgumentOutOfRangeException ("maxValueCount");
-
-            this.prototype   = prototype;
-            this.names       = prototype.Split ('|');
-            this.description = description;
-            this.count       = maxValueCount;
-            this.type        = ParsePrototype ();
-
-            if (this.count == 0 && type != OptionValueType.None)
-                throw new ArgumentException (
-                        "Cannot provide maxValueCount of 0 for OptionValueType.Required or " +
-                            "OptionValueType.Optional.",
-                        "maxValueCount");
-            if (this.type == OptionValueType.None && maxValueCount > 1)
-                throw new ArgumentException (
-                        string.Format ("Cannot provide maxValueCount of {0} for OptionValueType.None.", maxValueCount),
-                        "maxValueCount");
-            if (Array.IndexOf (names, "<>") >= 0 && 
-                    ((names.Length == 1 && this.type != OptionValueType.None) ||
-                     (names.Length > 1 && this.MaxValueCount > 1)))
-                throw new ArgumentException (
-                        "The default option handler '<>' cannot require values.",
-                        "prototype");
-        }
-
-        public string           Prototype       {get {return prototype;}}
-        public string           Description     {get {return description;}}
-        public OptionValueType  OptionValueType {get {return type;}}
-        public int              MaxValueCount   {get {return count;}}
-
-        public string[] GetNames ()
-        {
-            return (string[]) names.Clone ();
-        }
-
-        public string[] GetValueSeparators ()
-        {
-            if (separators == null)
-                return new string [0];
-            return (string[]) separators.Clone ();
-        }
-
-        protected static T Parse<T> (string value, OptionContext c)
-        {
-            Type tt = typeof (T);
-            bool nullable = tt.IsValueType && tt.IsGenericType && 
-                !tt.IsGenericTypeDefinition && 
-                tt.GetGenericTypeDefinition () == typeof (Nullable<>);
-            Type targetType = nullable ? tt.GetGenericArguments () [0] : typeof (T);
-            TypeConverter conv = TypeDescriptor.GetConverter (targetType);
-            T t = default (T);
-            try {
-                if (value != null)
-                    t = (T) conv.ConvertFromString (value);
-            }
-            catch (Exception e) {
-                throw new OptionException (
-                        string.Format (
-                            c.OptionSet.MessageLocalizer ("Could not convert string `{0}' to type {1} for option `{2}'."),
-                            value, targetType.Name, c.OptionName),
-                        c.OptionName, e);
-            }
-            return t;
-        }
-
-        internal string[] Names           {get {return names;}}
-        internal string[] ValueSeparators {get {return separators;}}
-
-        static readonly char[] NameTerminator = new char[]{'=', ':'};
-
-        private OptionValueType ParsePrototype ()
-        {
-            char type = '\0';
-            List<string> seps = new List<string> ();
-            for (int i = 0; i < names.Length; ++i) {
-                string name = names [i];
-                if (name.Length == 0)
-                    throw new ArgumentException ("Empty option names are not supported.", "prototype");
-
-                int end = name.IndexOfAny (NameTerminator);
-                if (end == -1)
-                    continue;
-                names [i] = name.Substring (0, end);
-                if (type == '\0' || type == name [end])
-                    type = name [end];
-                else 
-                    throw new ArgumentException (
-                            string.Format ("Conflicting option types: '{0}' vs. '{1}'.", type, name [end]),
-                            "prototype");
-                AddSeparators (name, end, seps);
-            }
-
-            if (type == '\0')
-                return OptionValueType.None;
-
-            if (count <= 1 && seps.Count != 0)
-                throw new ArgumentException (
-                        string.Format ("Cannot provide key/value separators for Options taking {0} value(s).", count),
-                        "prototype");
-            if (count > 1) {
-                if (seps.Count == 0)
-                    this.separators = new string[]{":", "="};
-                else if (seps.Count == 1 && seps [0].Length == 0)
-                    this.separators = null;
-                else
-                    this.separators = seps.ToArray ();
-            }
-
-            return type == '=' ? OptionValueType.Required : OptionValueType.Optional;
-        }
-
-        private static void AddSeparators (string name, int end, ICollection<string> seps)
-        {
-            int start = -1;
-            for (int i = end+1; i < name.Length; ++i) {
-                switch (name [i]) {
-                    case '{':
-                        if (start != -1)
-                            throw new ArgumentException (
-                                    string.Format ("Ill-formed name/value separator found in \"{0}\".", name),
-                                    "prototype");
-                        start = i+1;
-                        break;
-                    case '}':
-                        if (start == -1)
-                            throw new ArgumentException (
-                                    string.Format ("Ill-formed name/value separator found in \"{0}\".", name),
-                                    "prototype");
-                        seps.Add (name.Substring (start, i-start));
-                        start = -1;
-                        break;
-                    default:
-                        if (start == -1)
-                            seps.Add (name [i].ToString ());
-                        break;
-                }
-            }
-            if (start != -1)
-                throw new ArgumentException (
-                        string.Format ("Ill-formed name/value separator found in \"{0}\".", name),
-                        "prototype");
-        }
-
-        public void Invoke (OptionContext c)
-        {
-            OnParseComplete (c);
-            c.OptionName  = null;
-            c.Option      = null;
-            c.OptionValues.Clear ();
-        }
-
-        protected abstract void OnParseComplete (OptionContext c);
-
-        public override string ToString ()
-        {
-            return Prototype;
-        }
-    }
-
-    [Serializable]
-    public class OptionException : Exception {
-        private string option;
-
-        public OptionException ()
-        {
-        }
-
-        public OptionException (string message, string optionName)
-            : base (message)
-        {
-            this.option = optionName;
-        }
-
-        public OptionException (string message, string optionName, Exception innerException)
-            : base (message, innerException)
-        {
-            this.option = optionName;
-        }
-
-        protected OptionException (SerializationInfo info, StreamingContext context)
-            : base (info, context)
-        {
-            this.option = info.GetString ("OptionName");
-        }
-
-        public string OptionName {
-            get {return this.option;}
-        }
-
-        [SecurityPermission (SecurityAction.LinkDemand, SerializationFormatter = true)]
-        public override void GetObjectData (SerializationInfo info, StreamingContext context)
-        {
-            base.GetObjectData (info, context);
-            info.AddValue ("OptionName", option);
-        }
-    }
-
-    public delegate void OptionAction<TKey, TValue> (TKey key, TValue value);
-
-    public class OptionSet : KeyedCollection<string, Option>
-    {
-        public OptionSet ()
-            : this (delegate (string f) {return f;})
-        {
-        }
-
-        public OptionSet (Converter<string, string> localizer)
-        {
-            this.localizer = localizer;
-        }
-
-        Converter<string, string> localizer;
-
-        public Converter<string, string> MessageLocalizer {
-            get {return localizer;}
-        }
-
-        protected override string GetKeyForItem (Option item)
-        {
-            if (item == null)
-                throw new ArgumentNullException ("option");
-            if (item.Names != null && item.Names.Length > 0)
-                return item.Names [0];
-            // This should never happen, as it's invalid for Option to be
-            // constructed w/o any names.
-            throw new InvalidOperationException ("Option has no names!");
-        }
-
-        [Obsolete ("Use KeyedCollection.this[string]")]
-        protected Option GetOptionForName (string option)
-        {
-            if (option == null)
-                throw new ArgumentNullException ("option");
-            try {
-                return base [option];
-            }
-            catch (KeyNotFoundException) {
-                return null;
-            }
-        }
-
-        protected override void InsertItem (int index, Option item)
-        {
-            base.InsertItem (index, item);
-            AddImpl (item);
-        }
-
-        protected override void RemoveItem (int index)
-        {
-            base.RemoveItem (index);
-            Option p = Items [index];
-            // KeyedCollection.RemoveItem() handles the 0th item
-            for (int i = 1; i < p.Names.Length; ++i) {
-                Dictionary.Remove (p.Names [i]);
-            }
-        }
-
-        protected override void SetItem (int index, Option item)
-        {
-            base.SetItem (index, item);
-            RemoveItem (index);
-            AddImpl (item);
-        }
-
-        private void AddImpl (Option option)
-        {
-            if (option == null)
-                throw new ArgumentNullException ("option");
-            List<string> added = new List<string> (option.Names.Length);
-            try {
-                // KeyedCollection.InsertItem/SetItem handle the 0th name.
-                for (int i = 1; i < option.Names.Length; ++i) {
-                    Dictionary.Add (option.Names [i], option);
-                    added.Add (option.Names [i]);
-                }
-            }
-            catch (Exception) {
-                foreach (string name in added)
-                    Dictionary.Remove (name);
-                throw;
-            }
-        }
-
-        public new OptionSet Add (Option option)
-        {
-            base.Add (option);
-            return this;
-        }
-
-        sealed class ActionOption : Option {
-            Action<OptionValueCollection> action;
-
-            public ActionOption (string prototype, string description, int count, Action<OptionValueCollection> action)
-                : base (prototype, description, count)
-            {
-                if (action == null)
-                    throw new ArgumentNullException ("action");
-                this.action = action;
-            }
-
-            protected override void OnParseComplete (OptionContext c)
-            {
-                action (c.OptionValues);
-            }
-        }
-
-        public OptionSet Add (string prototype, Action<string> action)
-        {
-            return Add (prototype, null, action);
-        }
-
-        public OptionSet Add (string prototype, string description, Action<string> action)
-        {
-            if (action == null)
-                throw new ArgumentNullException ("action");
-            Option p = new ActionOption (prototype, description, 1, 
-                    delegate (OptionValueCollection v) { action (v [0]); });
-            base.Add (p);
-            return this;
-        }
-
-        public OptionSet Add (string prototype, OptionAction<string, string> action)
-        {
-            return Add (prototype, null, action);
-        }
-
-        public OptionSet Add (string prototype, string description, OptionAction<string, string> action)
-        {
-            if (action == null)
-                throw new ArgumentNullException ("action");
-            Option p = new ActionOption (prototype, description, 2, 
-                    delegate (OptionValueCollection v) {action (v [0], v [1]);});
-            base.Add (p);
-            return this;
-        }
-
-        sealed class ActionOption<T> : Option {
-            Action<T> action;
-
-            public ActionOption (string prototype, string description, Action<T> action)
-                : base (prototype, description, 1)
-            {
-                if (action == null)
-                    throw new ArgumentNullException ("action");
-                this.action = action;
-            }
-
-            protected override void OnParseComplete (OptionContext c)
-            {
-                action (Parse<T> (c.OptionValues [0], c));
-            }
-        }
-
-        sealed class ActionOption<TKey, TValue> : Option {
-            OptionAction<TKey, TValue> action;
-
-            public ActionOption (string prototype, string description, OptionAction<TKey, TValue> action)
-                : base (prototype, description, 2)
-            {
-                if (action == null)
-                    throw new ArgumentNullException ("action");
-                this.action = action;
-            }
-
-            protected override void OnParseComplete (OptionContext c)
-            {
-                action (
-                        Parse<TKey> (c.OptionValues [0], c),
-                        Parse<TValue> (c.OptionValues [1], c));
-            }
-        }
-
-        public OptionSet Add<T> (string prototype, Action<T> action)
-        {
-            return Add (prototype, null, action);
-        }
-
-        public OptionSet Add<T> (string prototype, string description, Action<T> action)
-        {
-            return Add (new ActionOption<T> (prototype, description, action));
-        }
-
-        public OptionSet Add<TKey, TValue> (string prototype, OptionAction<TKey, TValue> action)
-        {
-            return Add (prototype, null, action);
-        }
-
-        public OptionSet Add<TKey, TValue> (string prototype, string description, OptionAction<TKey, TValue> action)
-        {
-            return Add (new ActionOption<TKey, TValue> (prototype, description, action));
-        }
-
-        protected virtual OptionContext CreateOptionContext ()
-        {
-            return new OptionContext (this);
-        }
-
-#if LINQ
-        public List<string> Parse (IEnumerable<string> arguments)
-        {
-            bool process = true;
-            OptionContext c = CreateOptionContext ();
-            c.OptionIndex = -1;
-            var def = GetOptionForName ("<>");
-            var unprocessed = 
-                from argument in arguments
-                where ++c.OptionIndex >= 0 && (process || def != null)
-                    ? process
-                        ? argument == "--" 
-                            ? (process = false)
-                            : !Parse (argument, c)
-                                ? def != null 
-                                    ? Unprocessed (null, def, c, argument) 
-                                    : true
-                                : false
-                        : def != null 
-                            ? Unprocessed (null, def, c, argument)
-                            : true
-                    : true
-                select argument;
-            List<string> r = unprocessed.ToList ();
-            if (c.Option != null)
-                c.Option.Invoke (c);
-            return r;
-        }
-#else
-        public List<string> Parse (IEnumerable<string> arguments)
-        {
-            OptionContext c = CreateOptionContext ();
-            c.OptionIndex = -1;
-            bool process = true;
-            List<string> unprocessed = new List<string> ();
-            Option def = Contains ("<>") ? this ["<>"] : null;
-            foreach (string argument in arguments) {
-                ++c.OptionIndex;
-                if (argument == "--") {
-                    process = false;
-                    continue;
-                }
-                if (!process) {
-                    Unprocessed (unprocessed, def, c, argument);
-                    continue;
-                }
-                if (!Parse (argument, c))
-                    Unprocessed (unprocessed, def, c, argument);
-            }
-            if (c.Option != null)
-                c.Option.Invoke (c);
-            return unprocessed;
-        }
-#endif
-
-        private static bool Unprocessed (ICollection<string> extra, Option def, OptionContext c, string argument)
-        {
-            if (def == null) {
-                extra.Add (argument);
-                return false;
-            }
-            c.OptionValues.Add (argument);
-            c.Option = def;
-            c.Option.Invoke (c);
-            return false;
-        }
-
-        private readonly Regex ValueOption = new Regex (
-            @"^(?<flag>--|-|/)(?<name>[^:=]+)((?<sep>[:=])(?<value>.*))?$");
-
-        protected bool GetOptionParts (string argument, out string flag, out string name, out string sep, out string value)
-        {
-            if (argument == null)
-                throw new ArgumentNullException ("argument");
-
-            flag = name = sep = value = null;
-            Match m = ValueOption.Match (argument);
-            if (!m.Success) {
-                return false;
-            }
-            flag  = m.Groups ["flag"].Value;
-            name  = m.Groups ["name"].Value;
-            if (m.Groups ["sep"].Success && m.Groups ["value"].Success) {
-                sep   = m.Groups ["sep"].Value;
-                value = m.Groups ["value"].Value;
-            }
-            return true;
-        }
-
-        protected virtual bool Parse (string argument, OptionContext c)
-        {
-            if (c.Option != null) {
-                ParseValue (argument, c);
-                return true;
-            }
-
-            string f, n, s, v;
-            if (!GetOptionParts (argument, out f, out n, out s, out v))
-                return false;
-
-            Option p;
-            if (Contains (n)) {
-                p = this [n];
-                c.OptionName = f + n;
-                c.Option     = p;
-                switch (p.OptionValueType) {
-                    case OptionValueType.None:
-                        c.OptionValues.Add (n);
-                        c.Option.Invoke (c);
-                        break;
-                    case OptionValueType.Optional:
-                    case OptionValueType.Required: 
-                        ParseValue (v, c);
-                        break;
-                }
-                return true;
-            }
-            // no match; is it a bool option?
-            if (ParseBool (argument, n, c))
-                return true;
-            // is it a bundled option?
-            if (ParseBundledValue (f, string.Concat (n + s + v), c))
-                return true;
-
-            return false;
-        }
-
-        private void ParseValue (string option, OptionContext c)
-        {
-            if (option != null)
-                foreach (string o in c.Option.ValueSeparators != null 
-                        ? option.Split (c.Option.ValueSeparators, StringSplitOptions.None)
-                        : new string[]{option}) {
-                    c.OptionValues.Add (o);
-                }
-            if (c.OptionValues.Count == c.Option.MaxValueCount || 
-                    c.Option.OptionValueType == OptionValueType.Optional)
-                c.Option.Invoke (c);
-            else if (c.OptionValues.Count > c.Option.MaxValueCount) {
-                throw new OptionException (localizer (string.Format (
-                                "Error: Found {0} option values when expecting {1}.", 
-                                c.OptionValues.Count, c.Option.MaxValueCount)),
-                        c.OptionName);
-            }
-        }
-
-        private bool ParseBool (string option, string n, OptionContext c)
-        {
-            Option p;
-            string rn;
-            if (n.Length >= 1 && (n [n.Length-1] == '+' || n [n.Length-1] == '-') &&
-                    Contains ((rn = n.Substring (0, n.Length-1)))) {
-                p = this [rn];
-                string v = n [n.Length-1] == '+' ? option : null;
-                c.OptionName  = option;
-                c.Option      = p;
-                c.OptionValues.Add (v);
-                p.Invoke (c);
-                return true;
-            }
-            return false;
-        }
-
-        private bool ParseBundledValue (string f, string n, OptionContext c)
-        {
-            if (f != "-")
-                return false;
-            for (int i = 0; i < n.Length; ++i) {
-                Option p;
-                string opt = f + n [i].ToString ();
-                string rn = n [i].ToString ();
-                if (!Contains (rn)) {
-                    if (i == 0)
-                        return false;
-                    throw new OptionException (string.Format (localizer (
-                                    "Cannot bundle unregistered option '{0}'."), opt), opt);
-                }
-                p = this [rn];
-                switch (p.OptionValueType) {
-                    case OptionValueType.None:
-                        Invoke (c, opt, n, p);
-                        break;
-                    case OptionValueType.Optional:
-                    case OptionValueType.Required: {
-                        string v     = n.Substring (i+1);
-                        c.Option     = p;
-                        c.OptionName = opt;
-                        ParseValue (v.Length != 0 ? v : null, c);
-                        return true;
-                    }
-                    default:
-                        throw new InvalidOperationException ("Unknown OptionValueType: " + p.OptionValueType);
-                }
-            }
-            return true;
-        }
-
-        private static void Invoke (OptionContext c, string name, string value, Option option)
-        {
-            c.OptionName  = name;
-            c.Option      = option;
-            c.OptionValues.Add (value);
-            option.Invoke (c);
-        }
-
-        private const int OptionWidth = 29;
-
-        public void WriteOptionDescriptions (TextWriter o)
-        {
-            foreach (Option p in this) {
-                int written = 0;
-                if (!WriteOptionPrototype (o, p, ref written))
-                    continue;
-
-                if (written < OptionWidth)
-                    o.Write (new string (' ', OptionWidth - written));
-                else {
-                    o.WriteLine ();
-                    o.Write (new string (' ', OptionWidth));
-                }
-
-                bool indent = false;
-                string prefix = new string (' ', OptionWidth+2);
-                foreach (string line in GetLines (localizer (GetDescription (p.Description)))) {
-                    if (indent) 
-                        o.Write (prefix);
-                    o.WriteLine (line);
-                    indent = true;
-                }
-            }
-        }
-
-        bool WriteOptionPrototype (TextWriter o, Option p, ref int written)
-        {
-            string[] names = p.Names;
-
-            int i = GetNextOptionIndex (names, 0);
-            if (i == names.Length)
-                return false;
-
-            if (names [i].Length == 1) {
-                Write (o, ref written, "  -");
-                Write (o, ref written, names [0]);
-            }
-            else {
-                Write (o, ref written, "      --");
-                Write (o, ref written, names [0]);
-            }
-
-            for ( i = GetNextOptionIndex (names, i+1); 
-                    i < names.Length; i = GetNextOptionIndex (names, i+1)) {
-                Write (o, ref written, ", ");
-                Write (o, ref written, names [i].Length == 1 ? "-" : "--");
-                Write (o, ref written, names [i]);
-            }
-
-            if (p.OptionValueType == OptionValueType.Optional ||
-                    p.OptionValueType == OptionValueType.Required) {
-                if (p.OptionValueType == OptionValueType.Optional) {
-                    Write (o, ref written, localizer ("["));
-                }
-                Write (o, ref written, localizer ("=" + GetArgumentName (0, p.MaxValueCount, p.Description)));
-                string sep = p.ValueSeparators != null && p.ValueSeparators.Length > 0 
-                    ? p.ValueSeparators [0]
-                    : " ";
-                for (int c = 1; c < p.MaxValueCount; ++c) {
-                    Write (o, ref written, localizer (sep + GetArgumentName (c, p.MaxValueCount, p.Description)));
-                }
-                if (p.OptionValueType == OptionValueType.Optional) {
-                    Write (o, ref written, localizer ("]"));
-                }
-            }
-            return true;
-        }
-
-        static int GetNextOptionIndex (string[] names, int i)
-        {
-            while (i < names.Length && names [i] == "<>") {
-                ++i;
-            }
-            return i;
-        }
-
-        static void Write (TextWriter o, ref int n, string s)
-        {
-            n += s.Length;
-            o.Write (s);
-        }
-
-        private static string GetArgumentName (int index, int maxIndex, string description)
-        {
-            if (description == null)
-                return maxIndex == 1 ? "VALUE" : "VALUE" + (index + 1);
-            string[] nameStart;
-            if (maxIndex == 1)
-                nameStart = new string[]{"{0:", "{"};
-            else
-                nameStart = new string[]{"{" + index + ":"};
-            for (int i = 0; i < nameStart.Length; ++i) {
-                int start, j = 0;
-                do {
-                    start = description.IndexOf (nameStart [i], j);
-                } while (start >= 0 && j != 0 ? description [j++ - 1] == '{' : false);
-                if (start == -1)
-                    continue;
-                int end = description.IndexOf ("}", start);
-                if (end == -1)
-                    continue;
-                return description.Substring (start + nameStart [i].Length, end - start - nameStart [i].Length);
-            }
-            return maxIndex == 1 ? "VALUE" : "VALUE" + (index + 1);
-        }
-
-        private static string GetDescription (string description)
-        {
-            if (description == null)
-                return string.Empty;
-            StringBuilder sb = new StringBuilder (description.Length);
-            int start = -1;
-            for (int i = 0; i < description.Length; ++i) {
-                switch (description [i]) {
-                    case '{':
-                        if (i == start) {
-                            sb.Append ('{');
-                            start = -1;
-                        }
-                        else if (start < 0)
-                            start = i + 1;
-                        break;
-                    case '}':
-                        if (start < 0) {
-                            if ((i+1) == description.Length || description [i+1] != '}')
-                                throw new InvalidOperationException ("Invalid option description: " + description);
-                            ++i;
-                            sb.Append ("}");
-                        }
-                        else {
-                            sb.Append (description.Substring (start, i - start));
-                            start = -1;
-                        }
-                        break;
-                    case ':':
-                        if (start < 0)
-                            goto default;
-                        start = i + 1;
-                        break;
-                    default:
-                        if (start < 0)
-                            sb.Append (description [i]);
-                        break;
-                }
-            }
-            return sb.ToString ();
-        }
-
-        private static IEnumerable<string> GetLines (string description)
-        {
-            if (string.IsNullOrEmpty (description)) {
-                yield return string.Empty;
-                yield break;
-            }
-            int length = 80 - OptionWidth - 1;
-            int start = 0, end;
-            do {
-                end = GetLineEnd (start, length, description);
-                char c = description [end-1];
-                if (char.IsWhiteSpace (c))
-                    --end;
-                bool writeContinuation = end != description.Length && !IsEolChar (c);
-                string line = description.Substring (start, end - start) +
-                        (writeContinuation ? "-" : "");
-                yield return line;
-                start = end;
-                if (char.IsWhiteSpace (c))
-                    ++start;
-                length = 80 - OptionWidth - 2 - 1;
-            } while (end < description.Length);
-        }
-
-        private static bool IsEolChar (char c)
-        {
-            return !char.IsLetterOrDigit (c);
-        }
-
-        private static int GetLineEnd (int start, int length, string description)
-        {
-            int end = System.Math.Min (start + length, description.Length);
-            int sep = -1;
-            for (int i = start; i < end; ++i) {
-                if (description [i] == '\n')
-                    return i+1;
-                if (IsEolChar (description [i]))
-                    sep = i+1;
-            }
-            if (sep == -1 || end == description.Length)
-                return end;
-            return sep;
-        }
-    }
-}
-
diff --git a/SparkleShare/SparklePlugin.cs b/SparkleShare/SparklePlugin.cs
index dc32ed6..ba73a14 100644
--- a/SparkleShare/SparklePlugin.cs
+++ b/SparkleShare/SparklePlugin.cs
@@ -65,6 +65,12 @@ namespace SparkleShare {
             }
         }
 
+        public string Fingerprint {
+            get {
+                return GetValue ("info", "fingerprint");
+            }
+        }
+
         public string Address {
             get {
                 return GetValue ("address", "value");
@@ -94,6 +100,17 @@ namespace SparkleShare {
                 return GetValue ("info", "announcements_url");
             }
         }
+		
+        public bool PathUsesLowerCase {
+            get {
+                string uses_lower_case = GetValue ("path", "uses_lower_case");
+                
+                if (!string.IsNullOrEmpty (uses_lower_case))
+                    return uses_lower_case.Equals (bool.TrueString);
+                else
+                    return false;
+            }
+        }
 
 
         private XmlDocument xml = new XmlDocument ();
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 6a4c82d..8ebc92c 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -26,13 +26,16 @@ using SparkleLib;
 namespace SparkleShare {
 
     public enum PageType {
+        None,
         Setup,
         Add,
         Invite,
         Syncing,
         Error,
         Finished,
-        Tutorial
+        Tutorial,
+        CryptoSetup,
+        CryptoPassword
     }
 
     public enum FieldState {
@@ -58,12 +61,17 @@ namespace SparkleShare {
         public event UpdateSetupContinueButtonEventHandler UpdateSetupContinueButtonEvent;
         public delegate void UpdateSetupContinueButtonEventHandler (bool button_enabled);
 
+        public event UpdateCryptoSetupContinueButtonEventHandler UpdateCryptoSetupContinueButtonEvent;
+        public delegate void UpdateCryptoSetupContinueButtonEventHandler (bool button_enabled);
+
+        public event UpdateCryptoPasswordContinueButtonEventHandler UpdateCryptoPasswordContinueButtonEvent;
+        public delegate void UpdateCryptoPasswordContinueButtonEventHandler (bool button_enabled);
+
         public event UpdateAddProjectButtonEventHandler UpdateAddProjectButtonEvent;
         public delegate void UpdateAddProjectButtonEventHandler (bool button_enabled);
 
         public event ChangeAddressFieldEventHandler ChangeAddressFieldEvent;
-        public delegate void ChangeAddressFieldEventHandler (string text,
-            string example_text, FieldState state);
+        public delegate void ChangeAddressFieldEventHandler (string text, string example_text, FieldState state);
 
         public event ChangePathFieldEventHandler ChangePathFieldEvent;
         public delegate void ChangePathFieldEventHandler (string text, string example_text, FieldState state);
@@ -71,12 +79,14 @@ namespace SparkleShare {
         public readonly List<SparklePlugin> Plugins = new List<SparklePlugin> ();
         public SparklePlugin SelectedPlugin;
 
+        public bool WindowIsOpen { get; private set; }
         public SparkleInvite PendingInvite { get; private set; }
         public int TutorialPageNumber { get; private set; }
         public string PreviousUrl { get; private set; }
         public string PreviousAddress { get; private set; }
         public string PreviousPath { get; private set; }
         public string SyncingFolder { get; private set; }
+        public double ProgressBarPercentage  { get; private set; }
 
 
         public int SelectedPluginIndex {
@@ -87,27 +97,38 @@ namespace SparkleShare {
 
         public string GuessedUserName {
             get {
-                return Program.Controller.UserName;
+                return Program.Controller.CurrentUser.Name;
             }
         }
 
         public string GuessedUserEmail {
             get {
-                if (Program.Controller.UserEmail.Equals ("Unknown"))
+                if (Program.Controller.CurrentUser.Email.Equals ("Unknown"))
                     return "";
                 else
-                    return Program.Controller.UserEmail;
+                    return Program.Controller.CurrentUser.Email;
             }
         }
 
+        public bool FetchPriorHistory {
+            get {
+                return this.fetch_prior_history;
+            }
+        }
 
+        private PageType current_page;
         private string saved_address     = "";
         private string saved_remote_path = "";
         private bool create_startup_item = true;
+        private bool fetch_prior_history = false;
 
 
         public SparkleSetupController ()
         {
+            ChangePageEvent += delegate (PageType page_type, string [] warnings) {
+                this.current_page = page_type;
+            };
+
             TutorialPageNumber = 0;
             PreviousAddress    = "";
             PreviousPath       = "";
@@ -115,21 +136,29 @@ namespace SparkleShare {
             SyncingFolder      = "";
 
             string local_plugins_path = SparklePlugin.LocalPluginsPath;
+            int local_plugins_count   = 0;
 
             // Import all of the plugins
             if (Directory.Exists (local_plugins_path))
                 // Local plugins go first...
-                foreach (string xml_file_path in Directory.GetFiles (local_plugins_path, "*.xml"))
+                foreach (string xml_file_path in Directory.GetFiles (local_plugins_path, "*.xml")) {
                     Plugins.Add (new SparklePlugin (xml_file_path));
+                    local_plugins_count++;
+                }
 
             // ...system plugins after that...
             if (Directory.Exists (Program.Controller.PluginsPath)) {
                 foreach (string xml_file_path in Directory.GetFiles (Program.Controller.PluginsPath, "*.xml")) {
                     // ...and "Own server" at the very top
-                    if (xml_file_path.EndsWith ("own-server.xml"))
+                    if (xml_file_path.EndsWith ("own-server.xml")) {
                         Plugins.Insert (0, new SparklePlugin (xml_file_path));
-                    else
+
+                    } else if (xml_file_path.EndsWith ("ssnet.xml")) {
+                        // Plugins.Insert ((local_plugins_count + 1), new SparklePlugin (xml_file_path)); TODO: Skip this plugin for now
+
+                    } else {
                         Plugins.Add (new SparklePlugin (xml_file_path));
+                    }
                 }
             }
 
@@ -148,7 +177,27 @@ namespace SparkleShare {
 
 
             Program.Controller.ShowSetupWindowEvent += delegate (PageType page_type) {
+                if (page_type == PageType.CryptoSetup || page_type == PageType.CryptoPassword) {
+                    if (ChangePageEvent != null)
+                        ChangePageEvent (page_type, null);
+                    
+                    return;
+                }
+
                 if (PendingInvite != null) {
+                    WindowIsOpen = true;
+
+                    if (ShowWindowEvent != null)
+                        ShowWindowEvent ();
+
+                    return;
+                }
+
+                if (this.current_page == PageType.Syncing ||
+                    this.current_page == PageType.Finished ||
+                    this.current_page == PageType.CryptoSetup ||
+                    this.current_page == PageType.CryptoPassword) {
+
                     if (ShowWindowEvent != null)
                         ShowWindowEvent ();
 
@@ -156,10 +205,24 @@ namespace SparkleShare {
                 }
 
                 if (page_type == PageType.Add) {
-                    if (!Program.Controller.FirstRun && TutorialPageNumber == 0) {
+                    if (WindowIsOpen) {
+                        if (this.current_page == PageType.Error ||
+                            this.current_page == PageType.Finished ||
+                            this.current_page == PageType.None) {
+                            
+                            if (ChangePageEvent != null)
+                                ChangePageEvent (PageType.Add, null);
+                        }
+
+                        if (ShowWindowEvent != null)
+                            ShowWindowEvent ();
+
+                    } else if (!Program.Controller.FirstRun && TutorialPageNumber == 0) {
                         if (ChangePageEvent != null)
-                            ChangePageEvent (page_type, null);
-                        
+                            ChangePageEvent (PageType.Add, null);
+
+                        WindowIsOpen = true;
+
                         if (ShowWindowEvent != null)
                             ShowWindowEvent ();
                     }
@@ -167,6 +230,8 @@ namespace SparkleShare {
                     return;
                 }
 
+                WindowIsOpen = true;
+
                 if (ChangePageEvent != null)
                     ChangePageEvent (page_type, null);
 
@@ -184,6 +249,10 @@ namespace SparkleShare {
             PreviousPath    = "";
             PreviousUrl     = "";
 
+            this.fetch_prior_history = false;
+
+            WindowIsOpen = false;
+
             if (HideWindowEvent != null)
                 HideWindowEvent ();
         }
@@ -194,8 +263,8 @@ namespace SparkleShare {
             full_name = full_name.Trim ();
             email     = email.Trim ();
 
-            bool fields_valid = full_name != null && full_name.Trim().Length > 0 &&
-                IsValidEmail (email);
+            bool fields_valid = (!string.IsNullOrEmpty (full_name) &&
+                                 IsValidEmail (email));
 
             if (UpdateSetupContinueButtonEvent != null)
                 UpdateSetupContinueButtonEvent (fields_valid);
@@ -210,11 +279,14 @@ namespace SparkleShare {
         
         public void SetupPageCompleted (string full_name, string email)
         {
-            Program.Controller.UserName  = full_name;
-            Program.Controller.UserEmail = email;
+            Program.Controller.CurrentUser = new SparkleUser (full_name, email);
 
-            Program.Controller.GenerateKeyPair ();
-            Program.Controller.ImportPrivateKey ();
+            new Thread (
+                new ThreadStart (delegate {
+                    Program.Controller.GenerateKeyPair ();
+                    Program.Controller.ImportPrivateKey ();
+                })
+            ).Start ();
 
             TutorialPageNumber = 1;
 
@@ -232,9 +304,9 @@ namespace SparkleShare {
         }
 
 
-        public void StartupItemChanged (bool create_startup_item)
+        public void HistoryItemChanged (bool fetch_prior_history)
         {
-            this.create_startup_item = create_startup_item;
+            this.fetch_prior_history = fetch_prior_history;
         }
 
 
@@ -245,6 +317,8 @@ namespace SparkleShare {
             if (TutorialPageNumber == 5) {
                 TutorialPageNumber = 0;
 
+                WindowIsOpen = false;
+
                 if (HideWindowEvent != null)
                     HideWindowEvent ();
 
@@ -290,6 +364,12 @@ namespace SparkleShare {
         }
 
 
+        public void StartupItemChanged (bool create_startup_item)
+        {
+            this.create_startup_item = create_startup_item;
+        }
+
+
         public void CheckAddPage (string address, string remote_path, int selected_plugin)
         {
             address     = address.Trim ();
@@ -300,10 +380,9 @@ namespace SparkleShare {
 
             this.saved_remote_path = remote_path;
 
-            bool fields_valid = (address != null &&
-                                 address.Trim ().Length > 0 &&
-                                 remote_path != null &&
-                                 remote_path.Trim ().Length > 0);
+            bool fields_valid = (!string.IsNullOrEmpty (address) &&
+                                 !string.IsNullOrEmpty (remote_path) &&
+                                 !remote_path.Contains ("\""));
 
             if (UpdateAddProjectButtonEvent != null)
                 UpdateAddProjectButtonEvent (fields_valid);
@@ -312,22 +391,32 @@ namespace SparkleShare {
 
         public void AddPageCompleted (string address, string remote_path)
         {
+            SyncingFolder         = Path.GetFileNameWithoutExtension (remote_path);
+            ProgressBarPercentage = 1.0;
+
+            if (ChangePageEvent != null)
+                ChangePageEvent (PageType.Syncing, null);
+
             address     = address.Trim ();
             remote_path = remote_path.Trim ();
             remote_path = remote_path.TrimEnd ("/".ToCharArray ());
-			
-            SyncingFolder   = Path.GetFileNameWithoutExtension (remote_path);
+
+            if (SelectedPlugin.PathUsesLowerCase)
+                remote_path = remote_path.ToLower ();
+
             PreviousAddress = address;
             PreviousPath    = remote_path;
 
-            if (ChangePageEvent != null)
-                ChangePageEvent (PageType.Syncing, null);
-
             Program.Controller.FolderFetched    += AddPageFetchedDelegate;
             Program.Controller.FolderFetchError += AddPageFetchErrorDelegate;
             Program.Controller.FolderFetching   += SyncingPageFetchingDelegate;
 
-            Program.Controller.FetchFolder (address, remote_path, SelectedPlugin.AnnouncementsUrl);
+            new Thread (
+                new ThreadStart (delegate {
+                    Program.Controller.StartFetcher (address, SelectedPlugin.Fingerprint, remote_path,
+                        SelectedPlugin.AnnouncementsUrl, this.fetch_prior_history);
+                })
+            ).Start ();
         }
 
         // The following private methods are
@@ -347,7 +436,7 @@ namespace SparkleShare {
                     string address = remote_url.Replace (uri.AbsolutePath, "");
     
                     new_plugin = SparklePlugin.Create (
-                        uri.Host, address, address, "", "", "");
+                        uri.Host, address, address, "", "", "/path/to/project");
     
                     if (new_plugin != null) {
                         Plugins.Insert (1, new_plugin);
@@ -367,13 +456,13 @@ namespace SparkleShare {
             Program.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
         }
 
-        private void AddPageFetchErrorDelegate (string remote_url)
+        private void AddPageFetchErrorDelegate (string remote_url, string [] errors)
         {
             SyncingFolder = "";
             PreviousUrl   = remote_url;
-
+           
             if (ChangePageEvent != null)
-                ChangePageEvent (PageType.Error, null);
+                ChangePageEvent (PageType.Error, errors);
 
             Program.Controller.FolderFetched    -= AddPageFetchedDelegate;
             Program.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
@@ -382,8 +471,10 @@ namespace SparkleShare {
 
         private void SyncingPageFetchingDelegate (double percentage)
         {
+            ProgressBarPercentage = percentage;
+
             if (UpdateProgressBarEvent != null)
-                UpdateProgressBarEvent (percentage);
+                UpdateProgressBarEvent (ProgressBarPercentage);
         }
 
 
@@ -407,8 +498,8 @@ namespace SparkleShare {
             Program.Controller.FolderFetchError += InvitePageFetchErrorDelegate;
             Program.Controller.FolderFetching   += SyncingPageFetchingDelegate;
 
-            Program.Controller.FetchFolder (PendingInvite.Address,
-                PendingInvite.RemotePath, PendingInvite.AnnouncementsUrl);
+            Program.Controller.StartFetcher (PendingInvite.Address, PendingInvite.Fingerprint,
+                PendingInvite.RemotePath, PendingInvite.AnnouncementsUrl, false); // TODO: checkbox on invite page
         }
 
         // The following private methods are
@@ -427,13 +518,13 @@ namespace SparkleShare {
             Program.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
         }
 
-        private void InvitePageFetchErrorDelegate (string remote_url)
+        private void InvitePageFetchErrorDelegate (string remote_url, string [] errors)
         {
             SyncingFolder = "";
             PreviousUrl   = remote_url;
 
             if (ChangePageEvent != null)
-                ChangePageEvent (PageType.Error, null);
+                ChangePageEvent (PageType.Error, errors);
 
             Program.Controller.FolderFetched    -= AddPageFetchedDelegate;
             Program.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
@@ -464,6 +555,52 @@ namespace SparkleShare {
         }
 
 
+        public void CheckCryptoSetupPage (string password)
+        {
+            bool valid_password = (password.Length > 0 && !password.Contains (" "));
+
+            if (UpdateCryptoSetupContinueButtonEvent != null)
+                UpdateCryptoSetupContinueButtonEvent (valid_password);
+        }
+
+
+        public void CheckCryptoPasswordPage (string password)
+        {
+            bool password_correct = Program.Controller.CheckPassword (password);
+
+            if (UpdateCryptoPasswordContinueButtonEvent != null)
+                UpdateCryptoPasswordContinueButtonEvent (password_correct);
+        }
+
+
+        public void CryptoPageCancelled ()
+        {
+            SyncingCancelled ();
+        }
+
+
+        public void CryptoSetupPageCompleted (string password)
+        {
+            CryptoPasswordPageCompleted (password);
+        }
+
+
+        public void CryptoPasswordPageCompleted (string password)
+        {
+            ProgressBarPercentage = 100.0;
+
+            if (ChangePageEvent != null)
+                ChangePageEvent (PageType.Syncing, null);
+
+            new Thread (
+                new ThreadStart (delegate {
+                    Thread.Sleep (1000);
+                    Program.Controller.FinishFetcher (password);
+                })
+            ).Start ();
+        }
+
+
         public void OpenFolderClicked ()
         {
             Program.Controller.OpenSparkleShareFolder (
@@ -479,11 +616,14 @@ namespace SparkleShare {
             PreviousUrl     = "";
             PreviousAddress = "";
             PreviousPath    = "";
+            this.fetch_prior_history = false;
 
-            Program.Controller.UpdateState ();
+            this.current_page = PageType.None;
 
             if (HideWindowEvent != null)
                 HideWindowEvent ();
+
+            Program.Controller.UpdateState ();
         }
 
 
diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
index f2f53b2..91d5605 100755
--- a/SparkleShare/SparkleStatusIconController.cs
+++ b/SparkleShare/SparkleStatusIconController.cs
@@ -17,6 +17,9 @@
 
 using System;
 using System.IO;
+using System.Timers;
+
+using Threading = System.Threading;
 
 using SparkleLib;
 
@@ -33,37 +36,63 @@ namespace SparkleShare {
 
     public class SparkleStatusIconController {
 
-        public delegate void UpdateStatusLineEventHandler ();
+        public event UpdateIconEventHandler UpdateIconEvent;
+        public delegate void UpdateIconEventHandler (int icon_frame);
 
         public event UpdateMenuEventHandler UpdateMenuEvent;
         public delegate void UpdateMenuEventHandler (IconState state);
 
+        public event UpdateStatusItemEventHandler UpdateStatusItemEvent;
+        public delegate void UpdateStatusItemEventHandler (string state_text);
+
         public event UpdateQuitItemEventHandler UpdateQuitItemEvent;
         public delegate void UpdateQuitItemEventHandler (bool quit_item_enabled);
 
+        public event UpdateOpenRecentEventsItemEventHandler UpdateOpenRecentEventsItemEvent;
+        public delegate void UpdateOpenRecentEventsItemEventHandler (bool open_recent_events_item_enabled);
+
         public IconState CurrentState = IconState.Idle;
+        public string StateText = "Welcome to SparkleShare!";
+
+
+        public readonly int MenuOverFlowThreshold   = 9;
+        public readonly int MinSubmenuOverflowCount = 3;
+
 
         public string [] Folders {
             get {
-                return Program.Controller.Folders.ToArray ();
+                int overflow_count = (Program.Controller.Folders.Count - MenuOverFlowThreshold);
+
+                if (overflow_count >= MinSubmenuOverflowCount)
+                    return Program.Controller.Folders.GetRange (0, MenuOverFlowThreshold).ToArray ();
+                else
+                    return Program.Controller.Folders.ToArray ();
+            }
+        }
+
+        public string [] OverflowFolders {
+            get {
+                int overflow_count = (Program.Controller.Folders.Count - MenuOverFlowThreshold);
+
+                if (overflow_count >= MinSubmenuOverflowCount)
+                    return Program.Controller.Folders.GetRange (MenuOverFlowThreshold, overflow_count).ToArray ();
+                else
+                    return new string [0];
             }
         }
 
+
         public string FolderSize {
             get {
                 double size = 0;
 
-                foreach (SparkleRepoBase repo in
-                         Program.Controller.Repositories.GetRange (
-                             0, Program.Controller.Repositories.Count)) {
-
-                    size += repo.Size + repo.HistorySize;
-                }
+                foreach (SparkleRepoBase repo in Program.Controller.Repositories)
+                    size += repo.Size;
 
                 if (size == 0)
                     return "";
                 else
-                    return " — " + Program.Controller.FormatSize (size);
+                    return "— " + Program.Controller.FormatSize (size);
             }
         }
 
@@ -87,21 +116,64 @@ namespace SparkleShare {
             }
         }
 
+        public bool OpenRecentEventsItemEnabled {
+            get {
+                return (Program.Controller.RepositoriesLoaded &&
+                        Program.Controller.Folders.Count > 0);
+            }
+        }
+
+
+
+        private Timer animation;
+        private int animation_frame_number;
+
 
         public SparkleStatusIconController ()
         {
+            InitAnimation ();
+
             Program.Controller.FolderListChanged += delegate {
+                if (CurrentState != IconState.Error) {
+                    CurrentState = IconState.Idle;
+
+                    if (Program.Controller.Folders.Count == 0)
+                        StateText = "Welcome to SparkleShare!";
+                    else
+                        StateText = "Files up to date " + FolderSize;
+                }
+
+                if (UpdateStatusItemEvent != null)
+                    UpdateStatusItemEvent (StateText);
+
+                if (UpdateOpenRecentEventsItemEvent != null)
+                    UpdateOpenRecentEventsItemEvent (OpenRecentEventsItemEnabled);
+
                 if (UpdateMenuEvent != null)
                     UpdateMenuEvent (CurrentState);
             };
 
             Program.Controller.OnIdle += delegate {
-                if (CurrentState != IconState.Error)
+                if (CurrentState != IconState.Error) {
                     CurrentState = IconState.Idle;
 
+                    if (Program.Controller.Folders.Count == 0)
+                        StateText = "Welcome to SparkleShare!";
+                    else
+                        StateText = "Files up to date " + FolderSize;
+                }
+
                 if (UpdateQuitItemEvent != null)
                     UpdateQuitItemEvent (QuitItemEnabled);
 
+                if (UpdateStatusItemEvent != null)
+                    UpdateStatusItemEvent (StateText);
+
+                this.animation.Stop ();
+
+                if (UpdateIconEvent != null)
+                    UpdateIconEvent (0);
+
                 if (UpdateMenuEvent != null)
                     UpdateMenuEvent (CurrentState);
             };
@@ -110,10 +182,7 @@ namespace SparkleShare {
 				int repos_syncing_up   = 0;
 				int repos_syncing_down = 0;
 				
-				foreach (SparkleRepoBase repo in
-				         Program.Controller.Repositories.GetRange (
-				         	0, Program.Controller.Repositories.Count)) {
-					
+				foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
 					if (repo.Status == SyncStatus.SyncUp)
 						repos_syncing_up++;
 					
@@ -125,29 +194,42 @@ namespace SparkleShare {
 				    repos_syncing_down > 0) {
 					
 					CurrentState = IconState.Syncing;
+                    StateText    = "Syncing changes…";
 				
 				} else if (repos_syncing_down == 0) {
 					CurrentState = IconState.SyncingUp;
+                    StateText    = "Sending changes…";
 					
 				} else {
 					CurrentState = IconState.SyncingDown;
+                    StateText    = "Receiving changes…";
 				}
 
+                StateText += " " + ProgressPercentage + "%  " + ProgressSpeed;
+
+                if (UpdateStatusItemEvent != null)
+                    UpdateStatusItemEvent (StateText);
+
                 if (UpdateQuitItemEvent != null)
                     UpdateQuitItemEvent (QuitItemEnabled);
 
-                if (UpdateMenuEvent != null)
-                    UpdateMenuEvent (CurrentState);
+                this.animation.Start ();
             };
 
             Program.Controller.OnError += delegate {
                 CurrentState = IconState.Error;
+                StateText    = "Failed to send some changes";
 
                 if (UpdateQuitItemEvent != null)
                     UpdateQuitItemEvent (QuitItemEnabled);
 
-                if (UpdateMenuEvent != null)
-                    UpdateMenuEvent (CurrentState);
+                if (UpdateStatusItemEvent != null)
+                    UpdateStatusItemEvent (StateText);
+
+                this.animation.Stop ();
+
+                if (UpdateIconEvent != null)
+                    UpdateIconEvent (-1);
             };
         }
 
@@ -172,7 +254,11 @@ namespace SparkleShare {
 
         public void OpenRecentEventsClicked ()
         {
-            Program.Controller.ShowEventLogWindow ();
+            new Threading.Thread (
+                new Threading.ThreadStart (delegate {
+                    Program.Controller.ShowEventLogWindow ();
+                })
+            ).Start ();
         }
 
 
@@ -186,5 +272,25 @@ namespace SparkleShare {
         {
             Program.Controller.Quit ();
         }
+
+
+        private void InitAnimation ()
+        {
+            this.animation_frame_number = 0;
+
+            this.animation = new Timer () {
+                Interval = 40
+            };
+
+            this.animation.Elapsed += delegate {
+                if (this.animation_frame_number < 4)
+                    this.animation_frame_number++;
+                else
+                    this.animation_frame_number = 0;
+
+                if (UpdateIconEvent != null)
+                    UpdateIconEvent (this.animation_frame_number);
+            };
+        }
     }
 }
diff --git a/aclocal.m4 b/aclocal.m4
index 20c8abf..cd62ef4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,296 +14,12 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
-dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
-AC_DEFUN([GNOME_DOC_DEFINES],
-[
-AC_ARG_WITH([help-dir],
-  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-  [with_help_dir='${datadir}/gnome/help'])
-HELP_DIR="$with_help_dir"
-AC_SUBST(HELP_DIR)
-
-AC_ARG_WITH([omf-dir],
-  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-  [with_omf_dir='${datadir}/omf'])
-OMF_DIR="$with_omf_dir"
-AC_SUBST(OMF_DIR)
-
-AC_ARG_WITH([help-formats],
-  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-  [with_help_formats=''])
-DOC_USER_FORMATS="$with_help_formats"
-AC_SUBST(DOC_USER_FORMATS)
-
-AC_ARG_ENABLE([scrollkeeper],
-	[AC_HELP_STRING([--disable-scrollkeeper],
-			[do not make updates to the scrollkeeper database])],,
-	enable_scrollkeeper=yes)
-AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
-
-dnl disable scrollkeeper automatically for distcheck
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
-AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
-])
-
-# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-#
-AC_DEFUN([GNOME_DOC_INIT],
-[AC_REQUIRE([AC_PROG_LN_S])dnl
-
-ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-
-AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
-PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-	[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-
-if test "$gdu_cv_have_gdu" = "yes"; then
-	AC_MSG_RESULT([yes])
-	ifelse([$2],,[:],[$2])
-else
-	AC_MSG_RESULT([no])
-	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
-fi
-
-GNOME_DOC_DEFINES
-])
-
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
 # 
@@ -463,12 +180,15 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -478,7 +198,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -494,19 +214,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.5])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -588,268 +310,6 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 10
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -989,12 +449,15 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -1034,8 +497,8 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +518,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -1071,58 +534,6 @@ AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
@@ -1166,12 +577,15 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -1194,13 +608,14 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -1208,13 +623,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1225,12 +640,14 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_RUN_LOG(COMMAND)
 # -------------------
 # Run COMMAND, save the exit status in ac_status, and log it.
@@ -1307,12 +724,14 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -1335,13 +754,13 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -1350,13 +769,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1378,10 +797,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
@@ -1452,7 +872,6 @@ AC_SUBST([am__untar])
 
 m4_include([build/m4/shave/shave.m4])
 m4_include([build/m4/shamrock/expansions.m4])
-m4_include([build/m4/shamrock/gnome-doc.m4])
 m4_include([build/m4/shamrock/mono.m4])
 m4_include([build/m4/shamrock/nunit.m4])
 m4_include([build/m4/shamrock/programs.m4])
diff --git a/build/Makefile.in b/build/Makefile.in
index 1a9228f..9f49c26 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,7 +53,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -58,6 +74,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -94,7 +115,6 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -105,50 +125,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -158,8 +159,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -171,8 +170,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -189,20 +186,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -453,13 +445,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -494,10 +483,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/build/icon-theme-installer b/build/icon-theme-installer
index 0260788..bf04939 100755
--- a/build/icon-theme-installer
+++ b/build/icon-theme-installer
@@ -124,11 +124,21 @@ for icon in $@; do
 
 	if test -z $size; then 
 		size=scalable;
+		
+		if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then
+			install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$category/$size
+	    else
+    		install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category
+    	fi
 	else
-		size=${size}x${size};
+		if [[ "${INSTALL_BASE_DIR}" == *ubuntu-mono-* ]]; then
+			install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$category/$size
+		else
+			size=${size}x${size};
+			install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category
+		fi	
 	fi
-	
-	install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category
+
 	install_path=$install_dir/$install_name
 	
 	if test "x$INSTALL" = "xyes"; then
diff --git a/build/m4/Makefile.in b/build/m4/Makefile.in
index 9b7e665..a8c86ed 100644
--- a/build/m4/Makefile.in
+++ b/build/m4/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,7 +53,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
 	$(top_srcdir)/build/m4/shamrock/expansions.m4 \
-	$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
 	$(top_srcdir)/build/m4/shamrock/mono.m4 \
 	$(top_srcdir)/build/m4/shamrock/nunit.m4 \
 	$(top_srcdir)/build/m4/shamrock/programs.m4 \
@@ -51,10 +67,14 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
@@ -65,50 +85,31 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
 GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
 GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
 GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
-GMSGFMT = @GMSGFMT@
-GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
-GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
 GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
 GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
 GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
 GTKSHARP_LIBS = @GTKSHARP_LIBS@
 GUISUBDIRS = @GUISUBDIRS@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
@@ -118,8 +119,6 @@ MKDIR_P = @MKDIR_P@
 MONO = @MONO@
 MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
 MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
 NAUTILUS3_PYTHON_CFLAGS = @NAUTILUS3_PYTHON_CFLAGS@
 NAUTILUS3_PYTHON_LIBS = @NAUTILUS3_PYTHON_LIBS@
 NAUTILUS_PREFIX = @NAUTILUS_PREFIX@
@@ -131,8 +130,6 @@ NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
 NUNIT_LIBS = @NUNIT_LIBS@
 OBJC = @OBJC@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -149,20 +146,15 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 V = @V@
 VERSION = @VERSION@
 WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
 WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
-XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -297,10 +289,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/config.guess b/config.guess
index dc84c68..d622a44 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2009-11-20'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -56,8 +54,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -394,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +482,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +496,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +553,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +596,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +732,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +771,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,13 +790,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -803,15 +804,18 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -857,6 +861,13 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -866,7 +877,7 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -878,20 +889,29 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -933,7 +953,7 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -959,7 +979,7 @@ EOF
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -967,14 +987,17 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1006,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1019,7 +1042,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1047,13 +1070,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1111,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1155,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1184,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1230,6 +1253,9 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1275,13 +1301,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1299,6 +1325,9 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1321,11 +1350,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff --git a/config.sub b/config.sub
index 2a55a50..6205f84 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2009-11-20'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -75,8 +73,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,13 +122,18 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -156,8 +160,8 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -173,10 +177,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -221,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -245,17 +255,22 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -281,29 +296,39 @@ case $basic_machine in
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -313,6 +338,21 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -327,21 +367,25 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -367,25 +411,29 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -410,7 +458,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -480,11 +528,20 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -516,7 +573,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -674,7 +731,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -732,7 +788,7 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -771,10 +827,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -839,6 +903,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -921,9 +991,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1017,6 +1088,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1073,20 +1147,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1156,6 +1218,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1253,11 +1318,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1293,8 +1358,9 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1407,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1390,7 +1456,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1435,6 +1501,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1457,10 +1525,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1472,8 +1540,20 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1493,14 +1573,11 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1527,7 +1604,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff --git a/configure b/configure
index 473f59d..d509456 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for SparkleShare 0.8.4.
+# Generated by GNU Autoconf 2.69 for SparkleShare 0.9.0.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -211,21 +235,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -327,6 +355,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -448,6 +484,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -482,16 +522,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -503,28 +543,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -556,14 +576,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='SparkleShare'
 PACKAGE_TARNAME='sparkleshare'
-PACKAGE_VERSION='0.8.4'
-PACKAGE_STRING='SparkleShare 0.8.4'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='SparkleShare 0.9.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
 Q
 V
@@ -571,6 +589,7 @@ OBJC
 F77
 FC
 CXX
+CC
 LIBTOOL
 SED
 AM_MAKEFLAGS
@@ -597,8 +616,6 @@ APP_INDICATOR_LIBS
 APP_INDICATOR_CFLAGS
 WEBKIT_SHARP_LIBS
 WEBKIT_SHARP_CFLAGS
-ENABLE_GTKUI_FALSE
-ENABLE_GTKUI_TRUE
 ENABLE_ATK_FALSE
 ENABLE_ATK_TRUE
 GTKSHARP_A11Y_LIBS
@@ -623,69 +640,11 @@ MCS
 MONO
 MONO_MODULE_LIBS
 MONO_MODULE_CFLAGS
-HAVE_GNOME_DOC_UTILS_FALSE
-HAVE_GNOME_DOC_UTILS_TRUE
-DISTCHECK_CONFIGURE_FLAGS
-DOC_USER_FORMATS
-OMF_DIR
-HELP_DIR
-LN_S
-ENABLE_SK_FALSE
-ENABLE_SK_TRUE
-GNOME_DOC_UTILS_LIBS
-GNOME_DOC_UTILS_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 expanded_datadir
 expanded_bindir
 expanded_libdir
-GETTEXT_PACKAGE
-DATADIRNAME
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-ALL_LINGUAS
-INTLTOOL_PERL
-GMSGFMT
-MSGFMT
-MSGMERGE
-XGETTEXT
-INTLTOOL_POLICY_RULE
-INTLTOOL_SERVICE_RULE
-INTLTOOL_THEME_RULE
-INTLTOOL_SCHEMAS_RULE
-INTLTOOL_CAVES_RULE
-INTLTOOL_XML_NOMERGE_RULE
-INTLTOOL_XML_RULE
-INTLTOOL_KBD_RULE
-INTLTOOL_XAM_RULE
-INTLTOOL_UI_RULE
-INTLTOOL_SOUNDLIST_RULE
-INTLTOOL_SHEET_RULE
-INTLTOOL_SERVER_RULE
-INTLTOOL_PONG_RULE
-INTLTOOL_OAF_RULE
-INTLTOOL_PROP_RULE
-INTLTOOL_KEYS_RULE
-INTLTOOL_DIRECTORY_RULE
-INTLTOOL_DESKTOP_RULE
-INTLTOOL_EXTRACT
-INTLTOOL_MERGE
-INTLTOOL_UPDATE
-USE_NLS
 ACLOCAL_AMFLAGS
 PKG_CONFIG
 ASM_VERSION
@@ -757,16 +716,8 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
-enable_nls
-enable_dependency_tracking
-enable_user_help
-with_help_dir
-with_omf_dir
-with_help_formats
-enable_scrollkeeper
 enable_debug
 enable_release
-enable_gtkui
 enable_appindicator
 enable_tests
 enable_nautilus_extension
@@ -775,16 +726,9 @@ enable_shave
       ac_precious_vars='build_alias
 host_alias
 target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
-GNOME_DOC_UTILS_CFLAGS
-GNOME_DOC_UTILS_LIBS
 MONO_MODULE_CFLAGS
 MONO_MODULE_LIBS
 NOTIFY_SHARP_CFLAGS
@@ -1262,8 +1206,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1349,7 +1291,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures SparkleShare 0.8.4 to adapt to many kinds of systems.
+\`configure' configures SparkleShare 0.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1415,7 +1357,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of SparkleShare 0.8.4:";;
+     short | recursive ) echo "Configuration of SparkleShare 0.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1425,14 +1367,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --disable-nls           do not use Native Language Support
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-user-help      Enable building the user-help [[default=auto]]
-  --disable-scrollkeeper  do not make updates to the scrollkeeper database
   --enable-debug          Use 'DEBUG' Configuration [default=YES]
   --enable-release        Use 'RELEASE' Configuration [default=NO]
-  --disable-gtkui         Do not build the Gtk+ user interface
   --enable-appindicator=[no/auto/yes]
                           Build support for application indicators
   --enable-tests          Enable NUnit tests
@@ -1440,31 +1376,12 @@ Optional Features:
                           Do not install the Nautilus plugin
   --enable-shave          use shave to make the build pretty [[default=yes]]
 
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-help-dir=DIR     path to help docs
-  --with-omf-dir=DIR      path to OMF files
-  --with-help-formats=FORMATS
-                          list of formats
-
 Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
-  GNOME_DOC_UTILS_CFLAGS
-              C compiler flags for GNOME_DOC_UTILS, overriding pkg-config
-  GNOME_DOC_UTILS_LIBS
-              linker flags for GNOME_DOC_UTILS, overriding pkg-config
   MONO_MODULE_CFLAGS
               C compiler flags for MONO_MODULE, overriding pkg-config
   MONO_MODULE_LIBS
@@ -1575,10 +1492,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-SparkleShare configure 0.8.4
-generated by GNU Autoconf 2.68
+SparkleShare configure 0.9.0
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1588,163 +1505,12 @@ fi
 ## ------------------------ ##
 ## Autoconf initialization. ##
 ## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by SparkleShare $as_me 0.8.4, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by SparkleShare $as_me 0.9.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2159,7 +1925,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2328,7 +2094,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2368,7 +2134,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2419,7 +2185,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2472,7 +2238,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2558,7 +2324,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sparkleshare'
- VERSION='0.8.4'
+ VERSION='0.9.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2588,9 +2354,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
@@ -2703,7 +2469,7 @@ fi
 
 
 
-ASM_VERSION=0.8.4
+ASM_VERSION=0.9.0
 
 
 # Extract the first word of "pkg-config", so it can be a program name with args.
@@ -2724,7 +2490,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2755,1552 +2521,6 @@ ACLOCAL_AMFLAGS="-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-
-case "$am__api_version" in
-    1.01234)
-	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "0.40.6"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.6" >&5
-$as_echo_n "checking for intltool >= 0.40.6... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.6 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error $? "Your intltool is too old.  You need intltool 0.40.6 or later." "$LINENO" 5
-fi
-
-# Extract the first word of "intltool-update", so it can be a program name with args.
-set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_UPDATE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
-$as_echo "$INTLTOOL_UPDATE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-merge", so it can be a program name with args.
-set dummy intltool-merge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_MERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
-$as_echo "$INTLTOOL_MERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-extract", so it can be a program name with args.
-set dummy intltool-extract; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_EXTRACT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
-$as_echo "$INTLTOOL_EXTRACT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check the gettext tools to make sure they are GNU
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XGETTEXT=$ac_cv_path_XGETTEXT
-if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGMERGE=$ac_cv_path_MSGMERGE
-if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGFMT=$ac_cv_path_MSGFMT
-if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
-$as_echo "$INTLTOOL_PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_PERL"; then
-   as_fn_error $? "perl not found" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-$as_echo "$IT_PERL_VERSION" >&6; }
-fi
-if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
-$as_echo_n "checking for XML::Parser... " >&6; }
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-   else
-       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-else
-  case $host in
-    *-*-solaris*)
-                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-
-
-
-GETTEXT_PACKAGE=sparkleshare
-
-
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
-
-
 	expanded_libdir=`(
 		case $prefix in
 			NONE) prefix=$ac_default_prefix ;;
@@ -4352,6 +2572,8 @@ _ACEOF
 
 
 
+
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -4372,7 +2594,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4415,7 +2637,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4465,306 +2687,6 @@ $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-
-    # Check whether --enable-user-help was given.
-if test "${enable_user_help+set}" = set; then :
-  enableval=$enable_user_help;
-else
-  enable_user_help=auto
-fi
-
-
-    if test "x$enable_user_help" = "xauto"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_DOC_UTILS" >&5
-$as_echo_n "checking for GNOME_DOC_UTILS... " >&6; }
-
-if test -n "$GNOME_DOC_UTILS_CFLAGS"; then
-    pkg_cv_GNOME_DOC_UTILS_CFLAGS="$GNOME_DOC_UTILS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GNOME_DOC_UTILS_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GNOME_DOC_UTILS_LIBS"; then
-    pkg_cv_GNOME_DOC_UTILS_LIBS="$GNOME_DOC_UTILS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GNOME_DOC_UTILS_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-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
-	        GNOME_DOC_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-doc-utils" 2>&1`
-        else
-	        GNOME_DOC_UTILS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-doc-utils" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GNOME_DOC_UTILS_PKG_ERRORS" >&5
-
-	enable_user_help=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	enable_user_help=no
-else
-	GNOME_DOC_UTILS_CFLAGS=$pkg_cv_GNOME_DOC_UTILS_CFLAGS
-	GNOME_DOC_UTILS_LIBS=$pkg_cv_GNOME_DOC_UTILS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	enable_user_help=yes
-fi
-    elif test "x$enable_user_help" = "xyes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_DOC_UTILS" >&5
-$as_echo_n "checking for GNOME_DOC_UTILS... " >&6; }
-
-if test -n "$GNOME_DOC_UTILS_CFLAGS"; then
-    pkg_cv_GNOME_DOC_UTILS_CFLAGS="$GNOME_DOC_UTILS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GNOME_DOC_UTILS_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GNOME_DOC_UTILS_LIBS"; then
-    pkg_cv_GNOME_DOC_UTILS_LIBS="$GNOME_DOC_UTILS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GNOME_DOC_UTILS_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-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
-	        GNOME_DOC_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-doc-utils" 2>&1`
-        else
-	        GNOME_DOC_UTILS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-doc-utils" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GNOME_DOC_UTILS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gnome-doc-utils) were not met:
-
-$GNOME_DOC_UTILS_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 GNOME_DOC_UTILS_CFLAGS
-and GNOME_DOC_UTILS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_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 GNOME_DOC_UTILS_CFLAGS
-and GNOME_DOC_UTILS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GNOME_DOC_UTILS_CFLAGS=$pkg_cv_GNOME_DOC_UTILS_CFLAGS
-	GNOME_DOC_UTILS_LIBS=$pkg_cv_GNOME_DOC_UTILS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-    fi
-
-    # GNOME_DOC_INIT sets ENABLE_SK, but if we have disabled
-    # user docs, then this needs to be defined manually.
-     if false; then
-  ENABLE_SK_TRUE=
-  ENABLE_SK_FALSE='#'
-else
-  ENABLE_SK_TRUE='#'
-  ENABLE_SK_FALSE=
-fi
-
-    if test "x$enable_user_help" = "xyes"; then
-
-gdu_cv_version_required=0.17.3
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
-if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  gdu_cv_have_gdu=yes
-else
-  gdu_cv_have_gdu=no
-fi
-
-if test "$gdu_cv_have_gdu" = "yes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	enable_user_help=yes
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	enable_user_help=no
-fi
-
-
-
-# Check whether --with-help-dir was given.
-if test "${with_help_dir+set}" = set; then :
-  withval=$with_help_dir;
-else
-  with_help_dir='${datadir}/gnome/help'
-fi
-
-HELP_DIR="$with_help_dir"
-
-
-
-# Check whether --with-omf-dir was given.
-if test "${with_omf_dir+set}" = set; then :
-  withval=$with_omf_dir;
-else
-  with_omf_dir='${datadir}/omf'
-fi
-
-OMF_DIR="$with_omf_dir"
-
-
-
-# Check whether --with-help-formats was given.
-if test "${with_help_formats+set}" = set; then :
-  withval=$with_help_formats;
-else
-  with_help_formats=''
-fi
-
-DOC_USER_FORMATS="$with_help_formats"
-
-
-# Check whether --enable-scrollkeeper was given.
-if test "${enable_scrollkeeper+set}" = set; then :
-  enableval=$enable_scrollkeeper;
-else
-  enable_scrollkeeper=yes
-fi
-
- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-  ENABLE_SK_TRUE=
-  ENABLE_SK_FALSE='#'
-else
-  ENABLE_SK_TRUE='#'
-  ENABLE_SK_FALSE=
-fi
-
-
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-
-
- if test "$gdu_cv_have_gdu" = "yes"; then
-  HAVE_GNOME_DOC_UTILS_TRUE=
-  HAVE_GNOME_DOC_UTILS_FALSE='#'
-else
-  HAVE_GNOME_DOC_UTILS_TRUE='#'
-  HAVE_GNOME_DOC_UTILS_FALSE=
-fi
-
-
-
-    fi
-
-     if test "x$enable_user_help" = "xyes"; then
-  HAVE_GNOME_DOC_UTILS_TRUE=
-  HAVE_GNOME_DOC_UTILS_FALSE='#'
-else
-  HAVE_GNOME_DOC_UTILS_TRUE='#'
-  HAVE_GNOME_DOC_UTILS_FALSE=
-fi
-
-
-
-
-
 
 
 
@@ -4776,12 +2698,12 @@ if test -n "$MONO_MODULE_CFLAGS"; then
     pkg_cv_MONO_MODULE_CFLAGS="$MONO_MODULE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "mono >= 2.2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mono >= 2.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MONO_MODULE_CFLAGS=`$PKG_CONFIG --cflags "mono >= 2.2" 2>/dev/null`
+  pkg_cv_MONO_MODULE_CFLAGS=`$PKG_CONFIG --cflags "mono >= 2.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -4793,12 +2715,12 @@ if test -n "$MONO_MODULE_LIBS"; then
     pkg_cv_MONO_MODULE_LIBS="$MONO_MODULE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "mono >= 2.2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mono >= 2.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MONO_MODULE_LIBS=`$PKG_CONFIG --libs "mono >= 2.2" 2>/dev/null`
+  pkg_cv_MONO_MODULE_LIBS=`$PKG_CONFIG --libs "mono >= 2.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -4819,14 +2741,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mono >= 2.2" 2>&1`
+	        MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mono >= 2.8" 2>&1`
         else
-	        MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mono >= 2.2" 2>&1`
+	        MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mono >= 2.8" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MONO_MODULE_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (mono >= 2.2) were not met:
+	as_fn_error $? "Package requirements (mono >= 2.8) were not met:
 
 $MONO_MODULE_PKG_ERRORS
 
@@ -4881,7 +2803,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MONO="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4939,7 +2861,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4992,80 +2914,6 @@ $as_echo "not found" >&6; }
 	done
 
 
-else
-
-
-
-	# Extract the first word of "gmcs", so it can be a program name with args.
-set dummy gmcs; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MCS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_MCS" && ac_cv_path_MCS="no"
-  ;;
-esac
-fi
-MCS=$ac_cv_path_MCS
-if test -n "$MCS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
-$as_echo "$MCS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-	if test "x$MCS" = "xno"; then
-		as_fn_error $? "You need to install 'gmcs'" "$LINENO" 5
-	fi
-
-
-
-
-	for asm in $(echo "mono,2.0,System
-    System.Security
-    Mono.Posix
-" | cut -d, -f3- | sed 's/\,/ /g')
-	do
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono 2.0 GAC for $asm.dll" >&5
-$as_echo_n "checking for Mono 2.0 GAC for $asm.dll... " >&6; }
-		if test \
-			-e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/$asm.dll" -o \
-			-e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/$asm.dll"; \
-			then \
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-			as_fn_error $? "missing required Mono 2.0 assembly: $asm.dll" "$LINENO" 5
-		fi
-	done
-
 
 fi
 
@@ -5571,14 +3419,6 @@ fi
 
 
 
-# Check whether --enable-gtkui was given.
-if test "${enable_gtkui+set}" = set; then :
-  enableval=$enable_gtkui;  enable_gtkui=no
-else
-   enable_gtkui=yes
-fi
-
-
 # Check whether --enable-appindicator was given.
 if test "${enable_appindicator+set}" = set; then :
   enableval=$enable_appindicator; enable_appindicator=$enableval
@@ -5587,15 +3427,8 @@ else
 fi
 
 
- if test x$enable_gtkui = xyes; then
-  ENABLE_GTKUI_TRUE=
-  ENABLE_GTKUI_FALSE='#'
-else
-  ENABLE_GTKUI_TRUE='#'
-  ENABLE_GTKUI_FALSE=
-fi
-
-if test "x$enable_gtkui" = "xyes" ; then
+OSNAME=`uname -s`
+if test "$OSNAME" = "Linux" ; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT_SHARP" >&5
@@ -6338,7 +4171,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_SED="sed"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6393,7 +4226,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool data/Makefile data/icons/Makefile data/html/Makefile data/plugins/Makefile SparkleLib/AssemblyInfo.cs SparkleLib/Defines.cs SparkleLib/Makefile SparkleLib/Git/Makefile SparkleShare/Linux/Makefile SparkleShare/Linux/sparkleshare SparkleShare/Linux/Nautilus/Makefile SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py SparkleShare/Makefile po/Makefile.in Makefile"
+ac_config_files="$ac_config_files build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool SparkleLib/AssemblyInfo.cs SparkleLib/Defines.cs SparkleLib/Makefile SparkleLib/Git/Makefile SparkleShare/Common/Makefile SparkleShare/Common/HTML/Makefile SparkleShare/Common/Plugins/Makefile SparkleShare/Common/Pixmaps/Makefile SparkleShare/Linux/Makefile SparkleShare/Linux/Pixmaps/Makefile SparkleShare/Linux/Pixmaps/icons/Makefile SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile SparkleShare/Linux/sparkleshare SparkleShare/Linux/Nautilus/Makefile SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py SparkleShare/Makefile Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6540,46 +4373,11 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-  ac_config_commands="$ac_config_commands po/stamp-it"
-
-
-if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${EXTERNAL_NOTIFY_SHARP_TRUE}" && test -z "${EXTERNAL_NOTIFY_SHARP_FALSE}"; then
   as_fn_error $? "conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6608,10 +4406,6 @@ if test -z "${ENABLE_ATK_TRUE}" && test -z "${ENABLE_ATK_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_ATK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_GTKUI_TRUE}" && test -z "${ENABLE_GTKUI_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_GTKUI\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_APP_INDICATOR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6950,16 +4744,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -7019,28 +4813,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -7061,8 +4843,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by SparkleShare $as_me 0.8.4, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by SparkleShare $as_me 0.9.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -7084,7 +4866,6 @@ esac
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
-config_commands="$ac_config_commands"
 
 _ACEOF
 
@@ -7109,20 +4890,17 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Configuration commands:
-$config_commands
-
 Report bugs to the package provider."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-SparkleShare config.status 0.8.4
-configured by $0, generated by GNU Autoconf 2.68,
+SparkleShare config.status 0.9.0
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -7202,7 +4980,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -7223,11 +5001,6 @@ _ASBOX
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -7236,28 +5009,29 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
     "build/m4/Makefile") CONFIG_FILES="$CONFIG_FILES build/m4/Makefile" ;;
     "build/m4/shave/shave") CONFIG_FILES="$CONFIG_FILES build/m4/shave/shave" ;;
     "build/m4/shave/shave-libtool") CONFIG_FILES="$CONFIG_FILES build/m4/shave/shave-libtool" ;;
-    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-    "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
-    "data/html/Makefile") CONFIG_FILES="$CONFIG_FILES data/html/Makefile" ;;
-    "data/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES data/plugins/Makefile" ;;
     "SparkleLib/AssemblyInfo.cs") CONFIG_FILES="$CONFIG_FILES SparkleLib/AssemblyInfo.cs" ;;
     "SparkleLib/Defines.cs") CONFIG_FILES="$CONFIG_FILES SparkleLib/Defines.cs" ;;
     "SparkleLib/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleLib/Makefile" ;;
     "SparkleLib/Git/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleLib/Git/Makefile" ;;
+    "SparkleShare/Common/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Common/Makefile" ;;
+    "SparkleShare/Common/HTML/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Common/HTML/Makefile" ;;
+    "SparkleShare/Common/Plugins/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Common/Plugins/Makefile" ;;
+    "SparkleShare/Common/Pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Common/Pixmaps/Makefile" ;;
     "SparkleShare/Linux/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/Makefile" ;;
+    "SparkleShare/Linux/Pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/Pixmaps/Makefile" ;;
+    "SparkleShare/Linux/Pixmaps/icons/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/Pixmaps/icons/Makefile" ;;
+    "SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile" ;;
+    "SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile" ;;
     "SparkleShare/Linux/sparkleshare") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/sparkleshare" ;;
     "SparkleShare/Linux/Nautilus/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/Nautilus/Makefile" ;;
     "SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py" ;;
     "SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py") CONFIG_FILES="$CONFIG_FILES SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py" ;;
     "SparkleShare/Makefile") CONFIG_FILES="$CONFIG_FILES SparkleShare/Makefile" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -7270,7 +5044,6 @@ done
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -7459,7 +5232,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+eval set X "  :F $CONFIG_FILES      "
 shift
 for ac_tag
 do
@@ -7680,130 +5453,9 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
  ;;
 
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
 
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
   esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "po/stamp-it":C)
-    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
-    fi
-    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-    >"po/stamp-it.tmp"
-    sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
-
-    sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r po/POTFILES
-	  }
-	 ' "po/Makefile.in" >"po/Makefile"
-    rm -f "po/Makefile.tmp"
-    mv "po/stamp-it.tmp" "po/stamp-it"
-   ;;
 
-  esac
 done # for ac_tag
 
 
diff --git a/configure.ac b/configure.ac
index 5436c99..9127e8d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 m4_define([sparkleshare_version],
-	[0.8.4])
+	[0.9.0])
 
 m4_define([sparkleshare_asm_version],
-	[0.8.4])
+	[0.9.0])
 
 AC_PREREQ([2.54])
 AC_INIT([SparkleShare], sparkleshare_version)
@@ -21,23 +21,14 @@ fi
 
 AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
 
-dnl i18n
-IT_PROG_INTLTOOL([0.40.6])
-GETTEXT_PACKAGE=sparkleshare
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-
 SHAMROCK_EXPAND_LIBDIR
 SHAMROCK_EXPAND_BINDIR
 SHAMROCK_EXPAND_DATADIR
 
-dnl Help files
-SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
-
 AC_PROG_INSTALL
 
 dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(2.2)
+SHAMROCK_CHECK_MONO_MODULE(2.8)
 SHAMROCK_FIND_MONO_RUNTIME
     
 PKG_CHECK_EXISTS([mono >= 2.8],
@@ -46,13 +37,8 @@ SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([
     System
     System.Security
     Mono.Posix
-])],
-[SHAMROCK_FIND_MONO_2_0_COMPILER
-SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
-    System
-    System.Security
-    Mono.Posix
-])])
+])]
+)
 
 SPARKLESHARE_CHECK_NOTIFY_SHARP
 
@@ -87,17 +73,13 @@ dnl package checks, common for all configs
 
 SPARKLESHARE_CHECK_GTK_SHARP
 
-AC_ARG_ENABLE(gtkui,
-	AS_HELP_STRING([--disable-gtkui], [Do not build the Gtk+ user interface]),
-	[ enable_gtkui=no ], [ enable_gtkui=yes ])
-
 AC_ARG_ENABLE(appindicator,
 	AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
 	[enable_appindicator=$enableval],
 	[enable_appindicator="auto"])
 
-AM_CONDITIONAL(ENABLE_GTKUI, test x$enable_gtkui = xyes)
-if test "x$enable_gtkui" = "xyes" ; then
+OSNAME=`uname -s`
+if test "$OSNAME" = "Linux" ; then
 	dnl check for webkit-sharp
 	PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no)
 	if test "x$have_webkit_sharp" = "xno" ; then
@@ -150,21 +132,24 @@ build/Makefile
 build/m4/Makefile
 build/m4/shave/shave
 build/m4/shave/shave-libtool
-data/Makefile
-data/icons/Makefile
-data/html/Makefile
-data/plugins/Makefile
 SparkleLib/AssemblyInfo.cs
 SparkleLib/Defines.cs
 SparkleLib/Makefile
 SparkleLib/Git/Makefile
+SparkleShare/Common/Makefile
+SparkleShare/Common/HTML/Makefile
+SparkleShare/Common/Plugins/Makefile
+SparkleShare/Common/Pixmaps/Makefile
 SparkleShare/Linux/Makefile
+SparkleShare/Linux/Pixmaps/Makefile
+SparkleShare/Linux/Pixmaps/icons/Makefile
+SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile
+SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile
 SparkleShare/Linux/sparkleshare
 SparkleShare/Linux/Nautilus/Makefile
 SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
 SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py
 SparkleShare/Makefile
-po/Makefile.in
 Makefile
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100755
index cf1520b..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-SUBDIRS = \
-	icons \
-	html \
-	plugins
-
-dist_pixmaps_DATA = \
-	side-splash.png \
-	tutorial-slide-1.png \
-	tutorial-slide-2.png \
-	tutorial-slide-3.png \
-	tutorial-slide-4.png \
-        avatar-a.png \
-        avatar-b.png \
-        avatar-c.png \
-        avatar-d.png \
-        avatar-e.png \
-        avatar-f.png \
-        avatar-g.png \
-        avatar-h.png \
-        avatar-i.png \
-        avatar-j.png \
-        avatar-k.png \
-	about.png
-
-pixmapsdir = $(pkgdatadir)/pixmaps/
-
-MAINTAINERCLEANFILES = \
-	Makefile.in
diff --git a/data/about.png b/data/about.png
deleted file mode 100755
index 9f01b2e..0000000
--- a/data/about.png
+++ /dev/null
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100755
index da21e51..0000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-theme = hicolor
-system_themedir = $(datadir)/icons/$(theme)
-app_themedir = $(pkgdatadir)/icons/$(theme)
-
-system_theme_icons =					\
-	apps,folder-sparkleshare-16.png			\
-	apps,folder-sparkleshare-22.png			\
-	apps,folder-sparkleshare-24.png			\
-	apps,folder-sparkleshare-256.png		\
-	apps,folder-sparkleshare-32.png			\
-	apps,folder-sparkleshare-48.png			\
-	status,process-syncing-sparkleshare-i-24.png \
-	status,process-syncing-sparkleshare-ii-24.png \
-	status,process-syncing-sparkleshare-iii-24.png \
-	status,process-syncing-sparkleshare-iiii-24.png \
-	status,process-syncing-sparkleshare-iiiii-24.png
-
-app_theme_icons =					\
-	animations,process-syncing-sparkleshare-24.png	\
-	animations,process-working-22.png		\
-	places,folder-sparkleshare-16.png		\
-	places,folder-sparkleshare-22.png		\
-	places,folder-sparkleshare-24.png		\
-	places,folder-sparkleshare-256.png		\
-	places,folder-sparkleshare-32.png		\
-	places,folder-sparkleshare-48.png		\
-	status,sparkleshare-syncing-error-24.png	\
-	status,avatar-default-16.png			\
-	status,avatar-default-22.png			\
-	status,avatar-default-24.png			\
-	status,avatar-default-32.png			\
-	status,avatar-default-48.png			\
-	status,document-added-12.png			\
-	status,document-edited-12.png			\
-	status,document-deleted-12.png			\
-	status,document-moved-12.png			\
-	status,dialog-error-16.png			\
-	status,list-point-16.png			\
-	status,dialog-error-24.png
-
-install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
-	-t "$(theme)" \
-	-s "$(srcdir)" \
-	-d "x$(DESTDIR)" \
-	-m "$(mkinstalldirs)" \
-	-x "$(INSTALL_DATA)"
-
-install-data-local:
-	@-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons)
-	@-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons)
-
-uninstall-hook:
-	@-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons)
-	@-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons)
-
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = $(wildcard *.png *.svg)
diff --git a/data/icons/avatar-default-16.png b/data/icons/avatar-default-16.png
deleted file mode 100755
index 0d231ee..0000000
--- a/data/icons/avatar-default-16.png
+++ /dev/null
diff --git a/data/icons/avatar-default-22.png b/data/icons/avatar-default-22.png
deleted file mode 100755
index 089024e..0000000
--- a/data/icons/avatar-default-22.png
+++ /dev/null
diff --git a/data/icons/avatar-default-24.png b/data/icons/avatar-default-24.png
deleted file mode 100755
index 6cc87fc..0000000
--- a/data/icons/avatar-default-24.png
+++ /dev/null
diff --git a/data/icons/avatar-default-32.png b/data/icons/avatar-default-32.png
deleted file mode 100755
index 1422648..0000000
--- a/data/icons/avatar-default-32.png
+++ /dev/null
diff --git a/data/icons/avatar-default-48.png b/data/icons/avatar-default-48.png
deleted file mode 100755
index 47d4a85..0000000
--- a/data/icons/avatar-default-48.png
+++ /dev/null
diff --git a/data/icons/avatar-default.png b/data/icons/avatar-default.png
deleted file mode 100755
index b4f31d4..0000000
--- a/data/icons/avatar-default.png
+++ /dev/null
diff --git a/data/icons/dialog-error-16.png b/data/icons/dialog-error-16.png
deleted file mode 100755
index 0b0d8be..0000000
--- a/data/icons/dialog-error-16.png
+++ /dev/null
diff --git a/data/icons/dialog-error-24.png b/data/icons/dialog-error-24.png
deleted file mode 100755
index 9821d78..0000000
--- a/data/icons/dialog-error-24.png
+++ /dev/null
diff --git a/data/icons/folder-sparkleshare-windows-16.png b/data/icons/folder-sparkleshare-windows-16.png
deleted file mode 100644
index ff2c4e7..0000000
--- a/data/icons/folder-sparkleshare-windows-16.png
+++ /dev/null
diff --git a/data/icons/folder-windows-16.png b/data/icons/folder-windows-16.png
deleted file mode 100644
index 59d6977..0000000
--- a/data/icons/folder-windows-16.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-i-active.png b/data/icons/process-syncing-sparkleshare-mac-i-active.png
deleted file mode 100755
index be43fe8..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-i-active.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-i.png b/data/icons/process-syncing-sparkleshare-mac-i.png
deleted file mode 100755
index 6ce3193..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-i.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-ii-active.png b/data/icons/process-syncing-sparkleshare-mac-ii-active.png
deleted file mode 100755
index ea414c0..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-ii-active.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-ii.png b/data/icons/process-syncing-sparkleshare-mac-ii.png
deleted file mode 100755
index ae01c63..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-ii.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-iii-active.png b/data/icons/process-syncing-sparkleshare-mac-iii-active.png
deleted file mode 100755
index 6016bce..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-iii-active.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-iii.png b/data/icons/process-syncing-sparkleshare-mac-iii.png
deleted file mode 100755
index 84ee584..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-iii.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-iiii-active.png b/data/icons/process-syncing-sparkleshare-mac-iiii-active.png
deleted file mode 100755
index 8b2f18a..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-iiii-active.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-iiii.png b/data/icons/process-syncing-sparkleshare-mac-iiii.png
deleted file mode 100755
index 20190c2..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-iiii.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-iiiii-active.png b/data/icons/process-syncing-sparkleshare-mac-iiiii-active.png
deleted file mode 100755
index e6a933d..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-iiiii-active.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-mac-iiiii.png b/data/icons/process-syncing-sparkleshare-mac-iiiii.png
deleted file mode 100755
index 6324bfd..0000000
--- a/data/icons/process-syncing-sparkleshare-mac-iiiii.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-windows-i.png b/data/icons/process-syncing-sparkleshare-windows-i.png
deleted file mode 100644
index 970f4a0..0000000
--- a/data/icons/process-syncing-sparkleshare-windows-i.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-windows-ii.png b/data/icons/process-syncing-sparkleshare-windows-ii.png
deleted file mode 100644
index 1850c02..0000000
--- a/data/icons/process-syncing-sparkleshare-windows-ii.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-windows-iii.png b/data/icons/process-syncing-sparkleshare-windows-iii.png
deleted file mode 100644
index 7b4a4ee..0000000
--- a/data/icons/process-syncing-sparkleshare-windows-iii.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-windows-iiii.png b/data/icons/process-syncing-sparkleshare-windows-iiii.png
deleted file mode 100644
index aa8f371..0000000
--- a/data/icons/process-syncing-sparkleshare-windows-iiii.png
+++ /dev/null
diff --git a/data/icons/process-syncing-sparkleshare-windows-iiiii.png b/data/icons/process-syncing-sparkleshare-windows-iiiii.png
deleted file mode 100644
index 642e242..0000000
--- a/data/icons/process-syncing-sparkleshare-windows-iiiii.png
+++ /dev/null
diff --git a/data/icons/sparkleshare-android-36.png b/data/icons/sparkleshare-android-36.png
deleted file mode 100644
index 84bf2bb..0000000
--- a/data/icons/sparkleshare-android-36.png
+++ /dev/null
diff --git a/data/icons/sparkleshare-android-48.png b/data/icons/sparkleshare-android-48.png
deleted file mode 100644
index e858d59..0000000
--- a/data/icons/sparkleshare-android-48.png
+++ /dev/null
diff --git a/data/icons/sparkleshare-android-72.png b/data/icons/sparkleshare-android-72.png
deleted file mode 100644
index 49d147e..0000000
--- a/data/icons/sparkleshare-android-72.png
+++ /dev/null
diff --git a/data/icons/sparkleshare-syncing-error-mac-active.png b/data/icons/sparkleshare-syncing-error-mac-active.png
deleted file mode 100755
index c751896..0000000
--- a/data/icons/sparkleshare-syncing-error-mac-active.png
+++ /dev/null
diff --git a/data/icons/sparkleshare-syncing-error-mac.png b/data/icons/sparkleshare-syncing-error-mac.png
deleted file mode 100755
index f9e56b9..0000000
--- a/data/icons/sparkleshare-syncing-error-mac.png
+++ /dev/null
diff --git a/data/icons/sparkleshare-syncing-error-windows.png b/data/icons/sparkleshare-syncing-error-windows.png
deleted file mode 100644
index 0b39df5..0000000
--- a/data/icons/sparkleshare-syncing-error-windows.png
+++ /dev/null
diff --git a/data/side-splash.png b/data/side-splash.png
deleted file mode 100755
index 4f3cbc4..0000000
--- a/data/side-splash.png
+++ /dev/null
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
deleted file mode 100644
index 0da2cf9..0000000
--- a/gnome-doc-utils.make
+++ /dev/null
@@ -1,655 +0,0 @@
-# gnome-doc-utils.make - make magic for building documentation
-# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-################################################################################
-## @@ Generating Header Files
-
-## @ DOC_H_FILE
-## The name of the header file to generate
-DOC_H_FILE ?=
-
-## @ DOC_H_DOCS
-## The input DocBook files for generating the header file
-DOC_H_DOCS ?=
-
-$(DOC_H_FILE): $(DOC_H_DOCS);
-	@rm -f $@.tmp; touch $@.tmp;
-	echo 'const gchar* documentation_credits[] = {' >> $@.tmp
-	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-	  xsltproc --path "$$xmlpath" $(_credits) $$doc; \
-	done | sort | uniq \
-	  | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
-	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
-	echo '	NULL' >> $@.tmp
-	echo '};' >> $@.tmp
-	echo >> $@.tmp
-	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-	  docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
-	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
-	  echo $$xmlpath; \
-	  ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
-	  for id in $$ids; do \
-	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
-	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
-	  done; \
-	  echo >> $@.tmp; \
-	done;
-	cp $@.tmp $@ && rm -f $@.tmp
-
-dist-check-gdu:
-if !HAVE_GNOME_DOC_UTILS
-	@echo "*** GNOME Doc Utils must be installed in order to make dist"
-	@false
-endif
-
-.PHONY: dist-doc-header
-dist-doc-header: $(DOC_H_FILE)
-	@if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
-	$(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
-
-doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
-
-.PHONY: clean-doc-header
-_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-clean-local: $(_clean_doc_header)
-distclean-local: $(_clean_doc_header)
-mostlyclean-local: $(_clean_doc_header)
-maintainer-clean-local: $(_clean_doc_header)
-clean-doc-header:
-	rm -f $(DOC_H_FILE)
-
-all: $(DOC_H_FILE)
-
-
-################################################################################
-## @@ Generating Documentation Files
-
-## @ DOC_MODULE
-## The name of the document being built
-DOC_MODULE ?=
-
-## @ DOC_ID
-## The unique identifier for a Mallard document
-DOC_ID ?=
-
-## @ DOC_PAGES
-## Page files in a Mallard document
-DOC_PAGES ?=
-
-## @ DOC_ENTITIES
-## Files included with a SYSTEM entity
-DOC_ENTITIES ?=
-
-## @ DOC_INCLUDES
-## Files included with XInclude
-DOC_INCLUDES ?=
-
-## @ DOC_FIGURES
-## Figures and other external data
-DOC_FIGURES ?=
-
-## @ DOC_FORMATS
-## The default formats to be built and installed
-DOC_FORMATS ?= docbook
-_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
-
-## @ DOC_LINGUAS
-## The languages this document is translated into
-DOC_LINGUAS ?=
-_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),		\
-	$(filter $(LINGUAS),$(DOC_LINGUAS)),					\
-	$(DOC_LINGUAS))
-
-_DOC_ABS_SRCDIR = @abs_srcdir@
-
-
-################################################################################
-## Variables for Bootstrapping
-
-_xml2po ?= `which xml2po`
-_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-
-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
-
-if ENABLE_SK
-_ENABLE_SK = true
-_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
-_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
-_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-endif
-
-
-################################################################################
-## @@ Rules for OMF Files
-
-db2omf_args =									\
-	--stringparam db2omf.basename $(DOC_MODULE)				\
-	--stringparam db2omf.format $(3)					\
-	--stringparam db2omf.dtd						\
-	$(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 		\
-		| sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/')			\
-	--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2)))	\
-	--stringparam db2omf.omf_dir "$(OMF_DIR)"				\
-	--stringparam db2omf.help_dir "$(HELP_DIR)"				\
-	--stringparam db2omf.omf_in "$(_DOC_OMF_IN)"				\
-	$(if $(_ENABLE_SK),							\
-	  --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)")		\
-	$(_db2omf) $(2)
-
-## @ _DOC_OMF_IN
-## The OMF input file
-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
-
-## @ _DOC_OMF_DB
-## The OMF files for DocBook output
-_DOC_OMF_DB = $(if $(_DOC_OMF_IN),						\
-	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
-
-$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
-$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
-	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
-	  echo "Please check your ScrollKeeper installation." >&2;		\
-	  exit 1; }
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
-
-## @ _DOC_OMF_HTML
-## The OMF files for HTML output
-_DOC_OMF_HTML = $(if $(_DOC_OMF_IN),						\
-	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
-
-$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
-$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
-if ENABLE_SK
-	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-	  echo "The file '$(_skcontentslist)' does not exist" >&2;		\
-	  echo "Please check your ScrollKeeper installation." >&2;		\
-	  exit 1; }
-endif
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
-
-## @ _DOC_OMF_ALL
-## All OMF output files to be built
-# FIXME
-_DOC_OMF_ALL =									\
-	$(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
-	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
-
-.PHONY: omf
-omf: $(_DOC_OMF_ALL)
-
-
-################################################################################
-## @@ C Locale Documents
-
-## @ _DOC_C_MODULE
-## The top-level documentation file in the C locale
-_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-
-## @ _DOC_C_PAGES
-## Page files in a Mallard document in the C locale
-_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
-
-## @ _DOC_C_ENTITIES
-## Files included with a SYSTEM entity in the C locale
-_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
-
-## @ _DOC_C_XINCLUDES
-## Files included with XInclude in the C locale
-_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
-
-## @ _DOC_C_DOCS
-## All documentation files in the C locale
-_DOC_C_DOCS =								\
-	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
-
-## @ _DOC_C_DOCS_NOENT
-## All documentation files in the C locale,
-## except files included with a SYSTEM entity
-_DOC_C_DOCS_NOENT =							\
-	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_PAGES)
-
-## @ _DOC_C_FIGURES
-## All figures and other external data in the C locale
-_DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
-	$(foreach fig,$(DOC_FIGURES),C/$(fig)),				\
-	$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png)))
-
-## @ _DOC_C_HTML
-## All HTML documentation in the C locale
-# FIXME: probably have to shell escape to determine the file names
-_DOC_C_HTML = $(foreach f,						\
-	$(shell xsltproc --xinclude 					\
-	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
-	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
-	C/$(f).xhtml)
-
-###############################################################################
-## @@ Other Locale Documentation
-
-## @ _DOC_POFILES
-## The .po files used for translating the document
-_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
-.PHONY: po
-po: $(_DOC_POFILES)
-
-## @ _DOC_MOFILES
-## The .mo files used for translating the document
-_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
-
-.PHONY: mo
-mo: $(_DOC_MOFILES)
-
-## @ _DOC_LC_MODULES
-## The top-level documentation files in all other locales
-_DOC_LC_MODULES = $(if $(DOC_MODULE),						\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-## @ _DOC_LC_PAGES
-## Page files in a Mallard document in all other locales
-_DOC_LC_PAGES =									\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
-		$(lc)/$(notdir $(page)) ))
-
-## @ _DOC_LC_XINCLUDES
-## Files included with XInclude in all other locales
-_DOC_LC_INCLUDES =								\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),	\
-		$(lc)/$(notdir $(inc)) ))
-
-## @ _DOC_LC_HTML
-## All HTML documentation in all other locales
-# FIXME: probably have to shell escape to determine the file names
-_DOC_LC_HTML =									\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML),		\
-		$(lc)/$(notdir $(doc)) ))
-
-## @ _DOC_LC_DOCS
-## All documentation files in all other locales
-_DOC_LC_DOCS =									\
-	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
-	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
-## @ _DOC_LC_FIGURES
-## All figures and other external data in all other locales
-_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),				\
-	$(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) )
-
-_DOC_SRC_FIGURES =								\
-	$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS),	\
-		$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-
-$(_DOC_POFILES):
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	@if test ! -f $@ -a -f $(srcdir)/$@; then \
-	  echo "cp $(srcdir)/$@ $@"; \
-	  cp "$(srcdir)/$@" "$@"; \
-	fi;
-	@docs=; \
-	list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
-	  docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
-	done; \
-	if ! test -f $@; then \
-	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
-	  (cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
-	else \
-	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
-	  (cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
-	fi
-
-$(_DOC_MOFILES): %.mo: %.po
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	msgfmt -o $@ $<
-
-# FIXME: fix the dependancy
-# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
-$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
-	if ! test -d $(dir $@); then mkdir $(dir $@); fi
-	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
-	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
-	if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
-	(cd $(dir $@) && \
-	  $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
-	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-
-## @ _DOC_POT
-## A pot file
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
-.PHONY: pot
-pot: $(_DOC_POT)
-$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
-
-################################################################################
-## @@ All Documentation
-
-## @ _DOC_HTML_ALL
-## All HTML documentation, only if it's built
-_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
-	$(_DOC_C_HTML) $(_DOC_LC_HTML))
-
-_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
-
-$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-
-
-################################################################################
-## All
-
-all:							\
-	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
-	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\
-	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
-
-
-################################################################################
-## Clean
-
-.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
-clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
-clean-doc-lc:
-	rm -f $(_DOC_LC_DOCS)
-	rm -f $(_DOC_MOFILES)
-	@list='$(_DOC_POFILES)'; for po in $$list; do \
-	  if ! test "$$po" -ef "$(srcdir)/$$po"; then \
-	    echo "rm -f $$po"; \
-	    rm -f "$$po"; \
-	  fi; \
-	done
-#	.xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc/.xml2po.mo"; then \
-	    echo "rm -f $$lc/.xml2po.mo"; \
-	    rm -f "$$lc/.xml2po.mo"; \
-	  fi; \
-	done
-clean-doc-dir: clean-doc-lc
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  for dir in `find $$lc -depth -type d`; do \
-	    if ! test $$dir -ef $(srcdir)/$$dir; then \
-	      echo "rmdir $$dir"; \
-	      rmdir "$$dir"; \
-	   fi; \
-	  done; \
-	done
-
-_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
-_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
-_clean_lc  = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-
-clean-local:						\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-distclean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-mostlyclean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-maintainer-clean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-
-
-
-################################################################################
-## Dist
-
-.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: 						\
-	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
-	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
-	$(if $(_DOC_OMF_IN),dist-doc-omf)
-#	$(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo " $(mkinstalldirs) $(distdir)/$$lc"; \
-	  $(mkinstalldirs) "$(distdir)/$$lc"; \
-	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
-	for doc in $$list; do \
-	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    if ! test -d "$(distdir)/$$docdir"; then \
-	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
-	    fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
-	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
-	done
-
-dist-doc-figs: $(_DOC_SRC_FIGURES)
-	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
-	for fig in $$list; do \
-	  if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$fig"; then \
-	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    if ! test -d "$(distdir)/$$figdir"; then \
-	      echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
-	      $(mkinstalldirs) "$(distdir)/$$figdir"; \
-	    fi; \
-	    echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \
-	    $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \
-	  fi; \
-	done;
-
-dist-doc-omf:
-	@if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \
-	$(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))"
-
-dist-doc-dsk:
-	@if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
-	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-
-
-################################################################################
-## Check
-
-.PHONY: check-doc-docs check-doc-omf
-check:							\
-	$(if $(DOC_MODULE),check-doc-docs)		\
-	$(if $(DOC_ID),check-doc-pages)			\
-	$(if $(_DOC_OMF_IN),check-doc-omf)
-
-check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \
-	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
-	done
-
-check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-	for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  for page in $(DOC_PAGES); do \
-	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-	  done; \
-	done
-
-check-doc-omf: $(_DOC_OMF_ALL)
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-	  xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-	done
-
-
-
-################################################################################
-## Install
-
-.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-
-_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-
-install-data-local:					\
-	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
-	$(if $(_DOC_HTML_ALL),install-doc-html)		\
-	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
-	$(if $(_DOC_OMF_IN),install-doc-omf)
-#	$(if $(_DOC_DSK_IN),install-doc-dsk)
-
-install-doc-docs:
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
-	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
-	  if ! test -d "$$docdir"; then \
-	    echo "$(mkinstalldirs) $$docdir"; \
-	    $(mkinstalldirs) "$$docdir"; \
-	  fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
-	done
-
-install-doc-figs:
-	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
-	  for lc in C $(_DOC_REAL_LINGUAS); do \
-	    figsymlink=false; \
-	    if test -f "$$lc/$$fig"; then \
-	      figfile="$$lc/$$fig"; \
-	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
-	      figfile="$(srcdir)/$$lc/$$fig"; \
-	    else \
-	      figsymlink=true; \
-	    fi; \
-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
-	    if ! test -d "$$figdir"; then \
-	      echo "$(mkinstalldirs) $$figdir"; \
-	      $(mkinstalldirs) "$$figdir"; \
-	    fi; \
-	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-	    if $$figsymlink; then \
-	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-	    else \
-	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-	    fi; \
-	  done; \
-	done
-
-install-doc-html:
-	echo install-html
-
-install-doc-omf:
-	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
-	done
-	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-	fi;
-
-install-doc-dsk:
-	echo install-dsk
-
-
-
-################################################################################
-## Uninstall
-
-.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
-uninstall-local:					\
-	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
-	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
-	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
-	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-#	$(if $(_DOC_DSK_IN),uninstall-doc-dsk)
-
-uninstall-doc-docs:
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	done
-
-uninstall-doc-figs:
-	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-	done;
-
-uninstall-doc-omf:
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  fi; \
-	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	done
diff --git a/install-sh b/install-sh
index 6781b98..a9244eb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff --git a/AUTHORS b/legal/AUTHORS
index 3c6c849..8fcbc8e 100755
--- a/AUTHORS
+++ b/legal/AUTHORS
@@ -17,6 +17,7 @@ Code:
 	Alex Hudson <home@alexhudson.com>
 	Benjamin Podszun <benjamin.podszun@gmail.com>
 	Bertrand Lorentz <bertrand.lorentz@gmail.com>
+	Chris Magee <chris.magee@gametheworld.com>
 	Gabriel Burt <gabriel.burt@gmail.com>
 	Garrett LeSage <garrett@novell.com>
 	Hylke Bons <hylkebons@gmail.com>
diff --git a/LICENSE b/legal/LICENSE
index 94a0453..94a0453 100755
--- a/LICENSE
+++ b/legal/LICENSE
diff --git a/TRADEMARK b/legal/TRADEMARK
index 8368f91..8368f91 100644
--- a/TRADEMARK
+++ b/legal/TRADEMARK
diff --git a/ltmain.sh b/ltmain.sh
index 3061e3c..33f642a 100755..100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION="2.4.2 Debian-2.4.2-1.1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@ case $progpath in
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6111,7 +6124,10 @@ func_mode_link ()
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6147,7 +6163,8 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6430,19 +6447,19 @@ func_mode_link ()
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_preserve_dup_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+		esac
+	      fi
+	      func_append tmp_libs " $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -6831,7 +6848,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7333,7 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7334,6 +7352,9 @@ func_mode_link ()
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
 	  esac
 	  ;;
 	no)
@@ -7432,7 +7453,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8041,11 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8076,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8084,7 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9174,8 @@ EOF
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9285,8 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/missing b/missing
index 28055d2..86a8fc3 100755
--- a/missing
+++ b/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@ Supported PROGRAM values:
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@ case $1 in
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@ WARNING: \`$1' $msg.  You should only need it if
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@ WARNING: \`$1' is $msg.  You should only need it if
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100755
index 008172a..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,29 +0,0 @@
-ar
-bg
-ca
-cs_CZ
-da
-de
-el
-eo
-es
-fi
-fr
-he
-hu
-it
-ja
-nl
-no_NO
-nn_NO
-pl
-pt_BR
-ru
-sk
-sl
-sr_RS
-sv
-te
-uk
-zh_CN
-zh_TW
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index cc8a222..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,217 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	done
-
-check: all $(GETTEXT_PACKAGE).pot
-	rm -f missing notexist
-	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-	if [ -r missing -o -r notexist ]; then \
-	  exit 1; \
-	fi
-
-mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-	done; \
-	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100755
index b2b7d83..0000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,24 +0,0 @@
-# List of source files containing translatable strings.
-# Please keep this file in alphabetical order; run ./sort-potfiles
-# after adding files here.
-[encoding: UTF-8]
-data/plugins/bitbucket.xml.in
-data/plugins/github.xml.in
-data/plugins/gitorious.xml.in
-data/plugins/gnome.xml.in
-data/plugins/own-server.xml.in
-SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py.in
-SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py.in
-SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
-SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py
-SparkleShare/Program.cs
-SparkleShare/Linux/SparkleAbout.cs
-SparkleShare/Linux/SparkleController.cs
-SparkleShare/SparkleControllerBase.cs
-SparkleShare/Linux/SparkleEventLog.cs
-SparkleShare/SparkleOptions.cs
-SparkleShare/Linux/SparkleSetup.cs
-SparkleShare/Linux/SparkleSetupWindow.cs
-SparkleShare/Linux/SparkleStatusIcon.cs
-SparkleShare/Linux/SparkleUI.cs
-
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
deleted file mode 100755
index 02aa648..0000000
--- a/po/POTFILES.skip
+++ /dev/null
@@ -1,4 +0,0 @@
-MacCore/src/Options.cs
-SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
-SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py
-SparkleLib/SparkleOptions.cs
diff --git a/po/ar.po b/po/ar.po
deleted file mode 100755
index b4d3c9a..0000000
--- a/po/ar.po
+++ /dev/null
@@ -1,414 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Majid Al-Dharrab <majid@aldharrab.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "مشروع جنوم."
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "مرحبًا بك في سباركل‌شير!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "محدَّث"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "يزامن..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "ليس كل شيء مزامَنًا"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "انسخ رابط الملف"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "انسخ عنوان الوِب الخاص بهذا الملف إلى الحافظة"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "احصل على إصدارة سابقة"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "اصنع نسخة من إصدارة سابقة من هذا المجلد"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "اختر لتحصل على نسخة من هذه الإصدارة"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "اطبع معلومات الإصدارة"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "أظهر نص المساعدة هذا"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "سباركل‌شير، أداة تعاون ومشاركة."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "لا يشمل هذا البرنامج أي ضمان"
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "هذا برنامج حر، ونحن نرحب بتوزيعه "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"ضمن شروط معينة. يرجى قراءة رخصة جنو العمومية - الإصدارة الثالثة للاطلاع على "
-"التفاصيل."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "يزامن سباركل‌شير مستودعات جِت الموجودة في "
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "مجلد ~/SparkleShare مع أصولها البعيدة آليًا."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "طريقة الاستخدام: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "زامن مجلد سباركل‌شير مع مستودعات بعيدة."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "المعطيات:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "سباركل‌شير "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "حوْل سباركل‌شير"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "أنت تستخدم الإصدارة الأحدث."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "يبحث عن تحديثات..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "الأحداث الأخيرة"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "كل المجلدات"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"نحتاج بعض المعلومات منك قبل أن نتمكن من إنشاء مجلد سباركل‌شير في هذا "
-"الحاسوب."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "الاسم كاملًا:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "البريد الإلكتروني:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "التالي"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "ألغِ"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "أمتأكد أنه ليس وقت احتساء القهوة؟"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "أنهِ"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "نجحت إضافة ‘{0}’"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "افتح المجلد"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "إعداد سباركل‌شير"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "عطِّل التنبيهات"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "فعِّل التنبيهات"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "اخرج"
-
-
diff --git a/po/bg.po b/po/bg.po
deleted file mode 100755
index 0f46559..0000000
--- a/po/bg.po
+++ /dev/null
@@ -1,411 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Łukasz Jernaś <deejay1@srem.org>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Проектът GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Здравейте в SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Обновено"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Синхронизиране…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Синхронизирането не е приключило"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Копиране на адреса"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Копиране в буфера на адреса на връзката към този файл"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Предишна версия"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Копие в тази папка на по-ранна версия"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Изберете за копие на версията"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Извеждане на информация за версията"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Показване на този помощен текст"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Авторски права: © 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Тази програма идва БЕЗ НИКАКВИ ГАРАНЦИИ."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
-"Това е свободен софтуер, можете да го разпространявате при определени "
-"условия."
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "За повече информация вижте Общия публичен лиценз на GNU, версия 3."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare автоматично синхронизира хранилища на Git"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "в папката ~/SparkleShare с отдалечените им източници."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Употреба: sparkleshare [start|stop|restart] [ОПЦИЯ]…"
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
-"Синхронизиране на папката ви за SparkleShare с отдалечените източници."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Аргументи:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Относно SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Трябва да попълните някои данни за себе си, преди да се създаде папка на "
-"компютъра, ползваща SparkleShare."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Лично име:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Е-поща:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Нататък"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Отказване"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Не е ли време за кафенце?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Завършване"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Отваряне на папката"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Изключване на уведомяванията"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Включване на уведомленията"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Спиране на програмата"
-
-
diff --git a/po/ca.po b/po/ca.po
deleted file mode 100755
index 92690c5..0000000
--- a/po/ca.po
+++ /dev/null
@@ -1,413 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <a@alexandresaiz.com>, 2011.
-# alexandresaiz <a@alexandresaiz.com>, 2011.
-#   <bielet@bielet.com>, 2011.
-# Carles Mateu <carlesm@carlesm.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "El projecte GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Benvinguts a SparkleShare"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Al dia"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Sincronitzant ..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "No està tot sincronitzat"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Copiar adreça web"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Copia l'adreça web d'aquest fitxer al portapapers"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Obtenir versió anterior"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Fer una còpia d'una versió anterior d'aquesta carpeta"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Selecciona per obtenir una còpia d'aquesta versió"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Imprimir la informació de versió"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Mostra aquest text d'ajuda"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "una eina d'intercanvi i col·laboració"
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010  Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Aquest programa ve sense, absolutament, cap garantia."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Aquest és programari lliure, i estas convidat a redistribuir-lo"
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"sota certes condicions. Si us plau, llegeix la GNU GPLv3 per obtenir més "
-"detalls."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare sincronitza automàticament repositoris Git a"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "carpeta ~ / SparkleShare amb els seus orígens remots."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Ús: sparkleshare [start|stop|restart] [OPCIÓ] ..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Sincronitza carpeta SparkleShare amb repositoris remots."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Arguments:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Sobre SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Hi ha una nova versió ({0}) disponible!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Estas utilitzant la darrera versió"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Comprovant actualitzacions..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Accions recents"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Totes les carpetes"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Abans de crear una carpeta de SparkleShare en aquest ordinador, necessitem "
-"algunes informacions sobre tu"
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Nom sencer:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Correu electrònic:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Següent"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Això pot trigar una estona."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Segur que no és l'hora del cafè?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Finalitzar"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Quelcom ha fallat."
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ ha estat afegit satisfactoriament"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Obrir Carpeta"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Instal·lació SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Desactiva les Notificacions"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Activa les Notificacions"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Sortir"
-
-
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
deleted file mode 100755
index 2aeb7d3..0000000
--- a/po/cs_CZ.po
+++ /dev/null
@@ -1,412 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Jiri Slezka <jiri.slezka@slu.cz>, 2011.
-#   <zzanzare@gmail.com>, 2011.
-# zzanzare <zzanzare@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Projekt GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Vítejte ve SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Aktuální"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synchronizuji…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Něco není synchronizováno"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Copy Web Link"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Zkopírovat webovou adresu tohoto souboru do schránky"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Získat dřívější verzi"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Vytvořit kopii dřívější verze souboru v tomto adresáři"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Vyberte pro získání kopie této verze"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Vypíše informace o verzi"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Zobrazit tuto nápovědu"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, nástroj pro sdílení a spolupráci."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Všechna práva vyhrazena (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Tento program je ABSOLUTNĚ BEZ ZÁRUKY."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Toto je svobodný software a můžete jej dále šířit."
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"za jistých podmínek. Prosím, přečtěte si GNU GPLv3 pro více informací."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare automaticky synchronizuje repozitáře Git v "
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "složce ~/SparkleShare s jejich vzdálenými protistranami."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Použití: sparkleshare [start|stop|restart] [VOLBY]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synchronizovat složku SparkleShare se vzdálenými repozitáři."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Argumenty:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "O SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Provozujete aktuální verzi."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Kontroluji aktualizace..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Nedávné události"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Všechny složky"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Než vytvoříme SparkeShare složku v tomto počítači, potřebujeme od Vás pár "
-"drobných informací."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Celé jméno:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Další"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Zrušit"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Jste si jistí, že není čas na kafe?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Dokončit"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' byl úspěšně přidán"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Otevřít složku"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Nastavení SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Vypnout upozornění"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Zapnout upozornění"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Ukončit"
-
-
diff --git a/po/da.po b/po/da.po
deleted file mode 100755
index a85995e..0000000
--- a/po/da.po
+++ /dev/null
@@ -1,408 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Aputsiaq Janussen <aputtu@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "GNOME-projektet"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Velkommen til SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Opdateret"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synkroniseret"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Ikke alt er synkroniseret"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Kopiér web-henvisning"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopiér web-adressen for denne til fil udklipsholder"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Hent tidligere versioner"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Lav en kopi af en tidligere version i denne mappe"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Vælg for at hente en kopi af denne version"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Vis versioninformation"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Vis denne hjælpetekst"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright(C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Dette program modtages UDEN NOGEN GARANTIER OVERHOVEDET."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Dette er fri software, og du er velkommen til at distribuere den "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "under visse betingelser. Læs venligst GNU GPL v3 for detaljer."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synkroniserer automatisk Git-depoter i "
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "mappen ~/SparkleShare med deres fjerne kilder."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Anvendelse: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synkroniser SparkleShare-mappe med fjerndepot"
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Argumenter:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Før vi kan oprette en SparkleShare-mappe på denne maskine, så har vi brug "
-"for nogle få informationer fra dig."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Fuldt navn:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "E-post:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Næste"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Afbryd"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Afslut"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Åbn mappe"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr ""
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Afslut"
-
-
diff --git a/po/de.po b/po/de.po
deleted file mode 100755
index b60fdfd..0000000
--- a/po/de.po
+++ /dev/null
@@ -1,436 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <ch3f@gmx.de>, 2011.
-#   <chrysn@fsfe.org>, 2011.
-# Heffer <felix@fetzig.org>, 2011.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-# kabum <uu.kabum@gmail.com>, 2011.
-#   <killerjoe@gmx.de>, 2011.
-# kxnop <m_leinmueller@hotmail.com>, 2011.
-# Łukasz Jernaś <deejay1@srem.org>, 2011.
-#   <mm@imsoftware.de>, 2011.
-# Sascha  <S.Lewandowski@abiwillich.de>, 2011.
-#   <urs.obernolte@googlemail.com>, 2011.
-#   <yujiang.wang@ymail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:42+0100\n"
-"PO-Revision-Date: 2011-11-16 09:20+0000\n"
-"Last-Translator: iwsnipy <S.Lewandowski@abiwillich.de>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/username/project"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "Freies Code-Hosting für Git und Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Freie öffentliche Git Repositories mit Mitarbeiterverwaltung"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/Projekt/Ablage"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr "Quelloffene Infrastruktur zum hosten von quelloffenen Projekten"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/Projekt"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Eine freie und einfache Schnittstelle für deinen Computer"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Das GNOME Projekt"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/Pfad/zum/Projekt"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Alles unter meiner Kontrolle"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "Auf meinem eigenen Server"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Willkommen bei SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Aktualisiert"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synchronisiere..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:123
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Es ist nicht alles synchronisiert"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:140
-msgid "Copy Web Link"
-msgstr "Web Link kopieren"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Die Internetadresse dieser Datei in die Zwischenablage kopieren"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:173
-msgid "Get Earlier Version"
-msgstr "Frühere Version abrufen"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Erstelle eine Kopie einer früheren Version in diesem Verzeichnis"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:187
-msgid "Select to get a copy of this version"
-msgstr "Selektieren, um eine Kopie dieser Version abzurufen"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Versionsinformationen anzeigen"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Diesen Hilfetext anzeigen"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, ein Werkzeug für verteilte Zusammenarbeit."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Diese Anwendung kommt OHNE IRGENDEINE GARANTIE."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Dies ist freie Software, die Sie gerne weitergeben dürfen"
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"unter bestimmten Bedingungen. Bitte lesen Sie die GNU GPLv3 für weitere "
-"Details."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synchronisiert sich automatisch mit Git Repositories"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "den SparkleShare-Ordner mit den entfernten Quellen."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Verwendung: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "SparkleShare Ordner mit dem Remote-Repository synchronisieren."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Parameter:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Über SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Eine neuere Version ({0}) ist verfügbar!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Sie verwenden die aktuelle Version."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Suche Aktualisierungen..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:494
-msgid "dddd, MMMM d, yyyy"
-msgstr "dd mm, yyyy"
-
-#: ../SparkleShare/SparkleControllerBase.cs:500
-msgid "dddd, MMMM d"
-msgstr "dd mm"
-
-#: ../SparkleShare/SparkleControllerBase.cs:708
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "Hinzugefügt '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:713
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "'{0}' verschoben"
-
-#: ../SparkleShare/SparkleControllerBase.cs:718
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "Bearbeitet '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:723
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "Gelöscht '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:732
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] "und {0} mehr"
-msgstr[1] "und {0} mehr"
-
-#: ../SparkleShare/SparkleControllerBase.cs:736
-msgid "did something magical"
-msgstr "hat etwas magisches"
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Letzte Ereignisse"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Alle Ordner"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Bevor wir einen SparkleShare-Ordner auf diesem Computer einrichten können, "
-"benötigen wir einige Informationen von Ihnen."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Vollständiger Name:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "E-Mail:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Weiter"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "Wo ist dein Projekt gehostet?"
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr "Adresse"
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr "Entfernter Pfad"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Füge Projekt '{0}' hinzu..."
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Das dauert vielleicht einen Moment."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Meinst Du nicht, dass es Kaffeezeit ist?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Fertigstellen"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Etwas ist schiefgelaufen"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr "Nochmal versuchen..."
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "»{0}« wurde erfolgreich hinzugefügt"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr "Projekt erfolgreich hinzugefügt!"
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr "Zugriff auf die Dateien von Ihrem SparkleShare Ordner."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Ordner öffnen"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr "Was passiert als nächstes?"
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-"SparkleShare erzeugt einen eigenen Ordner in Ihrem persönlichen Ordner, der "
-"den Überblick über Ihre Projekte behalten."
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "Tutorial überspringen"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "Weiter"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr "Dateien mit anderen teilen"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Alle zu Ihrem Projekt hinzugefügten Dateien sind automatisch mit dem Server "
-"und Ihren Mitarbeitern synchronisiert."
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr "Das Status Icon ist da um dir zu helfen"
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Es zeigt den Synchronisierungsstatus und beinhaltet Links zu deinem Projekt "
-"und deinen letzten Ereignissen."
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr "Füge Projekte zu SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Klicken den Button, wenn du ihn im Internet siehst, und das Projekt wird "
-"automatisch hinzu gefügt:"
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-"... oder wähle <b>'Füge gehostetes Projekt hinzu...'</b> im Statusmenü um "
-"einen via Hand hinzu zu fügen."
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr "Füge ein gehostetes Projekt hinzu..."
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "SparkleShare Konfiguration"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr "Bislang keine Projekte "
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr "Öffne letzte Ereignisse"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Benachrichtigungen deaktivieren"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Benachrichtigungen aktivieren"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Beenden"
-
-
diff --git a/po/el.po b/po/el.po
deleted file mode 100755
index dde0ee2..0000000
--- a/po/el.po
+++ /dev/null
@@ -1,389 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <e.sarbanis@gmail.com>, 2012.
-#   <manolis@kapcom.gr>, 2011.
-# Nikos Roussos <nikos@autoverse.net>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-17 19:31+0100\n"
-"PO-Revision-Date: 2012-02-22 10:43+0000\n"
-"Last-Translator: Nikos Roussos <nikos@autoverse.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/username/project"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "Δωρεάν φιλοξενία κώδικα για Git και Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Δωρεάν δημόσια Git αποθετήρια με διαχείριση συνεργατών"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/project/repository"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr "Open source υποδομή για φιλοξενία open source projects"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/project"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Ένα ελεύθερο και απλό interface για τον υπολογιστή σου"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Το GNOME Project"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/path/to/project"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Όλα κάτω απ' τον δικό μου έλεγχο"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "Στον δικό μου server"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:85
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:103
-#: ../SparkleShare/SparkleSetup.cs:66 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Καλώς ήλθατε στο SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:87
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Ενημερωμένα"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:114
-msgid "Syncing… "
-msgstr "Συγχρονισμός... "
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:129
-#: ../SparkleShare/SparkleStatusIcon.cs:118
-msgid "Not everything is synced"
-msgstr "Δεν είναι όλα συγχρονισμένα"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
-msgid "Copy Web Link"
-msgstr "Αντιγραφή Συνδέσμου Ιστού"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Αντιγραφή της διεύθυνσης ιστού αυτού του αρχείου στο πρόχειρο"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
-msgid "Get Earlier Version"
-msgstr "Λήψη Προηγούμενης Έκδοσης"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Δημιουργία αντιγράφου προηγούμενης έκδοσης αυτού του φακέλου"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
-msgid "Select to get a copy of this version"
-msgstr "Επιλογή για την λήψη αντιγράφου αυτής της έκδοσης"
-
-#: ../SparkleShare/Program.cs:50
-msgid "Print version information"
-msgstr "Εκτύπωση πληροφοριών έκδοσης"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Show this help text"
-msgstr "Εμφάνιση κειμένου βοήθειας"
-
-#: ../SparkleShare/Program.cs:83
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, ένα εργαλείο συνεργασίας και ανταλλαγής."
-
-#: ../SparkleShare/Program.cs:84
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:86
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Το πρόγραμμα αυτό δεν περιλαμβάνει ΑΠΟΛΥΤΩΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ"
-
-#: ../SparkleShare/Program.cs:88
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Αυτό είναι ένα δωρεάν πρόγραμμα, και είστε ευπρόσδεκτοι να το αναδιανείμετε "
-
-#: ../SparkleShare/Program.cs:89
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "υπό συγκεκριμένες προϋποθέσεις. Παρακαλώ διαβάστε το GNU GPLv3 για λεπτομέρειες."
-
-#: ../SparkleShare/Program.cs:91
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "Το SparkleShare συγχρονίζει αυτόματα αποθετήρια Git σε "
-
-#: ../SparkleShare/Program.cs:92
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "τον φάκελο ~/SparkleShare με τις απομακρυσμένες προελεύσεις τους."
-
-#: ../SparkleShare/Program.cs:94
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Χρήση: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Συγχρονισμός φακέλου SparkleShare με απομακρυσμένα αποθετήρια."
-
-#: ../SparkleShare/Program.cs:97
-msgid "Arguments:"
-msgstr "Παράμετροι:"
-
-#: ../SparkleShare/Program.cs:107
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Σχετικά με το SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Είναι διαθέσιμη μια πιο πρόσφατη έκδοση ({0})!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Έχετε την τελευταία έκδοση."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
-msgid "Checking for updates..."
-msgstr "Έλεγχος ενημερώσεων..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:471
-#: ../SparkleShare/SparkleControllerBase.cs:479
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d"
-msgstr "dddd, MMMM d"
-
-#: ../SparkleShare/SparkleControllerBase.cs:472
-msgid "Today"
-msgstr "Σήμερα"
-
-#: ../SparkleShare/SparkleControllerBase.cs:480
-msgid "Yesterday"
-msgstr "Χτες"
-
-#: ../SparkleShare/SparkleControllerBase.cs:487
-msgid "dddd, MMMM d, yyyy"
-msgstr "dddd, MMMM d, yyyy"
-
-#: ../SparkleShare/SparkleEventLog.cs:57
-msgid "Recent Events"
-msgstr "Πρόσφατα γεγονότα"
-
-#: ../SparkleShare/SparkleEventLog.cs:160
-msgid "All Projects"
-msgstr "Όλα τα projects"
-
-#: ../SparkleShare/SparkleEventLog.cs:179
-msgid "All Folders"
-msgstr "Όλοι οι Φάκελοι"
-
-#: ../SparkleShare/SparkleOptions.cs:486
-msgid "OptionName"
-msgstr "OptionName"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid "Full Name:"
-msgstr "Πλήρες όνομα:"
-
-#: ../SparkleShare/SparkleSetup.cs:97
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleSetup.cs:110 ../SparkleShare/SparkleSetup.cs:512
-#: ../SparkleShare/SparkleSetup.cs:532 ../SparkleShare/SparkleSetup.cs:550
-msgid "Continue"
-msgstr "Συνέχεια"
-
-#: ../SparkleShare/SparkleSetup.cs:138
-msgid "Where's your project hosted?"
-msgstr "Που φιλοξενείται το project σου;"
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr "Διεύθυνση"
-
-#: ../SparkleShare/SparkleSetup.cs:296
-msgid "Remote Path"
-msgstr "Απομακρυσμένο path"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:312 ../SparkleShare/SparkleSetup.cs:348
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:319
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: ../SparkleShare/SparkleSetup.cs:338
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Προσθήκη project ‘{0}’…"
-
-#: ../SparkleShare/SparkleSetup.cs:339
-msgid "This may take a while."
-msgstr "Αυτό μπορεί να πάρει λίγο χρόνο."
-
-#: ../SparkleShare/SparkleSetup.cs:340
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Είστε σίγουροι ότι δεν είναι ώρα για καφέ;"
-
-#: ../SparkleShare/SparkleSetup.cs:344 ../SparkleShare/SparkleSetup.cs:460
-#: ../SparkleShare/SparkleSetup.cs:577
-msgid "Finish"
-msgstr "Τέλος"
-
-#: ../SparkleShare/SparkleSetup.cs:377
-msgid "Something went wrong"
-msgstr "Κάτι πήγε λάθος"
-
-#: ../SparkleShare/SparkleSetup.cs:425
-msgid "Try Again…"
-msgstr "Προσπαθήστε ξανά..."
-
-#: ../SparkleShare/SparkleSetup.cs:444
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ προστέθηκε με επιτυχία"
-
-#: ../SparkleShare/SparkleSetup.cs:450
-msgid "Project successfully added!"
-msgstr "Το project προστέθηκε με επιτυχία!"
-
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Access the files from your SparkleShare folder."
-msgstr "Πρόσβαση στα αρχεία του SparkleShare φακέλου σας."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:454
-msgid "Open Folder"
-msgstr "Άνοιγμα Φακέλου"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid "What's happening next?"
-msgstr "Τι γίνεται μετά;"
-
-#: ../SparkleShare/SparkleSetup.cs:504
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr "Το SparkleShare δημιουργεί έναν ειδικό φάκελο στον προσωπικό σας φάκελο, στον οποίο παρακολουθεί τα project σας."
-
-#: ../SparkleShare/SparkleSetup.cs:507
-msgid "Skip Tutorial"
-msgstr "Παράληψη Οδηγού"
-
-#: ../SparkleShare/SparkleSetup.cs:528
-msgid "Sharing files with others"
-msgstr "Διαμοιρασμός αρχείων με άλλους"
-
-#: ../SparkleShare/SparkleSetup.cs:529
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr "Όλα τα αρχεία που προστίθενται στους φακέλους των project σου συγχρονίζονται αυτόματα με τον host, όπως και με τους συνεργάτες σου."
-
-#: ../SparkleShare/SparkleSetup.cs:546
-msgid "The status icon is here to help"
-msgstr "Το status icon είναι εδώ για να βοηθήσει"
-
-#: ../SparkleShare/SparkleSetup.cs:547
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr "Απεικονίζει την κατάσταση συγχρονισμού, και περιέχει συνδέσμους για τα projects και το ημερολόγιο ενεργειών."
-
-#: ../SparkleShare/SparkleSetup.cs:564
-msgid "Adding projects to SparkleShare"
-msgstr "Προσθήκη projects στο SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:565
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr "Απλώς πάτα αυτό το κουμπί όταν το δεις στο web, και το project θα προστεθεί αυτόματα:"
-
-#: ../SparkleShare/SparkleSetup.cs:568
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr "…ή επέλεξε <b>‘Προσθήκη Project…’</b> από το μενού του status icon για να προσθέσεις κάποιο χειροκίνητα."
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Στήσιμο SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Συγχρονισμός..."
-
-#: ../SparkleShare/SparkleStatusIcon.cs:229
-msgid "No projects yet"
-msgstr "Κανένα project ακόμα"
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleStatusIcon.cs:239
-msgid "Add Hosted Project…"
-msgstr "Προσθήκη Project..."
-
-#: ../SparkleShare/SparkleStatusIcon.cs:263
-msgid "Open Recent Events"
-msgstr "Πρόσφατες ενέργειες"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Ενεργοποίηση ειδοποιήσεων"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Απενεργοποίηση ειδοποιήσεων"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Εγκατάλειψη"
diff --git a/po/eo.po b/po/eo.po
deleted file mode 100755
index f0d5799..0000000
--- a/po/eo.po
+++ /dev/null
@@ -1,407 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# eliovir <eliovir@gmail.com>, 2011.
-#   <sven.koehler@student.hpi.uni-potsdam.de>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "La GNOME-projekto"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Bonvenon ĉe SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Kopii retejan ligilon"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopii la retejan adreson de tiu dosiero en la tondejon"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Akiri pli fruan version"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Elekti por akiri kopion de tiu versio"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Kopirajto (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr ""
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr ""
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Ĉiuj dosierujoj"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Nomo:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Retadreso:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Sekva"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Rezigni"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Malfermi dosierujon"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr ""
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr ""
-
-
diff --git a/po/es.po b/po/es.po
deleted file mode 100755
index 5640fdf..0000000
--- a/po/es.po
+++ /dev/null
@@ -1,394 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011.
-#   <jamelrom@gmail.com>, 2011.
-# jamelrom <jamelrom@gmail.com>, 2011.
-#   <luiso.perez@gmail.com>, 2011.
-#   <miguel.vaellomartinez@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-04 12:45+0100\n"
-"PO-Revision-Date: 2011-12-09 14:13+0000\n"
-"Last-Translator: miguxbe <miguel.vaellomartinez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/sparkleshare/team/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/usuario/proyecto"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "Alojamiento gratuito de código fuente para Git y Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Repositorios públicos y gratuitos de Git con gestión de colaboradores"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/proyecto/repositorio"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-"Infraestructura de código libre para almacenar proyectos de código libre"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/proyecto"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Una interfaz libre y sencilla para tu ordenador"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "El Proyecto GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/ruta/al/proyecto"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Todo bajo mi control"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "En mi propio servidor"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "¡Bienvenido a SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Actualizado"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Sincronizando..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
-#: ../SparkleShare/SparkleStatusIcon.cs:118
-msgid "Not everything is synced"
-msgstr "Pendiente de sincronizar"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
-msgid "Copy Web Link"
-msgstr "Copiar Enlace"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Copiar la dirección web de este archivo al portapapeles"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
-msgid "Get Earlier Version"
-msgstr "Obtener versión anterior"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Hacer una copia de una versión anterior en esta carpeta"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
-msgid "Select to get a copy of this version"
-msgstr "Seleccionar para obtener una copia de esta versión"
-
-#: ../SparkleShare/Program.cs:50
-msgid "Print version information"
-msgstr "Muestra la información de la versión"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Show this help text"
-msgstr "Mostrar este texto de ayuda"
-
-#: ../SparkleShare/Program.cs:83
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, una herramienta de compartición y colaboración"
-
-#: ../SparkleShare/Program.cs:84
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:86
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Este programa viene SIN NINGUNA GARANTÍA."
-
-#: ../SparkleShare/Program.cs:88
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Esto es software libre, y esta invitado a redistribuirlo"
-
-#: ../SparkleShare/Program.cs:89
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"bajo determinadas condiciones. Por favor lea la GNU GPLv3 para más detalles."
-
-#: ../SparkleShare/Program.cs:91
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare sincroniza automaticamente repositorios Git en "
-
-#: ../SparkleShare/Program.cs:92
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "La carpeta ~/SparkleShare con su origen remoto."
-
-#: ../SparkleShare/Program.cs:94
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Uso: sparkleshare [start|stop|restart] [OPCIÓN]..."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Sincronizar carpeta SparkleShare con el repositorio remoto."
-
-#: ../SparkleShare/Program.cs:97
-msgid "Arguments:"
-msgstr "Parámetros:"
-
-#: ../SparkleShare/Program.cs:107
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
-msgid "About SparkleShare"
-msgstr "Acerca de SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Esta disponible una nueva versión  ({0})"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Estas ejecutando la última versión"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
-msgid "Checking for updates..."
-msgstr "Comprobando actualizaciones..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:489
-msgid "dddd, MMMM d, yyyy"
-msgstr "dddd, MMMM d, yyyy"
-
-#: ../SparkleShare/SparkleControllerBase.cs:495
-msgid "dddd, MMMM d"
-msgstr "dddd, MMMM d"
-
-#: ../SparkleShare/SparkleEventLog.cs:56
-msgid "Recent Events"
-msgstr "Eventos recientes"
-
-#: ../SparkleShare/SparkleEventLog.cs:145
-#: ../SparkleShare/SparkleEventLog.cs:164
-msgid "All Folders"
-msgstr "Todas las carpetas"
-
-#: ../SparkleShare/SparkleOptions.cs:486
-msgid "OptionName"
-msgstr "OptionName"
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Correo electrónico:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "¿Dónde está almacenado su proyecto?"
-
-#: ../SparkleShare/SparkleSetup.cs:266
-msgid "Address"
-msgstr "Dirección"
-
-#: ../SparkleShare/SparkleSetup.cs:286
-msgid "Remote Path"
-msgstr "Ruta remota"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:307
-msgid "Add"
-msgstr "Añadir"
-
-#: ../SparkleShare/SparkleSetup.cs:326
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Añadiendo proyecto '{0}'..."
-
-#: ../SparkleShare/SparkleSetup.cs:327
-msgid "This may take a while."
-msgstr "Esto tardara un poco."
-
-#: ../SparkleShare/SparkleSetup.cs:328
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "¿Seguro que no es la hora del café?"
-
-#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
-#: ../SparkleShare/SparkleSetup.cs:558
-msgid "Finish"
-msgstr "Finalizar"
-
-#: ../SparkleShare/SparkleSetup.cs:365
-msgid "Something went wrong"
-msgstr "Algo falló"
-
-#: ../SparkleShare/SparkleSetup.cs:413
-msgid "Try Again…"
-msgstr "Intenta de nuevo..."
-
-#: ../SparkleShare/SparkleSetup.cs:432
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' Ha sido añadido correctamente"
-
-#: ../SparkleShare/SparkleSetup.cs:438
-msgid "Project successfully added!"
-msgstr "Proyecto añadido con éxito!"
-
-#: ../SparkleShare/SparkleSetup.cs:439
-msgid "Access the files from your SparkleShare folder."
-msgstr "Acceso a los archivos desde tu carpeta de SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:442
-msgid "Open Folder"
-msgstr "Abrir carpeta"
-
-#: ../SparkleShare/SparkleSetup.cs:484
-msgid "What's happening next?"
-msgstr "¿Qué está pasando ahora?"
-
-#: ../SparkleShare/SparkleSetup.cs:485
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-"SparkleShare crea una carpeta especial en tu carpeta personal que mantendrá "
-"un historial de tus proyectos."
-
-#: ../SparkleShare/SparkleSetup.cs:488
-msgid "Skip Tutorial"
-msgstr "Saltar Tutorial"
-
-#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
-#: ../SparkleShare/SparkleSetup.cs:531
-msgid "Continue"
-msgstr "Continuar"
-
-#: ../SparkleShare/SparkleSetup.cs:509
-msgid "Sharing files with others"
-msgstr "Compartiendo archivos con otros"
-
-#: ../SparkleShare/SparkleSetup.cs:510
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Todos los ficheros añadidos a tus carpetas de proyectos son sincronizadas "
-"automáticamente con el equipo, asi como con tus colaboradores."
-
-#: ../SparkleShare/SparkleSetup.cs:527
-msgid "The status icon is here to help"
-msgstr "El icono de estado esta aquí para ayudarte"
-
-#: ../SparkleShare/SparkleSetup.cs:528
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Muestra el proceso de sincronización, y contiene enlaces a tus  proyectos y "
-"al registro de eventos."
-
-#: ../SparkleShare/SparkleSetup.cs:545
-msgid "Adding projects to SparkleShare"
-msgstr "Añadiendo proyectos a SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:546
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Basta con hacer clic en este botón cuando lo veas en la web, y el proyecto "
-"se agregará automáticamente:"
-
-#: ../SparkleShare/SparkleSetup.cs:549
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-"... o seleccione <b>\"Agregar proyecto alojado ... \"</b> en el menú del "
-"icono de estado para agregar uno manualmente."
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Configuración de SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:230
-msgid "No projects yet"
-msgstr "No hay proyectos aún"
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleStatusIcon.cs:240
-msgid "Add Hosted Project…"
-msgstr "Añadir proyecto almacenado..."
-
-#: ../SparkleShare/SparkleStatusIcon.cs:264
-msgid "Open Recent Events"
-msgstr "Abrir eventos recientes"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications Off"
-msgstr "Desactivar las notificaciones"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:286
-msgid "Turn Notifications On"
-msgstr "Activar las notificaciones"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:313
-msgid "Quit"
-msgstr "Salir"
-
-
diff --git a/po/fi.po b/po/fi.po
deleted file mode 100755
index 3fadc18..0000000
--- a/po/fi.po
+++ /dev/null
@@ -1,410 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <joppu1@gmail.com>, 2011.
-# Łukasz Jernaś <deejay1@srem.org>, 2011.
-# Olli Jarva <olli@jarva.fi>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "GNOME-projekti"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Tervetuloa SparkleShareen!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Ajantasalla"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synkronoidaan..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Kaikkea ei ole synkronoitu"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Kopioi web-linkki"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopioi tämän tiedoston osoite leikepöydälle"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Hae vanhempi versio"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Tee kopio tämän hakemiston aikaisemmasta versiosta"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Tee kopio tästä versiosta"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Tulosta versiotiedot"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Näytä tämä ohjeteksti"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, yhteistyö- ja jakotyökalu."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Tällä ohjelmalla EI OLE TAKUUTA."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Tämä on vapaa ohjelma, ja saat vapaasti levittää sitä"
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "tietyin ehdoin. Saat lisätietoja GNU GPLv3:sta."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synkronoi automaattisesti Git-tietokannat"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "~/SparkleShare-kansiosta etäpalvelinten kanssa."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Käyttö: sparkleshare [start|stop|restart] [asetukset]"
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synkronoi SparkleShare-kansio etätietokantoihin."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Parametrit:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Tietoja SparkleSharesta"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Sinulla on uusin versio käytössäsi"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Tarkistetaan päivityksiä..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Ennen kuin voit luoda SparkleShare-kansio tälle tietokoneelle, tarvitsemme "
-"joitain tietoja sinusta."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Koko nimi:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Sähköposti:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Seuraava"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Peruuta"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Oletko varma, että ei ole kahvitauon paikka?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Valmis"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' lisättiin onnistuneesti"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Avaa hakemisto"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "SparkleSharen asennus"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Poista ilmoitukset käytöstä"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Ota ilmoitukset käyttöön"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Lopeta"
-
-
diff --git a/po/fr.po b/po/fr.po
deleted file mode 100755
index c4479fe..0000000
--- a/po/fr.po
+++ /dev/null
@@ -1,421 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# angelini paa <angelini@univ-rennes1.fr>, 2011.
-#   <baje001@gmail.com>, 2011.
-# Bruno ARLIGUY <from-transifex@arliguy.net>, 2011.
-# Crash <quentin.valmori@gmail.com>, 2011.
-# Thomas Menga <lekiss@gmail.com>, 2011.
-# Yann Yann <chezyann@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-11-04 22:18+0000\n"
-"Last-Translator: chezyann <chezyann@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/nom-d-utilisateur/projet"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "Hébergement gratuit de code pour Git et Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Dépôts Git gratuits avec gestion des collaborateurs"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/projet/depot"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr "Infrastructure open source d'hébergement de projets open source"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/projet"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Une interface facile et gratuite pour votre ordinateur"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Le projet GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/chemin/du/projet"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Tout est sous mon contrôle"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "Mon propre serveur"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Bienvenue sur SparkleShare !"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "À jour"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synchronisation en cours…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Tout n'est pas synchronisé"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Copier le lien web"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Copier l'adresse internet de ce fichier dans le presse‑papier"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Obtenir une version antérieure"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Créer une copie d'une version antérieure de ce dossier"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Sélectionner pour obtenir une copie de cette version"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Affiche les informations de la version"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Afficher ce texte d’aide"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, outils de collaboration et de partage"
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Ce logiciel est diffusé sans AUCUNE GARANTIE."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Ce logiciel est libre et vous êtes invité à le re‑distribuer  "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"sous certaines conditions. Merci de lire la licence GNU GPLv3 pour de plus "
-"amples informations."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synchronise automatiquement les dépôts Git dans "
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "le dossier ~/SparkleShare avec leurs racines distantes."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Utilisation : sparkleshare [start|stop|restart] [OPTION]…"
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synchroniser le dossier SparkleShare avec les dépôts distants."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Paramètres :"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "À propos de SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Une nouvelle version ({0}) est disponible!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Vous disposez de la dernière version."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Vérification des mises à jour…"
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr "dddd d MMMM yyyy"
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr "dddd d MMMM"
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "Ajouté: ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "Déplacé: ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "Modifié: ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "Supprimé: ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr "Attendez un miracle"
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Évènements récents"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Tous les dossiers"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Afin de pouvoir créer un dossier SparkleShare sur cet ordinateur, nous avons"
-" besoin de quelques informations."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Nom et prénom :"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Email :"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Suivant"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "Où est hebergé votre projet ?"
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr "Adresse"
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr "Chemin à distance"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Annuler"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Ajout du projet '{0}'"
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Cela peut prendre un peu de temps."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Ne pensez-vous pas qu'il est temps de prendre un café ?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Terminer"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Il y a eu un problème"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr "Réessayez..."
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "« {0} » a été ajouté avec succès"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr "Projet ajouté !"
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr "Accéder vos fichiers depuis le répertoire Sparkleshare"
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Ouvrir le dossier"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr "Et ensuite ?"
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr "Sparkleshare crée un répertoire spécial pour vos projets"
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "Passer ce tutoriel"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "Continuer"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr "Partager des fichers avec d'autres utilisateurs"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Tous les fichiers ajoutés à votre projet sont synchronisés automatiquement, "
-"avec les vôtres ou ceux qui collaborent avec vous"
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr "L'îcone d'état est là pour vous aider"
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Elle montre l'état du processus de synchronisation et contient les liens "
-"vers vos projets, ainsi que l'historique des évènements "
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr "Ajout de projets dans SpakleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Cliquez sur ce bouton dans une page Web, et le projet sera automatiquement "
-"ajouté"
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr "Ajouter un projet hébergé..."
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Configuration de SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr "Pas de projets déclarés"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr "Ouvrir les évènements récents"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Désactiver les notifications"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Activer les notifications"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Quitter"
-
-
diff --git a/po/he.po b/po/he.po
deleted file mode 100755
index 8752c0f..0000000
--- a/po/he.po
+++ /dev/null
@@ -1,407 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <ophir.setter+transifex@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-11-01 20:06+0000\n"
-"Last-Translator: ophir <ophir.setter+transifex@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "גיטוריוס"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "פרוייקט גנום"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "הכל תחת שליטתי"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "שרת משלי"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "ברוכים הבאים לספארקלשר!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "מעודכן"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "מסנכרן..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "לא הכל מסונכרן"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "העתק לינק"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "העתק את כתובת האינטרנט של קובץ זה ללוח העריכה (clipboard)"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "קבל גרסה קודמת"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "צור העתק של גרסה קודמת בתקייה זו"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "בחר כדי לקבל העתק של גרסה זו"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "מידע גרסת ההדפסה"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "הראה את מלל העזרה"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "זכויות שמורות (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "תוכנה זו באה ללא כל אחריות."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "תוכנה זו הינה חופשית ואתם מוזמנים להפיצה"
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "תחת תנאים מסויימים. אנא קראו את רשיון GNU GPLv3 לקבלת פרטים."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr ""
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "שימוש: sparkleshare [start|stop|restart] [אפשרויות]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "סנכרן תקיית ספארקלשר עם מאגרים מרוחקים."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "ארגומנטים:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "ספארקלשר"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "אודות ספארקלשר"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "גירסה חדשה יותר ({0}) זמינה!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "אתה מריץ את הגרסה המעודכנת ביותר"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "בודק עדכונים..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "‘{0}’ הוסף"
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "‘{0}’ הוזז"
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "‘{0}’ שונה"
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "‘{0}’ נמחק"
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "אירועים אחרונים"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "כל התיקיות"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"לפני שנוכל ליצור תקיית ספארקלשר על מחשב זה, אנו צריכים כמה פיסות מידע ממך."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "שם מלא:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "דוא\"ל:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "הבא"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "בטל"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr "הוסף"
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "מוסיף פרויקט ‘{0}’…"
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "זה עלול לקחת זמן מה"
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "מה אתה אומר על קפה?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "סיים"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "משהו השתבש"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr "נסה שוב..."
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ הוסף בהצלחה"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr "פרויקט הוסף בהצלחה!"
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr "גש לקבצים מתיקיית ספארקלשר"
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "פתח תקייה"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr "מה עכשיו?"
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "דלג על הדרכה"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "המשך"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr "שיתוף קבצים עם אחרים"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr "הוספת פרויקטים לספארקלשר"
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr "לחץ כאן כשאתה רואה אותו ברשת, והפרויקט יתווסף אוטומטית:"
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "התקנת ספארקלשר"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr "עדיין אין פרויקטים"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr "פתח אירועים אחרונים"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "כבה הודעות"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "הפעל הודעות"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "צא"
-
-
diff --git a/po/hu.po b/po/hu.po
deleted file mode 100755
index d73ac4c..0000000
--- a/po/hu.po
+++ /dev/null
@@ -1,409 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Zoltan Hoppár <hopparz@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "A GNOME Project"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Üdvözli a SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Naprakész"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Szinkronizálás..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Nincs minden szinkronizálva"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Weblink kimásolása"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kimásolja ennek a fájlnak webcímét a vágólapra"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Korábbi verzió beszerzése"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Korábbi verzió másolása ebbe a mappába"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Válasszon hogy egy korábbi változatot megkapjon"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Verzió információk nyomtatása"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Ezt a súgó segítséget jeleníti meg"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, az együttműködés és megosztás eszköze."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Erre a programra nincs SEMMIFÉLE GARANCIA."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Ez egy szabad szoftver, és mindig örülünk, ha terjesztik "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"bizonyos feltételek mellett. Kérjük, olvassa el a GNU GPLv3 a részletekért."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare automatikusan szinkronizálja Git adattárakat a"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "a ~/SparkleShare mappával a távoli eredetükkel."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Használat: sparkleshare [start | stop | újraindítás] [OPCIÓK] ..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "A SparkleShare mappa szinkronizálása a távoli tárolókkal."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Paraméterek:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "A SparkleShare-ről"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Az elérhető legújabb verziót használja."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Frissítések keresése..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Utóbbi események"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "MInden mappa"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Mielőtt még egy SparkleShare mappát készítenénk ezen a gépen, még néhány "
-"apró információra lenne szükség."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Teljes név:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Következő"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Mégsem"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Biztos benne, hogy nincs kávészünet?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Befejezés"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' sikeresen hozzáadva"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Mappa megnyitása"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "SparkleShare beállítása"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Értesítések kikapcsolása"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Értesítések bekapcsolása"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Kilépés"
-
-
diff --git a/po/it.po b/po/it.po
deleted file mode 100755
index 63faad3..0000000
--- a/po/it.po
+++ /dev/null
@@ -1,391 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Ilias Bartolini <ilias.bartolini@gmail.com>, 2011.
-#   <i.spalletti@nephila.it>, 2011.
-# Luca Delucchi <lucadeluge@gmail.com>, 2011.
-# Łukasz Jernaś <deejay1@srem.org>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-04 12:45+0100\n"
-"PO-Revision-Date: 2011-12-19 14:27+0000\n"
-"Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/nome-utente/progetto"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "Hosting gratuito di codice per Git e Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Repository pubblici gratuiti con gestione dei collaboratori"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/progetto/repository"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorius"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr "Infrastruttura Open sourc per lo hosting di progetti open source"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/progetto"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Un'interfaccia gratuita e facile per il tuo computer"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "The GNOME Project"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/percorso/per/progetto"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Tutto sotto il mio controllo"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "Il mio server"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Benvenuto in SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Aggiornato"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Sincronizzazione in corso..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
-#: ../SparkleShare/SparkleStatusIcon.cs:118
-msgid "Not everything is synced"
-msgstr "Non tutto è sincronizzato"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
-msgid "Copy Web Link"
-msgstr "Copia link web"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Copia l'indirizzo web di questo file"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
-msgid "Get Earlier Version"
-msgstr "Prendi versione precedente"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Esegui una copia di una precedente versione di questa cartella"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
-msgid "Select to get a copy of this version"
-msgstr "Seleziona per ottenere una copia di questa versione"
-
-#: ../SparkleShare/Program.cs:50
-msgid "Print version information"
-msgstr "Stampa informazioni sulla versione"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Show this help text"
-msgstr "Mostra questo messaggio di aiuto"
-
-#: ../SparkleShare/Program.cs:83
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, uno strumento collaborativo e di condivisione"
-
-#: ../SparkleShare/Program.cs:84
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:86
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Questo programma viene fornito ASSOLUTAMENTE SENZA NESSUNA GARANZIA."
-
-#: ../SparkleShare/Program.cs:88
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Questo è software libero e sei invitato a redistribuirlo"
-
-#: ../SparkleShare/Program.cs:89
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"rispettando alcune restrizioni. Leggi la licenza GNU GPLv3 per i dettagli"
-
-#: ../SparkleShare/Program.cs:91
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare sincronizza automaticamente i repository Git nella"
-
-#: ../SparkleShare/Program.cs:92
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "cartella ~/.SparkleShare con le loro origini."
-
-#: ../SparkleShare/Program.cs:94
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Utilizzo: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Sincronizza cartella SparkleShare con repository remoti."
-
-#: ../SparkleShare/Program.cs:97
-msgid "Arguments:"
-msgstr "Argomenti"
-
-#: ../SparkleShare/Program.cs:107
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
-msgid "About SparkleShare"
-msgstr "Informazioni su SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "È disponibile una nuova versione ({0})"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Stai eseguendo l'ultima versione"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
-msgid "Checking for updates..."
-msgstr "Controllo aggiornamenti..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:489
-msgid "dddd, MMMM d, yyyy"
-msgstr "dddd, MMMM d, yyyy"
-
-#: ../SparkleShare/SparkleControllerBase.cs:495
-msgid "dddd, MMMM d"
-msgstr "dddd, MMMM d"
-
-#: ../SparkleShare/SparkleEventLog.cs:56
-msgid "Recent Events"
-msgstr "Eventi recenti"
-
-#: ../SparkleShare/SparkleEventLog.cs:145
-#: ../SparkleShare/SparkleEventLog.cs:164
-msgid "All Folders"
-msgstr "Tutte le cartelle"
-
-#: ../SparkleShare/SparkleOptions.cs:486
-msgid "OptionName"
-msgstr "OptionName"
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Nome e Cognome:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Successivo"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "Dov'è ospitato il tuo progetto?"
-
-#: ../SparkleShare/SparkleSetup.cs:266
-msgid "Address"
-msgstr "Indirizzo"
-
-#: ../SparkleShare/SparkleSetup.cs:286
-msgid "Remote Path"
-msgstr "Percorso remoto"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
-msgid "Cancel"
-msgstr "Cancella"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:307
-msgid "Add"
-msgstr "Aggiungi"
-
-#: ../SparkleShare/SparkleSetup.cs:326
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Progetto '{0}' in aggiunta..."
-
-#: ../SparkleShare/SparkleSetup.cs:327
-msgid "This may take a while."
-msgstr "Questa operazione potrebbe richiedere un po' di tempo."
-
-#: ../SparkleShare/SparkleSetup.cs:328
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Sei sicuro che non sia l'ora di un caffè?"
-
-#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
-#: ../SparkleShare/SparkleSetup.cs:558
-msgid "Finish"
-msgstr "Fine"
-
-#: ../SparkleShare/SparkleSetup.cs:365
-msgid "Something went wrong"
-msgstr "Qualcosa è andato storto"
-
-#: ../SparkleShare/SparkleSetup.cs:413
-msgid "Try Again…"
-msgstr "Prova ancora..."
-
-#: ../SparkleShare/SparkleSetup.cs:432
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ è stato aggiunto con successo"
-
-#: ../SparkleShare/SparkleSetup.cs:438
-msgid "Project successfully added!"
-msgstr "Progetto aggiunto con successo"
-
-#: ../SparkleShare/SparkleSetup.cs:439
-msgid "Access the files from your SparkleShare folder."
-msgstr "Accedi i file dalla tua cartella SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:442
-msgid "Open Folder"
-msgstr "Apri cartella"
-
-#: ../SparkleShare/SparkleSetup.cs:484
-msgid "What's happening next?"
-msgstr "Cosa fare adesso?"
-
-#: ../SparkleShare/SparkleSetup.cs:485
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-"SparkleShare crea una cartella speciale nella tua cartella personale per "
-"tenere traccia dei tuoi progetti."
-
-#: ../SparkleShare/SparkleSetup.cs:488
-msgid "Skip Tutorial"
-msgstr "Salta l'Introduzione"
-
-#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
-#: ../SparkleShare/SparkleSetup.cs:531
-msgid "Continue"
-msgstr "Continua"
-
-#: ../SparkleShare/SparkleSetup.cs:509
-msgid "Sharing files with others"
-msgstr "Condividere i tuoi file con altri"
-
-#: ../SparkleShare/SparkleSetup.cs:510
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Tutti i file inseriti nelle cartelle dei tuoi progetti sono sincronizzati in"
-" automatico con il server e con i tuoi collaboratori."
-
-#: ../SparkleShare/SparkleSetup.cs:527
-msgid "The status icon is here to help"
-msgstr "L'icona di stato è qui per aiutare"
-
-#: ../SparkleShare/SparkleSetup.cs:528
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Mostra il progresso della sicronizzazione, e contiene collegamenti ai tuoi "
-"progetti e al registro degli eventi."
-
-#: ../SparkleShare/SparkleSetup.cs:545
-msgid "Adding projects to SparkleShare"
-msgstr "Aggiungere progetti a SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:546
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Fai click su questo bottone quando lo vedi sul web e il progetto sarà "
-"automaticamente aggiunto:"
-
-#: ../SparkleShare/SparkleSetup.cs:549
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-"...o seleziona <b>'Aggiungi progetto ospitato'</b> dall'icona di stato per "
-"aggiungerne uno a mano."
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Impostazioni "
-
-#: ../SparkleShare/SparkleStatusIcon.cs:230
-msgid "No projects yet"
-msgstr "Nessun progetto per il momento"
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleStatusIcon.cs:240
-msgid "Add Hosted Project…"
-msgstr "Aggiungi progetto ospitato..."
-
-#: ../SparkleShare/SparkleStatusIcon.cs:264
-msgid "Open Recent Events"
-msgstr "Apri eventi recenti"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications Off"
-msgstr "Spegni le notifiche"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:286
-msgid "Turn Notifications On"
-msgstr "Accendi le notifiche"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:313
-msgid "Quit"
-msgstr "Esci"
-
-
diff --git a/po/ja.po b/po/ja.po
deleted file mode 100755
index 0971fd3..0000000
--- a/po/ja.po
+++ /dev/null
@@ -1,407 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <masa@takatsuka.org>, 2011.
-#   <matsuu@gmail.com>, 2011.
-#   <syunji@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "GNOMEプロジェクト"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "SparkleShareへようこそ！"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "最新の状態です。"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "同期中..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "すべてが同期されていません"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "ウェブリンクのコピー"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "このファイルのウェブアドレスをクリップボードにコピー"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "新しいバージョンの取得"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "このフォルダに古いヴァージョンのコピーを作成"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "このヴァージョンを選択し、コピー"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "バージョン情報の表示"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "このヘルプテキストを表示"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare、コラボレーションと共有のためのツールです。"
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C)2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "このプログラムは完全無保証です。"
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "これはフリーソフトウェアであり、再配布を歓迎します。"
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "一定の条件の下で。詳細については、GNUのGPLv3をお読みください。"
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShareは自動的に..のGitリポジトリと同期します"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "リモートの元フォルダを含んだ~/SparkleShareフォルダ"
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "使用法: sparkleshare [start|stop|restart] [オプション]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "SparkleShareフォルダをリモートのリポジトリと同期。"
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "引数："
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "SparkleShareについて"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "新しいバージョン ({0}) が利用できます！"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "最新のバージョンです。"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "更新の確認中..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "最近のイベント"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "全てのフォルダ"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr "SparkleShareのフォルダをこのコンピュータ上に作成する前に、少しですがお知らせがあります。"
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "氏名:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "電子メール:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "次"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr "アドレス"
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr "リモートパス"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "コーヒー時ではありませんか？"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "完了"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}'は正常に追加されました"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "フォルダを開く"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "チュートリアルをスキップする"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "続ける"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "SparkleShareセットアップ"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr "最近のイベントを開く"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "通知をオフ"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "通知をオン"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "終了"
-
-
diff --git a/po/nl.po b/po/nl.po
deleted file mode 100755
index 6aa7dd2..0000000
--- a/po/nl.po
+++ /dev/null
@@ -1,427 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <benjamincottyn@gmail.com>, 2011.
-#   <hylkebons@gmail.com>, 2011.
-#   <inxidious@gmail.com>, 2011.
-# Łukasz Jernaś <deejay1@srem.org>, 2011.
-#   <m.manshanden@gmail.com>, 2011.
-#   <mr.mmans@gmail.com>, 2011.
-# smeagiel <michielaiso@hotmail.com>, 2011.
-#   <sven.koehler@student.hpi.uni-potsdam.de>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-11-06 22:01+0000\n"
-"Last-Translator: mmans <mr.mmans@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/gebruikersnaam/project"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "Gratis hosting voor Git en Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Gratis publieke repositories met teambeheer."
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/project/repository"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr "Opensource infrastructuur voor het hosten van opensource projecten."
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/project"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Een gratis en gemakkelijke interface voor uw computer"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Het GNOME Project"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/pad/naar/project"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Alles onder mijn controle"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "Op mijn eigen server"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Welkom bij SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Up-to-date"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synchroniseren…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Niet alles is gesynchroniseerd"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Kopiëer weblink"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopiëer het web-adres van dit bestand naar het plakbord"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Verkrijg eerdere versie"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Maak een kopie van een oudere versie naar deze map"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Selecteer voor een kopie van deze versie"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Druk versie-informatie af"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Toon deze helptekst"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, een programma om samen te werken en te delen."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Er zit ABSOLUUT GEEN GARANTIE op dit programma."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
-"Dit is vrije software en je bent van harte uitgenodigd om het te "
-"herdistribueren "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr " onder bepaalde voorwaarden. Zie de GNU GPLv3 voor meer informatie."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synchroniseert automatisch Git repositories in "
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "de ~/SparkleShare map met de externe bron."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Gebruik: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synchroniseer de SparkleShare map met externe repositories"
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Argumenten:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Over SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Een nieuwe versie ({0}) is beschikbaar!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "U werkt met de nieuwste versie."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Controleren op updates ..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr "dddd, MMMM d, yyyy"
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr "dddd, MMMM d"
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "toegevoegd: ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "verplaatst: ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "bewerkt: ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "verwijderd: ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] "en nog {0}"
-msgstr[1] "en nog {0}"
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr "deed iets magisch"
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Recente gebeurtenissen"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Alle mappen"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Voordat we een SparkleShare map op deze computer kunnen aanmaken, hebben we "
-"eerst wat informatie van je nodig."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Volledige naam:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "E-mailadres"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Volgende"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "Waar word het project gehost?"
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr "Adres"
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr "Extern pad"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr "Toevoegen"
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Project '{0}' toevoegen..."
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Dit kan even duren."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Tijd voor een Cup-a-Soup?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Voltooien"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Er ging iets mis"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr "Opnieuw proberen..."
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' is met succes toegevoegd"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr "Project succesvol toegevoegd!"
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr "Benader de gesynchroniseerde bestanden in je SparkleShare-map."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Map openen"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr "What gebeurt er nu?"
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-"SparkleShare maakt een speciale map in je persoonlijke map die je projecten "
-"in de gaten houdt."
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "Tutorial overslaan"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr "Bestanden delen met anderen"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Alle bestanden die je aan je projectmappen toevoegt worden automatisch "
-"gesynchroniseerd met de host en je team."
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr "Het statusicoon bied hulp"
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Het toont de voortgang van het synchroniseerproces en bevat links naar je "
-"projecten en het logboek."
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr "Projecten toevoegen aan SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Klik op deze knop wanneer je deze tegenkomt op het web, en het project wordt"
-" automatisch toegevoegd."
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-"…of selecteer <b>‘Gehost project toevoegen…’</b> in het menu van het "
-"statusicoon om een project met de hand toe te voegen."
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr "Gehost project toevoegen…"
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "SparkleShare Setup"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr "Nog geen projecten"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr "Logboek openen"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Zet mededelingen uit"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Zet mededelingen aan"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Afsluiten"
-
-
diff --git a/po/nn_NO.po b/po/nn_NO.po
deleted file mode 100755
index 5d37aec..0000000
--- a/po/nn_NO.po
+++ /dev/null
@@ -1,408 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <ajarmund@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "GNOME-prosjektet"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Velkommen åt SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synkroniserer..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Ikkje alt er synkronisert"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Kopier web-lenke"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Skaff ein tidlegare versjon"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Lag ein kopi av ein tidlegare versjon i denne mappa"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Vel for å få ein kopi av tidlegare versjon"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Skriv ut versjonsinformasjon"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Vis denne hjølpsomme teksten"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Dette programmet kjem heilt uten garantiar."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Dette er fri programvare, og du står fritt til å spre det"
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "under nokre få vilkår. Les GNU GPLv3 for fleire detaljar"
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synkroniserer automatisk Git-strukturar i"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "~/SparkleShare-mappa med fjernfilane"
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Om SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Du køyrer den nyaste versjonen."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Ser etter oppdateringar..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Siste hendingar"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Alle mapper"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Før me kan lage ei SparkleShare-mappe på denne datamaskina, må me ha litt "
-"meir informasjon frå deg."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Fullt namn:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "E-post:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Neste"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Dette kan ta ei tid"
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Ta deg ei kaffitår"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Ferdig"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Noko gjekk gale"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Opne mappe"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr ""
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Avslutt"
-
-
diff --git a/po/no_NO.po b/po/no_NO.po
deleted file mode 100755
index 9b825f2..0000000
--- a/po/no_NO.po
+++ /dev/null
@@ -1,418 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <ajarmund@gmail.com>, 2011.
-# habakke <habakke@matrise.net>, 2011.
-#   <vegard.aarseth@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: no_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "GNOME Prosjektet"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Velkommen til SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Oppdatert"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synkroniserer..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Ikke alt er synkronisert"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Kopier web-link"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopier denne filens web-addresse til utklippstavlen"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Hent tidligere versjon"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Lag en kopi av en tidligere versjon i denne mappen"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Velg for å få en kopi av denne versjonen."
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Print versjons informasjon"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Vis denne hjelpeteksten"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, et samarbeids- og fildelingsverktøy"
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Dette programmet kommer med ABSOLUTT INGEN GARANTI."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
-"Dette er fri programvare, og du er velkommen til å videredistribuere det"
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "under visse vilkår. Vennligst les GNU GPLv3 for detaljer."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synkroniserer automatisk Git repositories i"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "på ~ / SparkleShare mappe med deres eksterne opprinnelse."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Bruk: sparkleshare [start | stop | restart] [VALG] ..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synkroniser SparkleShare mappe med eksterne repositories."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Argumenter:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Om SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "En nyere versjon ({0}) er tilgjengelig!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Du kjører siste versjon"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Ser etter oppdateringer..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Nylige hendelser"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Alle mapper"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Før vi kan lage en SparkleShare mappe på denne datamaskinen, trenger vi litt"
-" informasjon fra deg."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Fullt navn:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "E-post:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Neste"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Dette kan ta en stund."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-"Ta deg en kopp te:\n"
-"Kok opp vann\n"
-"Ha litt varmt vann i koppen\n"
-"Tøm koppen, og ha i teposen\n"
-"Tilsett varmt vann, ev. sukker og melk eller sitronsaft\n"
-"Nyt teen\n"
-"Kom tilbake, og nyt SparkleShare!"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Fullfør"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Noe gikk galt"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ har blitt lagt til"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Åpne Mappe"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Sett opp SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Slå av varslinger"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Slå på varslinger"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Avslutt"
-
-
diff --git a/po/pl.po b/po/pl.po
deleted file mode 100755
index 1dcdd54..0000000
--- a/po/pl.po
+++ /dev/null
@@ -1,430 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Łukasz Jernaś <deejay1@srem.org>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 13:18+0100\n"
-"PO-Revision-Date: 2011-11-12 12:34+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/nazwa uzytkownika/projekt"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-"Darmowe utrzymywanie kodu dla projektów zarządzanych przez git oraz "
-"Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Darmowe publiczne repozytoria git z obsługą współpracowników"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/projekt/repozytorium"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-"Infrastruktura o otwartym kodzie źródłowym dla projektów o otwartym kodzie "
-"źródłowym"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/project"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Wolny i prosty interfejs dla komputerów"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Projekt GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/ścieżka/do/projektu"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Wszystko pod własną kontrolą"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "Na własnym serwerze"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Witamy w programie SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Wszystko jest aktualne"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synchronizowanie…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:123
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Nie wszystko zostało zsynchronizowane"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Skopiuj odnośnik"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopiuje adres URL tego pliku do schowka"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Pobierz wcześniejszą wersję"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Tworzy kopię wcześniejszej wersji w tym katalogu"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Zaznacz, aby pobrać kopię tej wersji"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Wyświetla informacje o wersji"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Wyświetla opcje pomocy"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare ‒ narzędzie wspomagające współpracę."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Niniejszy program dostarczany jest BEZ JAKIEJKOLWIEK GWARANCJI."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
-"Niniejszy program jest wolnym oprogramowaniem, można go rozprowadzać dalej "
-"pod pewnymi warunkami."
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"Aby uzyskać więcej informacji, proszę zapoznać się z tekstem licencji GNU "
-"GPLv3."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr ""
-"Program SparkleShare automatycznie synchronizuje repozytoria Git znajdujące "
-"się"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "w katalogu ~/SparkleShare z ich zdalnymi gałęziami."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Użycie: sparkleshare [start|stop|restart] [OPCJA]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
-"Synchronizuj zawartość katalogu SparkleShare ze zdalnymi repozytoriami."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Parametry:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Informacje o"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Dostępna jest nowa wersja: {0}"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Korzystasz z najnowszej wersji."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Wyszukiwanie aktualizacji"
-
-#: ../SparkleShare/SparkleControllerBase.cs:494
-msgid "dddd, MMMM d, yyyy"
-msgstr "dddd, d MMMM yyyy"
-
-#: ../SparkleShare/SparkleControllerBase.cs:500
-msgid "dddd, MMMM d"
-msgstr "dddd, d MMMM"
-
-#: ../SparkleShare/SparkleControllerBase.cs:708
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "dodano \"{0}\""
-
-#: ../SparkleShare/SparkleControllerBase.cs:713
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "przesunięto \"{0}\""
-
-#: ../SparkleShare/SparkleControllerBase.cs:718
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "edytowano \"{0}\""
-
-#: ../SparkleShare/SparkleControllerBase.cs:723
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "usunięto \"{0}\""
-
-#: ../SparkleShare/SparkleControllerBase.cs:732
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] "oraz {0} więcej"
-msgstr[1] "oraz {0} więcej"
-msgstr[2] "oraz {0} więcej"
-
-#: ../SparkleShare/SparkleControllerBase.cs:736
-msgid "did something magical"
-msgstr "stało się coś magicznego"
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Ostatnie zdarzenia"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Wszystkie katalogi"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Program SparkleShare wymaga podania kilku informacji, nim możliwe będzie "
-"utworzenie katalogu na tym komputerze."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Imię i nazwisko:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Następny"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "Gdzie jest utrzymywany projekt?"
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr "Adres"
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr "Zdalna ścieżka"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Dodawanie projektu \"{0}\"…"
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Może to chwilę zająć."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Czy to nie jest czasem przerwa na kawę?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Zakończ"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Coś się nie udało"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr "Proszę spróbować ponownie"
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "„{0}” został poprawnie dodany"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr "Projekt został dodany pomyślnie."
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr "Dostęp do plików możliwy jest z katalogu SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Otwórz katalog"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr "Co wydarzy się za chwilę?"
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-"Program SparkleShare utworzy specjalny katalog w katalogu domowym, który "
-"będzie zajmował się projektami."
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "Pomiń samouczek"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "Dalej"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr "Współdzielenie plików z innymi"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Wszystkie pliki dodane do katalogów projektów są automatycznie "
-"synchronizowane zarówno serwerem jak i ze współpracownikami."
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr "Ikona powiadamiania jest po to, by pomagać"
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Wyświetla stan synchronizacji, jak i zawiera odnośniki do projektów oraz "
-"dziennika zdarzeń."
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr "Dodawanie projektu do programu SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Kliknięcie tego przycisku na stronie internetowej spowoduje automatyczne "
-"dodanie projektu:"
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-"…lub można wybrać opcję <b>\"Dodaj utrzymywany projekt…\"</b> z menu "
-"powiadamiania, aby dodać projekt ręcznie."
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr "Dodaj utrzymywany projekt…"
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Ustawienia programu SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr "Nie dodano projektów"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr "Otwórz ostatnie zdarzenia"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Wyłącz powiadomienia"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Włącz powiadomienia"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Zakończ"
-
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
deleted file mode 100755
index 031f0cf..0000000
--- a/po/pt_BR.po
+++ /dev/null
@@ -1,393 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# DigitalDead <zero.ext@gmail.com>, 2011.
-#   <eduardo@eduardosilva.eti.br>, 2011.
-# Nícolas Lazarte <nicolaslazartekaqui@gmail.com>, 2011.
-# Paulo Paulo <paulo.s.lima@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-04 12:45+0100\n"
-"PO-Revision-Date: 2011-12-04 11:46+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/usuário/projeto"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "Hospedagem gratuita de código para Git e Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Repositórios públicos Git, gratuitos com gestão de colaboradores"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/projeto/repositório"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-"Infra-estrutura de código aberto para hospedagem de projetos com código "
-"aberto "
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/projeto"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Uma interface fácil e gratuita para o seu computador"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "O projeto GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/caminho/para/projeto"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Tudo sob meu controle"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "Em meu próprio servidor"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Bem-vindo ao SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Atualizado"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Sincronizando…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
-#: ../SparkleShare/SparkleStatusIcon.cs:118
-msgid "Not everything is synced"
-msgstr "Nem tudo foi sincronizado"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
-msgid "Copy Web Link"
-msgstr "Copiar Endereço Web"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Copiar o endereço web deste arquivo"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
-msgid "Get Earlier Version"
-msgstr "Obter Versão Anterior"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Fazer uma cópia de uma anterior nesta pasta"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
-msgid "Select to get a copy of this version"
-msgstr "Selecione para obter uma cópia dessa versão"
-
-#: ../SparkleShare/Program.cs:50
-msgid "Print version information"
-msgstr "Imprimir informações da versão"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Show this help text"
-msgstr "Exibir esse texto de ajuda"
-
-#: ../SparkleShare/Program.cs:83
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, uma ferramenta de colaboração e compartilhamento"
-
-#: ../SparkleShare/Program.cs:84
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons - Todos os direitos reservados"
-
-#: ../SparkleShare/Program.cs:86
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Este programa vem com ABSOLUTAMENTE NENHUMA GARANTIA."
-
-#: ../SparkleShare/Program.cs:88
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Este é um software livre, e você está convidado a distribuí-lo"
-
-#: ../SparkleShare/Program.cs:89
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"sob certas condições. Por favor leia a licença GNU GPLv3 para mais detalhes."
-
-#: ../SparkleShare/Program.cs:91
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "O SparkleShare sincroniza os repositórios do Git automaticamente"
-
-#: ../SparkleShare/Program.cs:92
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "a pasta ~/SparkleShare com suas origens remotas"
-
-#: ../SparkleShare/Program.cs:94
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Utilização: sparkleshare [start|stop|restart] [OPÇÕES]..."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Sincroniza a pasta SparkleShare com repositórios remotos."
-
-#: ../SparkleShare/Program.cs:97
-msgid "Arguments:"
-msgstr "Argumentos:"
-
-#: ../SparkleShare/Program.cs:107
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
-msgid "About SparkleShare"
-msgstr "Sobre o SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Uma nova versão ({0}) está disponível!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Você está executando a última versão"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
-msgid "Checking for updates..."
-msgstr "Verificando atualizações"
-
-#: ../SparkleShare/SparkleControllerBase.cs:489
-msgid "dddd, MMMM d, yyyy"
-msgstr "dddd, MMMM d, yyyy"
-
-#: ../SparkleShare/SparkleControllerBase.cs:495
-msgid "dddd, MMMM d"
-msgstr "dddd, MMMM d"
-
-#: ../SparkleShare/SparkleEventLog.cs:56
-msgid "Recent Events"
-msgstr "Eventos Recentes"
-
-#: ../SparkleShare/SparkleEventLog.cs:145
-#: ../SparkleShare/SparkleEventLog.cs:164
-msgid "All Folders"
-msgstr "Todas as pastas"
-
-#: ../SparkleShare/SparkleOptions.cs:486
-msgid "OptionName"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Nome Completo:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Próximo"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "Onde está o seu projeto está hospedado?"
-
-#: ../SparkleShare/SparkleSetup.cs:266
-msgid "Address"
-msgstr "Endereço"
-
-#: ../SparkleShare/SparkleSetup.cs:286
-msgid "Remote Path"
-msgstr "Caminho remoto"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:307
-msgid "Add"
-msgstr "Adicionar"
-
-#: ../SparkleShare/SparkleSetup.cs:326
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Adicionando projeto '{0}' ..."
-
-#: ../SparkleShare/SparkleSetup.cs:327
-msgid "This may take a while."
-msgstr "Isto pode demorar um pouco."
-
-#: ../SparkleShare/SparkleSetup.cs:328
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Você tem certeza de que não é hora do café?"
-
-#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
-#: ../SparkleShare/SparkleSetup.cs:558
-msgid "Finish"
-msgstr "Finalizar"
-
-#: ../SparkleShare/SparkleSetup.cs:365
-msgid "Something went wrong"
-msgstr "Algum problema ocorreu"
-
-#: ../SparkleShare/SparkleSetup.cs:413
-msgid "Try Again…"
-msgstr "Tente novamente..."
-
-#: ../SparkleShare/SparkleSetup.cs:432
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' foi incluída com sucesso"
-
-#: ../SparkleShare/SparkleSetup.cs:438
-msgid "Project successfully added!"
-msgstr "Projeto adicionado com sucesso!"
-
-#: ../SparkleShare/SparkleSetup.cs:439
-msgid "Access the files from your SparkleShare folder."
-msgstr "Acessar os arquivos da pasta SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:442
-msgid "Open Folder"
-msgstr "Abrir Pasta"
-
-#: ../SparkleShare/SparkleSetup.cs:484
-msgid "What's happening next?"
-msgstr "O que está acontecendo em seguida?"
-
-#: ../SparkleShare/SparkleSetup.cs:485
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-"SparkleShare cria uma pasta especial em sua pasta pessoal que vai manter o "
-"controle de seus projetos."
-
-#: ../SparkleShare/SparkleSetup.cs:488
-msgid "Skip Tutorial"
-msgstr "Pular Tutorial"
-
-#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
-#: ../SparkleShare/SparkleSetup.cs:531
-msgid "Continue"
-msgstr "Continuar"
-
-#: ../SparkleShare/SparkleSetup.cs:509
-msgid "Sharing files with others"
-msgstr "Compartilhar arquivos com outras pessoas"
-
-#: ../SparkleShare/SparkleSetup.cs:510
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Todos os arquivos adicionados a pasta do seu projeto são sincronizados "
-"automaticamente com o servidor, bem como com seus colaboradores."
-
-#: ../SparkleShare/SparkleSetup.cs:527
-msgid "The status icon is here to help"
-msgstr "O ícone de status está aqui para ajudar"
-
-#: ../SparkleShare/SparkleSetup.cs:528
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Mostra o status do processo de sincronização, e contém links para seus "
-"projetos e log de eventos."
-
-#: ../SparkleShare/SparkleSetup.cs:545
-msgid "Adding projects to SparkleShare"
-msgstr "Adicionando projetos ao SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:546
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Basta clicar neste botão quando você vê-la na web, e o projeto será "
-"automaticamente adicionado automaticamente:"
-
-#: ../SparkleShare/SparkleSetup.cs:549
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-"... Ou selecione <b>'Adicionar Projeto Hosted ...'</b> no menu do ícone de "
-"status para adicionar manualmente."
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Configurações do SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:230
-msgid "No projects yet"
-msgstr "Nenhum projeto ainda"
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleStatusIcon.cs:240
-msgid "Add Hosted Project…"
-msgstr "Adicionar Projeto Hospedado..."
-
-#: ../SparkleShare/SparkleStatusIcon.cs:264
-msgid "Open Recent Events"
-msgstr "Abrir Eventos Recentes"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications Off"
-msgstr "Desligar as notificações"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:286
-msgid "Turn Notifications On"
-msgstr "Ligar as notificações"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:313
-msgid "Quit"
-msgstr "Sair"
-
-
diff --git a/po/ru.po b/po/ru.po
deleted file mode 100755
index d4aeada..0000000
--- a/po/ru.po
+++ /dev/null
@@ -1,425 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Dmitry Golubkov <master@hsdesign.ru>, 2011.
-#   <faland@gmail.com>, 2011.
-# Just a baka  <justabaka@gmail.com>, 2011.
-# Misha Shnurapet <shnurapet@fedoraproject.org>, 2011.
-# Oleg Shmelyov <shmelyov.o@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-11-02 11:31+0000\n"
-"Last-Translator: shnurapet <shnurapet@fedoraproject.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/username/project"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-"Бесплатный хостинг проектов и их совместной разработки, основанный на "
-"системе контроля версий Mercurial и Git"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Бесплатные публичные Git репозитории с совместной разработкой"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/project/repository"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr "Open source инфраструктура для размещения ваших open source проектов"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/project"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Бесплатный и простой интерфейс для вашего компьютера"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "The GNOME Project"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/path/to/project"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Всё под моим контролем"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "Мой личный сервер"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Добро пожаловать в SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Обновлено"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Синхронизация…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Синхронизация не завершена"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Копировать ссылку"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Копировать ссылку в буфер обмена"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Получить более раннюю версию"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Сделать копию более ранней версии в этой папке"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Выберите, чтобы скопировать эту версию"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Вывести информацию о версии программы."
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Показать это справочное сообщение"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, утилита совместной разработки и обмена."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Эта программа поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Эта программа является свободной, ее распространение разрешено "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "при соблюдении требований лицензии GNU GPLv3."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare автоматически синхронизирует Git-репозитории,"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "находящиеся в папке ~/SparkleShare, с их удалёнными ветвями."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Синтаксис: sparkleshare [start|stop|restart] [КЛЮЧ]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Синхронизировать папку SparkleShare с удаленными источниками."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Параметры:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "О программе"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Доступна более новая версия ({0})!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "У вас уже установлена самая последняя версия."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Проверка обновлений…"
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr "дддд, ММММ д, гггг"
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr "дддд, ММММ д"
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "«{0}» добавлено"
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "«{0}» перемещено"
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "«{0}» изменено"
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "«{0}» удалено"
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] "и ещё над {0}"
-msgstr[1] "и ещё над {0}"
-msgstr[2] "и ещё над {0}"
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr "совершено какое-то колдовство"
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Недавние события"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Все папки"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Прежде чем мы сможем создать папку SparkleShare  на этом компьютере, нам "
-"нужно от вас немного информации."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Полное имя:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Эл. почта:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Следующий"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "Где находится Ваш проект?"
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr "Адрес"
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr "Удалённый путь"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Отменить"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr "Добавить"
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Добавить проект ‘{0}’…"
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Это может занять некоторое время."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Не пора ли выпить кофе?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Завершить"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Что-то пошло не так"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr "Попробуйте снова..."
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "{0}’ был успешно добавлен"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr "Проект успешно добавлен!"
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr "Получить доступ к файлам из своей папки SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Открыть папку"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr "Что произойдёт дальше?"
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-"SparkleShare создаёт специальную папку в вашей личной папке, которая будет "
-"отслеживать ваши проекты."
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "Пропустить обучение"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "Продолжить"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr "Обмен файлами с другими"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Все файлы, добавленные в директорию Вашего проекта, автоматически "
-"синхронизируются с сервером, также как и с Вашими коллегами по проекту."
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr "Значок статуса здесь для помощи"
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Он показывает статус процесса синхронизации и содержит ссылки на Ваши "
-"проекты, а также лог событий."
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr "Добавление проектов в SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Просто нажмите эту кнопку, когда увидите её в сети, и проект будет добавлен "
-"автоматически:"
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-"...или выберите <b>«Добавить ведомый проект...»</b> через меню в области "
-"уведомлений, чтобы добавить проект вручную."
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr "Добавить ведомый проект..."
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Установка SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr "Ещё нет проектов"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr "Открыть Недавние события"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Выключить уведомления"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Включить уведомления"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Выход"
-
-
diff --git a/po/sk.po b/po/sk.po
deleted file mode 100644
index 6913e9f..0000000
--- a/po/sk.po
+++ /dev/null
@@ -1,407 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Matej Moško <matej.mosko@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Vitajte v Sparkleshare"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Aktualizované"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synchronizujem..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Nie všetko je synchronizované"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Skopíruj webový odkaz"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Skopíruj webový odkaz na tento súbor do schránky"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Vyber staršiu verziu"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Vytvor kópiu staršej verzie v tomto priečinku"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Vyber si verziu na skopírovanie"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Vytlačiť informácie o verzii"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Zobraziť tohto pomocníka"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, nástroj na spoluprácu a zdieľanie"
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr ""
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Prepínače:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "O SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Novšia verzia ({0}) je k dispozícii!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Používate najnovšiu verziu."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Kontrolujem aktualizácie"
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Nedávne udalosti"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Všetky priečinky"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Celé meno:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Ďalej"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr "Pridať"
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Pridávam projekt '{0}' ..."
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Toto môže chvíľu trvať."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Ste si istý, že nie je čas na kávu?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Dokončiť"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Niečo sa nepodarilo"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr "Skúste znovu..."
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "\"{0}\" bol úspešne pridaný"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr "Projekt bol úspešne pridaný!"
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr "Pristupovať k súborom zo SparkleShare priečinka."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Otvoriť priečinok"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr "Čo sa deje ďalej?"
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "Preskočiť výučbu"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "Pokračovať"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr "Zdieľanie súborov s ostatnými"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr "Ikona stavu je tu pre Vás"
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr "Pridanie projektov do SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "Nastavenia SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr "Zatiaľ žiadne projekty"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Vypni upozornenia"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Zapni upozornenia"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Vypnúť"
-
-
diff --git a/po/sl.po b/po/sl.po
deleted file mode 100644
index 4c38401..0000000
--- a/po/sl.po
+++ /dev/null
@@ -1,411 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <nejc.saje@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Projekt GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Dobrodošli v SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Posodobljeno"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Sinhroniziram..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Sinhronizacija še ni dokončana"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Kopiraj spletno povezavo"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopiraj spletno povezavo do te datoteke v odložišče"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Pridobi starejšo različico"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Ustvari kopijo prejšnje različice v tej mapi"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Izberite za pridobitev kopije te različice"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Izpiši informacije o različici"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Prikaži to besedilo za pomoč"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, orodje za deljenje in sodelovanje."
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Ta programska oprema je na voljo BREZ GARANCIJE."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "To je prosta programska oprema in jo lahko redistribuirate "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-"pod določenimi pogoji. Prosimo preberite licenco GNU GPLv3 za podrobnosti."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare avtomatsko sinhronizira Git repozitorije"
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "~/SparkleShare mapi z njihovimi oddaljenimi izvori."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Uporaba: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Sinhroniziraj SparkleShare mapo z oddaljenimi repozitoriji."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Argumenti:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "O SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Novejša različica ({0}) je na voljo!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Uporabljate najnovejšo različico."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Preverjam za posodobitve..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Nedavni dogodki"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Vse mape"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Preden lahko ustvarimo SparkleShare mape na tem računalniku potrebujemo od "
-"vas nekaj informacij."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Polno ime:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Naprej"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "To lahko nekaj časa traja."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "A ste prepričani da ni čas za kavo?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Dokončaj"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Nekaj je šlo narobe"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' uspešno dodano"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Odpri mapo"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "SparkleShare Nastavitev"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Izključi obvestila"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Vključi obvestila"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Izhod"
-
-
diff --git a/po/sr_RS.po b/po/sr_RS.po
deleted file mode 100755
index cc38f7f..0000000
--- a/po/sr_RS.po
+++ /dev/null
@@ -1,379 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Aleksandar Antoski <acko.aa@gmail.com>, 2011.
-#   <nebjak@gmail.com>, 2011.
-# Небојша Јаковљевић <nebjak@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-04 12:45+0100\n"
-"PO-Revision-Date: 2011-12-22 10:42+0000\n"
-"Last-Translator: Aleksandar Antoski <acko.aa@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sr_RS\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Гиториус"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Пројекат ГНОМ"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Добродошли у СпарклШер!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Све је синхронизовано"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Синхронизација..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
-#: ../SparkleShare/SparkleStatusIcon.cs:118
-msgid "Not everything is synced"
-msgstr "Није све синхронизовано"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
-msgid "Copy Web Link"
-msgstr "Копирај веб линк"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Копирај веб адресу ове датотеке"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
-msgid "Get Earlier Version"
-msgstr "Добави ранију верзију"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Направи копију раније верзије у овом директоријуму"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
-msgid "Select to get a copy of this version"
-msgstr "Изабери да добавиш копију ове верзије"
-
-#: ../SparkleShare/Program.cs:50
-msgid "Print version information"
-msgstr "Исписује информацију о верзији"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Show this help text"
-msgstr "Приказује овај текст помоћи"
-
-#: ../SparkleShare/Program.cs:83
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "СпарклШер, алатка за сарадњу и дељење."
-
-#: ../SparkleShare/Program.cs:84
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:86
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Овај програм долази БЕЗ ИКАКВЕ ГАРАНЦИЈЕ."
-
-#: ../SparkleShare/Program.cs:88
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Ово је слободан софтвер, и можете га редистрибуирати"
-
-#: ../SparkleShare/Program.cs:89
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "под одређеним условима. Молимо прочитајте ГНУ ОЈЛв3 за више детаља."
-
-#: ../SparkleShare/Program.cs:91
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "СпарклШер аутоматски синхронизује Гит ризнице у"
-
-#: ../SparkleShare/Program.cs:92
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "директоријуму ~/SparkleShare са њиховим удаљеним изворима."
-
-#: ../SparkleShare/Program.cs:94
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Употреба: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Синхронизуј СпарклШер директоријум са удаљеним ризницама."
-
-#: ../SparkleShare/Program.cs:97
-msgid "Arguments:"
-msgstr "Аргументи:"
-
-#: ../SparkleShare/Program.cs:107
-msgid "SparkleShare "
-msgstr "СпарклШер"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
-msgid "About SparkleShare"
-msgstr "О СпарклШеру"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "Новија верзија ({0}) је доступна!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Кориситите последњу верзију."
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
-msgid "Checking for updates..."
-msgstr "Проверавам освежења..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:489
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:495
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:56
-msgid "Recent Events"
-msgstr "Скорашњи догађаји"
-
-#: ../SparkleShare/SparkleEventLog.cs:145
-#: ../SparkleShare/SparkleEventLog.cs:164
-msgid "All Folders"
-msgstr "Сви директоријуми"
-
-#: ../SparkleShare/SparkleOptions.cs:486
-msgid "OptionName"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Пуно име:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Е-пошта:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Даље"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:266
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:286
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
-msgid "Cancel"
-msgstr "Одустани"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:307
-msgid "Add"
-msgstr "Додајте"
-
-#: ../SparkleShare/SparkleSetup.cs:326
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Додавање пројекта ‘{0}’…"
-
-#: ../SparkleShare/SparkleSetup.cs:327
-msgid "This may take a while."
-msgstr "Ово може да потраје."
-
-#: ../SparkleShare/SparkleSetup.cs:328
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Да ли сте сигурни да није време за кафу?"
-
-#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
-#: ../SparkleShare/SparkleSetup.cs:558
-msgid "Finish"
-msgstr "Заврши"
-
-#: ../SparkleShare/SparkleSetup.cs:365
-msgid "Something went wrong"
-msgstr "Нешто је пошло наопако"
-
-#: ../SparkleShare/SparkleSetup.cs:413
-msgid "Try Again…"
-msgstr "Покушајте поново..."
-
-#: ../SparkleShare/SparkleSetup.cs:432
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ успешно додато"
-
-#: ../SparkleShare/SparkleSetup.cs:438
-msgid "Project successfully added!"
-msgstr "Пројекат је успешно додат!"
-
-#: ../SparkleShare/SparkleSetup.cs:439
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:442
-msgid "Open Folder"
-msgstr "Отвори директоријум"
-
-#: ../SparkleShare/SparkleSetup.cs:484
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:485
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:488
-msgid "Skip Tutorial"
-msgstr "Прескочи туторијал"
-
-#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
-#: ../SparkleShare/SparkleSetup.cs:531
-msgid "Continue"
-msgstr "Настави"
-
-#: ../SparkleShare/SparkleSetup.cs:509
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:510
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:527
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:528
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:545
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:546
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:549
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "СпарклШер подешавања"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:230
-msgid "No projects yet"
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleStatusIcon.cs:240
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:264
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications Off"
-msgstr "Угаси обавештења"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:286
-msgid "Turn Notifications On"
-msgstr "Укључи обавештења"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:313
-msgid "Quit"
-msgstr "Крај рада"
-
-
diff --git a/po/sv.po b/po/sv.po
deleted file mode 100755
index 178d5c2..0000000
--- a/po/sv.po
+++ /dev/null
@@ -1,424 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Håkan Sahlström <shlstrm@sdf.org>, 2011.
-# Jan Lindblom <lindblom.jan@gmail.com>, 2011.
-#   <lindblom.jan@gmail.com>, 2011.
-# Robin Jakobsson <jakobsson.robin@gmail.com>, 2011.
-# smygrokarn <smygrokarn@tekniktoppen.com>, 2011.
-#   <smygrokarn@tekniktoppen.com>, 2011.
-#   <tx@elehu.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-11-05 22:22+0000\n"
-"Last-Translator: shlstrm <shlstrm@sdf.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/användare/projekt"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "Bitbucket"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "Gratis källkodslagring för Git och Mercurial"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "Gratis offentliga Git-arkiv med medarbetarehantering"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/projekt/arkiv"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr "Infrastruktur för delning av öppen källkod-projekt"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/projekt"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "Ett gratis och enkelt gränssnitt för din dator"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "GNOME-projektet"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/sökväg/till/projekt"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "Allting under min kontroll"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "På min egen server"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Välkommen till SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Aktuell"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Synkroniserar…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Allt har inte synkroniserats"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Kopiera webblänk"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopiera URL för denna fil till klippbordet"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Hämta tidigare version"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Gör en kopia av en tidigare version i denna katalog"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Välj för att få en kopia av den här versionen"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Skriv ut versionsinformation"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Visa denna hjälp-text"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, ett verktyg för samarbete och delning"
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Detta program kommer utan några som helst garantier."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Detta är fri programvara och du är välkommen att distribuera det "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "under vissa förhållanden. Vänligen läs GNU GPL v3 för detaljer."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synkroniserar automatiskt Git-källor i "
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "katalogen ~/SparkleShare med deras fjärrkällor."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Användning: sparkleshare [start|stop|restart] [VÄXEL]"
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synkronisera SparkleShare-mappen med fjärrkällor."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Argument:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Om SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "En nyare version ({0}) är tillgänglig!"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "Du kör den senaste versionen"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr "Söker efter uppdateringar..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "lade till ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "flyttade ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "ändrade ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "raderade ‘{0}’"
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] "och {0} till"
-msgstr[1] "och {0} fler"
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr "gjorde någonting magiskt"
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr "Senaste händelser"
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr "Alla kataloger"
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Innan vi kan skapa en SparkleShare-katalog på den här datorn så behöver vi "
-"lite information från dig."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "För- och efternamn:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "E-postadress:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Nästa"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "Var är ditt projekt lagrat?"
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr "Adress"
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr "Fjärrsökväg"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr "Lägg till"
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "Lägger till projektet ‘{0}’…"
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr "Det här kan ta en stund."
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Är du säker på att det inte är fikadags?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Slutför"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr "Något blev fel"
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr "Försök igen..."
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' har lagts till korrekt"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr "Projektet har lagts till!"
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr "Kom åt filer i din SparkleShare-mapp."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Öppna katalog"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr "Vad händer nu?"
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-"SparkleShare skapar en särskild katalog i din hemmapp som håller reda på "
-"dina projekt."
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr "Hoppa över handledning"
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr "Fortsätt"
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr "Delar filer med andra"
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-"Alla filer som läggs till i dina projektmappar synkas automatiskt med "
-"servern och med dina medarbetare."
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr "Statusikonen är här för att hjälpa till"
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-"Den visar status för synkronisering och länkar till dina projekt och "
-"händelseloggen."
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr "Lägga till projekt till SparkleShare"
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-"Klicka på den här knappen när du ser den på webben och projektet läggs till "
-"automatiskt:"
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-"...eller välj <b>‘Lägg till Projekt…’</b> i statusmenyn för att lägga till "
-"ett projekt manuellt."
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr "Lägg till delat projekt..."
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "SparkleShare-inställningar"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr "Inga projekt ännu"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr "Öppna senaste händelser"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Stäng av notifieringar"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Sätt på notifieringar"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Avsluta"
-
-
diff --git a/po/te.po b/po/te.po
deleted file mode 100755
index d3c04c8..0000000
--- a/po/te.po
+++ /dev/null
@@ -1,405 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "స్పార్కిల్‌షేర్‌కి స్వాగతం!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr ""
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr ""
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr ""
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr ""
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "సంచయాన్ని తెరువు"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr ""
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "చాలించు"
-
-
diff --git a/po/uk.po b/po/uk.po
deleted file mode 100755
index 93afa18..0000000
--- a/po/uk.po
+++ /dev/null
@@ -1,409 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-# Сергій Гаврилов <sergiovana@bigmir.net>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "Проект GNOME"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "Ласкаво просимо до SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "Оновлено"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "Синхронізація..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr "Ще не все синхронізовано"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "Копіювати веб-посилання"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "Скопіювати веб-адресу цього файла до буферу"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "Отримати старішу версію"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "Створити копію старішої версії в цій теці"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "Вибрати та отримати копію цієї версії"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "Вивести дані про версію"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "Показати текст цієї довідки"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Авторське право (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Ця програма розповсюджується БЕЗ ВСЯКОЇ ГАРАНТІЇ."
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "Це вільна програма і ви можете поширювати її "
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "за певних умов. Детальніше читайте ліцензію GNU GPLv3."
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare автоматично синхронізує сховища Git в "
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "теці ~/SparkleShare з її віддаленими походженнями."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Використання: sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Синхронізація теки SparkleShare з віддаленими сховищами."
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "Аргументи:"
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr "Про SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Щоб створити теку SparkleShare на цьому комп'ютері, потрібна деяка "
-"інформація про вас."
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "Повне ім'я:"
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "Ел. адреса:"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "Далі"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "Скасувати"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "А чи не здається вам, що настав час для кави?"
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "Завершити"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ успішно додано"
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "Відкрити теку"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr "Вимкнути сповіщення"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr "Увімкнути сповіщення"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "Вийти"
-
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
deleted file mode 100755
index acbdc6e..0000000
--- a/po/zh_CN.po
+++ /dev/null
@@ -1,378 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-#   <focusheart@gmail.com>, 2011.
-#   <yujiang.wang@ymail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-04 12:45+0100\n"
-"PO-Revision-Date: 2011-12-08 07:18+0000\n"
-"Last-Translator: focusheart <focusheart@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr "/username/project"
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr "小桶"
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr "免费的Git与Mercurial代码托管"
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr "具备协作管理的免费开放仓库"
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr "Github"
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr "/project/repository"
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr "托管开源项目的开源架构"
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr "/project"
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr "为你的计算机提供一个免费并且简单的接口"
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "GMOME项目"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr "/path/to/project"
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr "一切尽在你的掌控"
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr "拥有你自己的服务器"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "欢迎使用 SparkleShare！"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "保持最新"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "同步中..."
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
-#: ../SparkleShare/SparkleStatusIcon.cs:118
-msgid "Not everything is synced"
-msgstr "尚有内容未同步"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
-msgid "Copy Web Link"
-msgstr "复制Web链接"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
-msgid "Copy the web address of this file to the clipboard"
-msgstr "复制该文件的Web地址到剪贴板"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
-msgid "Get Earlier Version"
-msgstr "获取较早的版本"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
-msgid "Make a copy of an earlier version in this folder"
-msgstr "在本目录中制作一个较早的版本"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
-msgid "Select to get a copy of this version"
-msgstr "获取该版本的复制"
-
-#: ../SparkleShare/Program.cs:50
-msgid "Print version information"
-msgstr "打印版本信息"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Show this help text"
-msgstr "显示当前帮助文字"
-
-#: ../SparkleShare/Program.cs:83
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare，协作与分享的工具"
-
-#: ../SparkleShare/Program.cs:84
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "版权(C) 2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:86
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "本程序不提供任何质量保证"
-
-#: ../SparkleShare/Program.cs:88
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "这是自由软件，欢迎您再次分发。"
-
-#: ../SparkleShare/Program.cs:89
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "在某种条件下。详情请参见 GNU GPLv3。"
-
-#: ../SparkleShare/Program.cs:91
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare 自动同步Git仓库"
-
-#: ../SparkleShare/Program.cs:92
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "~/SparkleShare 目录与远程所有"
-
-#: ../SparkleShare/Program.cs:94
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "用法：sparkleshare [start|stop|restart] [OPTION]..."
-
-#: ../SparkleShare/Program.cs:95
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "与远程仓库同步SparkleShare "
-
-#: ../SparkleShare/Program.cs:97
-msgid "Arguments:"
-msgstr "参数："
-
-#: ../SparkleShare/Program.cs:107
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
-msgid "About SparkleShare"
-msgstr "关于 SparkleShare"
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr "有新版本({0})了！"
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr "你所使用的是最新版本"
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
-msgid "Checking for updates..."
-msgstr "正在检查更新..."
-
-#: ../SparkleShare/SparkleControllerBase.cs:489
-msgid "dddd, MMMM d, yyyy"
-msgstr "dddd,MMMM d, yyyy"
-
-#: ../SparkleShare/SparkleControllerBase.cs:495
-msgid "dddd, MMMM d"
-msgstr "ddd, MMMM d"
-
-#: ../SparkleShare/SparkleEventLog.cs:56
-msgid "Recent Events"
-msgstr "最近事件"
-
-#: ../SparkleShare/SparkleEventLog.cs:145
-#: ../SparkleShare/SparkleEventLog.cs:164
-msgid "All Folders"
-msgstr "所有目录"
-
-#: ../SparkleShare/SparkleOptions.cs:486
-msgid "OptionName"
-msgstr "选项名称"
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "全名："
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "电子邮件"
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "下一步"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr "你的项目托管在哪里？"
-
-#: ../SparkleShare/SparkleSetup.cs:266
-msgid "Address"
-msgstr "地址"
-
-#: ../SparkleShare/SparkleSetup.cs:286
-msgid "Remote Path"
-msgstr "远程路径"
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
-msgid "Cancel"
-msgstr "取消"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:307
-msgid "Add"
-msgstr "添加"
-
-#: ../SparkleShare/SparkleSetup.cs:326
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr "添加项目'{0}'..."
-
-#: ../SparkleShare/SparkleSetup.cs:327
-msgid "This may take a while."
-msgstr "这可能要花一点时间。"
-
-#: ../SparkleShare/SparkleSetup.cs:328
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "你不觉得现在是休息时间么？"
-
-#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
-#: ../SparkleShare/SparkleSetup.cs:558
-msgid "Finish"
-msgstr "完成"
-
-#: ../SparkleShare/SparkleSetup.cs:365
-msgid "Something went wrong"
-msgstr "好像有什么问题"
-
-#: ../SparkleShare/SparkleSetup.cs:413
-msgid "Try Again…"
-msgstr "再试试看..."
-
-#: ../SparkleShare/SparkleSetup.cs:432
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}'被成功添加"
-
-#: ../SparkleShare/SparkleSetup.cs:438
-msgid "Project successfully added!"
-msgstr "项目成功添加！"
-
-#: ../SparkleShare/SparkleSetup.cs:439
-msgid "Access the files from your SparkleShare folder."
-msgstr "从你的SparkleShare目录访问这些文件。"
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:442
-msgid "Open Folder"
-msgstr "打开文件夹"
-
-#: ../SparkleShare/SparkleSetup.cs:484
-msgid "What's happening next?"
-msgstr "下来做什么？"
-
-#: ../SparkleShare/SparkleSetup.cs:485
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr "SparkleShare在你的个人文件夹中创建了一个特别的文件夹用以保持跟踪你的项目。"
-
-#: ../SparkleShare/SparkleSetup.cs:488
-msgid "Skip Tutorial"
-msgstr "跳过教程"
-
-#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
-#: ../SparkleShare/SparkleSetup.cs:531
-msgid "Continue"
-msgstr "继续"
-
-#: ../SparkleShare/SparkleSetup.cs:509
-msgid "Sharing files with others"
-msgstr "与他人分享文件"
-
-#: ../SparkleShare/SparkleSetup.cs:510
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr "所有添加到你的项目中的文件都将与服务器自动同步，你的所有协作伙伴们也是如此。"
-
-#: ../SparkleShare/SparkleSetup.cs:527
-msgid "The status icon is here to help"
-msgstr "状态图标可以提供帮助"
-
-#: ../SparkleShare/SparkleSetup.cs:528
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr "此处显示同步进度状态，并且包含了到你的项目和事件日志的链接。"
-
-#: ../SparkleShare/SparkleSetup.cs:545
-msgid "Adding projects to SparkleShare"
-msgstr "向SparkleShare添加项目"
-
-#: ../SparkleShare/SparkleSetup.cs:546
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr "在网页上看到这个按钮的时候即可点击，项目会被自动添加进去；"
-
-#: ../SparkleShare/SparkleSetup.cs:549
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr "...或者从状态图标菜单中选择 <b>'添加已托管的项目...'</b>来手工添加。"
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr "SparkleShare "
-
-#: ../SparkleShare/SparkleStatusIcon.cs:230
-msgid "No projects yet"
-msgstr "尚无项目"
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleStatusIcon.cs:240
-msgid "Add Hosted Project…"
-msgstr "添加已托管的项目"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:264
-msgid "Open Recent Events"
-msgstr "打开最近的活动"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications Off"
-msgstr "关闭通知"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:286
-msgid "Turn Notifications On"
-msgstr "打开通知"
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:313
-msgid "Quit"
-msgstr "退出"
-
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
deleted file mode 100755
index 87944c2..0000000
--- a/po/zh_TW.po
+++ /dev/null
@@ -1,404 +0,0 @@
-# This file is distributed under the same license as the SparkleShare package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: SparkleShare\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1@srem.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
-msgid "/username/project"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:2
-msgid "Bitbucket"
-msgstr ""
-
-#: ../data/plugins/bitbucket.xml.in.h:3
-msgid "Free code hosting for Git and Mercurial"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:2
-msgid "Free public Git repositories with collaborator management"
-msgstr ""
-
-#: ../data/plugins/github.xml.in.h:3
-msgid "Github"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:1
-msgid "/project/repository"
-msgstr ""
-
-#: ../data/plugins/gitorious.xml.in.h:2
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../data/plugins/gitorious.xml.in.h:3
-msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:1
-msgid "/project"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:2
-msgid "A free and easy interface for your computer"
-msgstr ""
-
-#: ../data/plugins/gnome.xml.in.h:3
-msgid "The GNOME Project"
-msgstr "GNOME 專案"
-
-#: ../data/plugins/own-server.xml.in.h:1
-msgid "/path/to/project"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:2
-msgid "Everything under my control"
-msgstr ""
-
-#: ../data/plugins/own-server.xml.in.h:3
-msgid "On my own server"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
-#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
-#: ../SparkleShare/SparkleStatusIcon.cs:89
-msgid "Welcome to SparkleShare!"
-msgstr "歡迎使用 SparkleShare！"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
-#: ../SparkleShare/SparkleStatusIcon.cs:77
-#: ../SparkleShare/SparkleStatusIcon.cs:91
-msgid "Up to date"
-msgstr "更新"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
-#: ../SparkleShare/SparkleStatusIcon.cs:106
-msgid "Syncing…"
-msgstr "同步中…"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Not everything is synced"
-msgstr ""
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-msgid "Copy Web Link"
-msgstr "複製網頁鏈結"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-msgid "Copy the web address of this file to the clipboard"
-msgstr "複製該檔案的網址到剪貼簿"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-msgid "Get Earlier Version"
-msgstr "取得較早的版本"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-msgid "Make a copy of an earlier version in this folder"
-msgstr "在本資料夾中製作一個較早的版本"
-
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-msgid "Select to get a copy of this version"
-msgstr "選擇以取得該版本的複本"
-
-#: ../SparkleShare/Program.cs:51
-msgid "Print version information"
-msgstr "列印版本資訊"
-
-#: ../SparkleShare/Program.cs:52
-msgid "Show this help text"
-msgstr "顯示這份說明文字"
-
-#: ../SparkleShare/Program.cs:84
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
-
-#: ../SparkleShare/Program.cs:85
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "著作權©2010 Hylke Bons"
-
-#: ../SparkleShare/Program.cs:87
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "本程式不提供任何擔保"
-
-#: ../SparkleShare/Program.cs:89
-msgid "This is free software, and you are welcome to redistribute it "
-msgstr "這是自由軟體，歡迎您在某些條件之下"
-
-#: ../SparkleShare/Program.cs:90
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr "繼續散布它。詳情請參見 GNU GPLv3。"
-
-#: ../SparkleShare/Program.cs:92
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare 自動同步 Git 儲存庫於 "
-
-#: ../SparkleShare/Program.cs:93
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "~/SparkleShare 資料夾與它們的遠端來源。"
-
-#: ../SparkleShare/Program.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "用法：sparkleshare [start|stop|restart] [選項]…"
-
-#: ../SparkleShare/Program.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "同步 SparkleShare 資料夾與遠端儲存庫。"
-
-#: ../SparkleShare/Program.cs:98
-msgid "Arguments:"
-msgstr "引數："
-
-#: ../SparkleShare/Program.cs:108
-msgid "SparkleShare "
-msgstr "SparkleShare "
-
-#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
-msgid "About SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:70
-#, csharp-format
-msgid "A newer version ({0}) is available!"
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:79
-msgid "You are running the latest version."
-msgstr ""
-
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:493
-msgid "dddd, MMMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:499
-msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
-msgid "Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
-msgid "All Folders"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr "我們在這臺電腦中可以建立 SparkleShare 資料夾之前，我們需要您的幾點資訊。"
-
-#: ../SparkleShare/SparkleSetup.cs:83
-msgid "Full Name:"
-msgstr "全名："
-
-#: ../SparkleShare/SparkleSetup.cs:98
-msgid "Email:"
-msgstr "電子郵件："
-
-#: ../SparkleShare/SparkleSetup.cs:108
-msgid "Next"
-msgstr "下一步"
-
-#: ../SparkleShare/SparkleSetup.cs:129
-msgid "Where's your project hosted?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:275
-msgid "Address"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:295
-msgid "Remote Path"
-msgstr ""
-
-#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
-msgid "Cancel"
-msgstr "取消"
-
-#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
-msgid "Add"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:335
-#, csharp-format
-msgid "Adding project ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:336
-msgid "This may take a while."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:337
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
-msgid "Finish"
-msgstr "完成"
-
-#: ../SparkleShare/SparkleSetup.cs:374
-msgid "Something went wrong"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:422
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:441
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:447
-msgid "Project successfully added!"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:448
-msgid "Access the files from your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
-msgid "Open Folder"
-msgstr "開啟資料夾"
-
-#: ../SparkleShare/SparkleSetup.cs:477
-msgid "What's happening next?"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:478
-msgid ""
-"SparkleShare creates a special folder in your personal folder that will keep"
-" track of your projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:481
-msgid "Skip Tutorial"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
-msgid "Continue"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:502
-msgid "Sharing files with others"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:503
-msgid ""
-"All files added to your project folders are synced with the host "
-"automatically, as well as with your collaborators."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:520
-msgid "The status icon is here to help"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:521
-msgid ""
-"It shows the syncing process status, and contains links to your projects and"
-" the event log."
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:538
-msgid "Adding projects to SparkleShare"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:539
-msgid ""
-"Just click this button when you see it on the web, and the project will be "
-"automatically added:"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetup.cs:542
-msgid ""
-"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
-" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
-#: ../SparkleShare/SparkleSetupWindow.cs:44
-msgid "SparkleShare Setup"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:228
-msgid "No projects yet"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:262
-msgid "Open Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:282
-msgid "Turn Notifications Off"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:284
-msgid "Turn Notifications On"
-msgstr ""
-
-#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
-msgid "Quit"
-msgstr "離開"
-
-
author	Carlos Martín Nieto <carlos@cmartin.tk>	2012-06-26 23:19:57 +0200
committer	Carlos Martín Nieto <carlos@cmartin.tk>	2012-06-26 23:19:57 +0200
commit	50bd5da236c4da4abbb5a74e5884aef28f0e9548 (patch)
tree	ca8b5b960f799712ae5a2775e4a7048f302c7042
parent	9a423cedb3984e73164d70197041eed44e20616d (diff)