Merge pull request #2391 from owncloud/ignore_windows_reserved_characters

Ignore reserved words on Windows
2026-04-08 03:46:49 +02:00 · 2014-10-24 15:39:21 -04:00 · 2014-10-24 13:18:57 -04:00 · 2014-10-24 18:20:41 +02:00 · 2014-10-24 18:19:16 +02:00 · 2014-10-24 16:11:29 +02:00
88 changed files with 2888 additions and 2174 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = git://github.com/guruz/qtmacgoodies.git
+	url = git://github.com/shadone/qtmacgoodies.git
 [submodule "binary"]
 	path = binary
 	url = git://github.com/owncloud/owncloud-client-binary.git
--- a/46
+++ b/46
@@ -1,5 +1,51 @@
 ChangeLog
 =========
+version 1.7.0 (release 2014-10-xx)
+
+* oC7 Sharing: Handle new sharing options of ownCloud 7 correctly.
+ * Added Selective sync: Ability to unselect server folders which are
+   excluded from syncing, plus GUI and setup GUI
+ * Improved local change detection: consider file size, detect files
+   with ongoing changes and do not upload immediately
+ * Improved HTTP request timeout handler: all successful requests reset
+   the timeout counter
+ * Improvements for syncing command line tool: netrc support, improved
+   SSL support, non interactive mode
+ * Added a socket based API to provide file management shells with status
+   information about the sync status of files. That is a prerequisite for
+   the overlay icons in the file managers.
+ * Permission system: ownCloud 7 delivers file and folder permissions,
+   added ability to deal with it for shared folders and more.
+ * Ignore handling: Do not recurse into ignored or excluded directories
+ * Major sync journal database improvements for more stability and performance
+ * New library interface to sqlite3
+ * Improve "resync handling" if errors occur
+ * Blacklist improvements
+ * Improved logging: more useful meta info, removed noise
+ * Updated to latest Qt5 versions on Windows and OS X
+ * OS X: Sparkle update to provide pkg format properly
+ * OS X: Change distribution format from dmg to pkg with new installer.
+ * Win: Fix handling of filenames with trailing dot or space
+
+version 1.6.4 (release 2014-10-22)
+ * Fix startup logic, fixes bug #1989
+ * Fix raise dialog on X11
+ * Win32: fix overflow when computing the size of file > 4GiB
+ * Use a fixed function to get files modification time, the
+   original one was broken for certain timezone issues, see
+   core bug #9781 for details
+ * Added some missing copyright headers
+ * Avoid data corruption due to wrong error handling, bug #2280
+ * Do improved request timeout handling to reduce the number of
+   timed out jobs, bug #2155
+   version 1.6.3 (release 2014-09-03)
+ * Fixed updater on OS X
+ * Fixed memory leak in SSL button that could lead to quick memory draining
+ * Fixed upload problem with files >4 GB
+ * MacOSX, Linux: Bring Settings window to front properly
+ * Branded clients: If no configuration is detected, try to import the data
+    from a previously configured community edition.
+
 version 1.6.2 (release 2014-07-28 )
 * Limit the HTTP buffer size when downloading to limit memory consumption.
 * Another small mem leak fixed in HTTP Credentials.
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "beta4") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
--- a/admin/osx/installer-background.png
+++ b/admin/osx/installer-background.png
--- a/admin/osx/installer-background.svg
+++ b/admin/osx/installer-background.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 595.275 311.111"
+   xml:space="preserve"
+   height="200"
+   width="320"
+   version="1.1"
+   y="0px"
+   x="0px"
+   viewBox="0 0 35 0"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="installer-background.svg"><metadata
+     id="metadata12"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs10" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="0.734375"
+     inkscape:cx="-49.141255"
+     inkscape:cy="236.17459"
+     inkscape:window-x="0"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><path
+     style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#ffffff;fill-opacity:1;enable-background:accumulate"
+     d="m 75.63384,28.421489 c -29.36582,0 -53.09172,23.724901 -53.09172,53.091701 0,12.1047 4.03087,23.2455 10.82647,32.1667 14.74225,-17.0631 36.50138,-27.8988 60.79508,-27.8988 11.88546,0 23.15644,2.6467 33.31219,7.2871 0.82221,-3.7185 1.24924,-7.5856 1.24924,-11.555 0,-29.3658 -23.72491,-53.091701 -53.09172,-53.091701 z M 6.30358,52.98809 c -15.29297,0 -27.58645,12.3977 -27.58645,27.6906 0,4.9515 1.27738,9.6301 3.53933,13.6373 9.22826,-5.206 19.89756,-8.2239 31.23002,-8.2239 1.09366,0 2.14708,0.039 3.22713,0.1052 -0.12231,-1.5502 -0.20806,-3.103 -0.20806,-4.6844 0,-8.5178 1.85002,-16.6223 5.10106,-23.9429 -4.37708,-2.9351 -9.62115,-4.5803 -15.30284,-4.5803 z m 130.95716,19.0502 c -1.12983,0 -2.21885,0.1381 -3.33122,0.2078 0.48121,3.0338 0.83274,6.097 0.83274,9.2651 0,4.9298 -0.62692,9.6869 -1.7697,14.2616 13.39754,7.4144 24.52385,18.5084 31.8547,31.9586 7.60342,-3.9586 16.08566,-6.4754 25.08804,-7.0787 -2.32015,-27.2093 -24.86184,-48.6137 -52.67416,-48.6137 z m -43.09675,19.7789 c -41.09117,0 -74.32775,33.2333 -74.32775,74.3278 0,41.0911 33.23329,74.3277 74.32775,74.3277 41.09447,0 74.32775,-33.2366 74.32775,-74.3277 0,-41.0945 -33.23657,-74.3278 -74.32775,-74.3278 z m -80.67652,0.3117 c -31.87937,0 -57.67166,25.792 -57.67166,57.6717 0,18.7668 8.94156,35.3802 22.79774,45.9078 5.84147,-11.2667 17.57406,-18.9461 31.1258,-18.9461 1.63789,0 3.21,0.1986 4.78871,0.4169 -0.49554,-3.6054 -0.72871,-7.2937 -0.72871,-11.0346 0,-17.8847 5.82174,-34.4234 15.71907,-47.7819 -5.92466,-7.4133 -10.1643,-16.321 -11.97162,-26.025 -1.33935,-0.092 -2.69673,-0.2078 -4.05979,-0.2078 z m 180.71831,34.3544 c -9.68,0 -18.74781,2.4714 -26.75364,6.6625 4.54607,10.0696 7.07867,21.2422 7.07867,32.9998 0,22.0146 -8.85114,42.0052 -23.21431,56.5275 10.5516,11.7145 25.861,19.0503 42.88961,19.0503 31.87937,0 57.67165,-25.7916 57.67165,-57.6717 0,-31.8793 -25.79195,-57.5664 -57.67165,-57.5664 z m -244.00885,7.5998 c -29.3701,0 -53.19693,23.6164 -53.19693,52.9832 0,29.3669 23.82815,53.1937 53.19364,53.1937 11.17727,0 21.53161,-3.4825 30.08487,-9.369 -3.5344,-5.492 -5.62151,-12.0581 -5.62151,-19.0503 0,-3.6291 0.53552,-7.1158 1.56148,-10.4099 -16.01267,-11.5721 -26.44131,-30.4034 -26.44131,-51.6319 0,-5.394 0.71083,-10.6098 1.97792,-15.6152 -0.52591,-0.013 -1.03171,-0.1052 -1.56152,-0.1052 z m 312.19495,45.5955 c -1.56661,0 -3.08252,0.1789 -4.58026,0.4169 0.0829,1.3242 0.1039,2.6108 0.1039,3.9559 0,16.9326 -6.68118,32.3015 -17.4889,43.7214 5.31706,6.1831 13.12695,10.0976 21.96526,10.0976 16.09849,0 29.14785,-12.9451 29.14785,-29.0439 0,-16.0985 -13.04936,-29.1479 -29.14785,-29.1479 z m -252.64924,3.1229 c -16.09783,0 -29.04395,12.9461 -29.04395,29.044 0,16.0978 12.94612,29.1478 29.04395,29.1478 12.33919,0 22.81287,-7.6994 27.06599,-18.5298 -10.378,-10.57 -17.83675,-24.0544 -21.13213,-39.0363 -1.92854,-0.3985 -3.88588,-0.6247 -5.93386,-0.6247 z"
+     id="path6"
+     inkscape:connector-curvature="0" /></svg>
--- a/admin/osx/installer-background_2x.png
+++ b/admin/osx/installer-background_2x.png
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -250,8 +250,10 @@ def CopyFramework(path):
  parts = path.split(os.sep)
  print "CopyFramework:", path
  for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
+    matchObj = re.match(r'(\w+\.framework)', part)
+    if matchObj:
      full_path = os.path.join(frameworks_dir, *parts[i:-1])
+      framework = matchObj.group(1)
      break
  args = ['mkdir', '-p', full_path]
  commands.append(args)
@@ -259,12 +261,13 @@ def CopyFramework(path):
  commands.append(args)
  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
  commands.append(args)
+  args = ['chmod', 'u+w', os.path.join(frameworks_dir, framework, "Resources")]
+  commands.append(args)

  info_plist = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
  if os.path.exists(info_plist):
-    args = ['cp', '-r', info_plist, resources_dir]
+    args = ['cp', '-r', info_plist, os.path.join(frameworks_dir, framework, "Resources")]
    commands.append(args)
-
  return os.path.join(full_path, parts[-1])

 def FixId(path, library_name):
--- a/admin/osx/macosx.pkgproj
+++ b/admin/osx/macosx.pkgproj
@@ -491,7 +491,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.6.2</string>
+				<string>@MIRALL_VERSION_FULL@</string>
 			</dict>
 			<key>UUID</key>
 			<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
@@ -793,7 +793,7 @@
 													<key>GID</key>
 													<integer>0</integer>
 													<key>PATH</key>
-													<string>Library/ScriptingAdditions/OwnCloudFinder.osax/Contents</string>
+													<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
 													<key>PATH_TYPE</key>
 													<integer>3</integer>
 													<key>PERMISSIONS</key>
@@ -807,7 +807,7 @@
 											<key>GID</key>
 											<integer>0</integer>
 											<key>PATH</key>
-											<string>OwnCloudFinder.osax</string>
+											<string>SyncStateFinder.osax</string>
 											<key>PATH_TYPE</key>
 											<integer>0</integer>
 											<key>PERMISSIONS</key>
@@ -1019,7 +1019,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.6.2</string>
+				<string>@MIRALL_VERSION_FULL@</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1041,7 +1041,7 @@
 			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
 			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
 			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
-			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzguNTEiPgo8c3R5bGUg
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjEzNDMuMTQiPgo8c3R5bGUg
 			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
 			Pgo8L2JvZHk+CjwvaHRtbD4K
 			</data>
@@ -1054,10 +1054,10 @@
 				<integer>6</integer>
 				<key>BACKGROUND_PATH</key>
 				<dict>
-				<key>PATH</key>
-				<string>./@APPLICATION_EXECUTABLE@.app/Contents/Resources/owncloud_logo_blue.png</string>
-				<key>PATH_TYPE</key>
-				<integer>3</integer>
+					<key>PATH</key>
+					<string>@CMAKE_SOURCE_DIR@/admin/osx/installer-background.png</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
 				</dict>
 				<key>CUSTOM</key>
 				<integer>1</integer>
@@ -1415,7 +1415,7 @@
 			<key>NAME</key>
 			<string>ownCloud Installer</string>
 			<key>REFERENCE_FOLDER_PATH</key>
-			<string>/Users/mackie/install</string>
+			<string>@CMAKE_INSTALL_DIR@</string>
 		</dict>
 	</dict>
 	<key>TYPE</key>
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@ -228,9 +228,10 @@ int csync_update(CSYNC *ctx) {

  rc = csync_ftw(ctx, ctx->local.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
-    if(ctx->status_code == CSYNC_STATUS_OK)
+    if(ctx->status_code == CSYNC_STATUS_OK) {
        ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
-    return -1;
+    }
+    goto out;
  }

  csync_gettime(&finish);
@@ -247,20 +248,14 @@ int csync_update(CSYNC *ctx) {

  rc = csync_ftw(ctx, ctx->remote.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
-      if(ctx->status_code == CSYNC_STATUS_OK)
+      if(ctx->status_code == CSYNC_STATUS_OK) {
          ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
-      return -1;
+      }
+      goto out;
  }

  csync_gettime(&finish);

-  /* Finalize the sql precompiled statements after the update run since
-   * it runs in its own thread. Precompiled statements shoult not be shared
-   * across thread borders according to
-   * http://www.sqlite.org/cvstrac/wiki?p=MultiThreading
-   */
-  csync_statedb_finalize_statements(ctx);
-
  CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
            "Update detection for remote replica took %.2f seconds "
            "walking %zu files.",
@@ -269,7 +264,11 @@ int csync_update(CSYNC *ctx) {

  ctx->status |= CSYNC_STATUS_UPDATE;

-  return 0;
+  rc = 0;
+
+out:
+  csync_statedb_close(ctx);
+  return rc;
 }

 int csync_reconcile(CSYNC *ctx) {
@@ -285,6 +284,12 @@ int csync_reconcile(CSYNC *ctx) {
  /* Reconciliation for local replica */
  csync_gettime(&start);

+  if (csync_statedb_load(ctx, ctx->statedb.file, &ctx->statedb.db) < 0) {
+    ctx->status_code = CSYNC_STATUS_STATEDB_LOAD_ERROR;
+    rc = -1;
+    return rc;
+  }
+
  ctx->current = LOCAL_REPLICA;
  ctx->replica = ctx->local.type;

@@ -300,7 +305,7 @@ int csync_reconcile(CSYNC *ctx) {
      if (!CSYNC_STATUS_IS_OK(ctx->status_code)) {
          ctx->status_code = csync_errno_to_status( errno, CSYNC_STATUS_RECONCILE_ERROR );
      }
-      return -1;
+      goto out;
  }

  /* Reconciliation for remote replica */
@@ -321,11 +326,15 @@ int csync_reconcile(CSYNC *ctx) {
      if (!CSYNC_STATUS_IS_OK(ctx->status_code)) {
          ctx->status_code = csync_errno_to_status(errno,  CSYNC_STATUS_RECONCILE_ERROR );
      }
-      return -1;
+      goto out;
  }

  ctx->status |= CSYNC_STATUS_RECONCILE;

+  rc = 0;
+
+out:
+  csync_statedb_close(ctx);
  return 0;
 }

--- a/csync/src/csync_exclude.c
+++ b/csync/src/csync_exclude.c
@@ -156,6 +156,40 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
    return match;
 }

+// See http://support.microsoft.com/kb/74496
+static const char *win_reserved_words[] = {"CON","PRN","AUX", "NUL",
+                                           "COM1", "COM2", "COM3", "COM4",
+                                           "LPT1", "LPT2", "LPT3", "CLOCK$" };
+
+
+bool csync_is_windows_reserved_word(const char* filename) {
+
+  size_t win_reserve_words_len = sizeof(win_reserved_words) / sizeof(char*);
+  size_t j;
+
+  for (j = 0; j < win_reserve_words_len; j++) {
+    int len_reserved_word = strlen(win_reserved_words[j]);
+    int len_filename = strlen(filename);
+    if (len_filename == 2 && filename[1] == ':') {
+        if (filename[0] >= 'a' && filename[0] <= 'z') {
+            return true;
+        }
+        if (filename[0] >= 'A' && filename[0] <= 'Z') {
+            return true;
+        }
+    }
+    if (c_strncasecmp(filename, win_reserved_words[j], len_reserved_word) == 0) {
+        if (len_filename == len_reserved_word) {
+            return true;
+        }
+        if ((len_filename > len_reserved_word) && (filename[len_reserved_word] == '.')) {
+            return true;
+        }
+    }
+  }
+  return false;
+}
+
 CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype) {
  size_t i = 0;
  const char *p = NULL;
@@ -214,6 +248,13 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
      SAFE_FREE(dname);
      goto out;
  }
+
+  if (csync_is_windows_reserved_word(bname)) {
+    match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+    SAFE_FREE(bname);
+    SAFE_FREE(dname);
+    goto out;
+  }
 #endif

  rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
--- a/csync/src/csync_exclude.h
+++ b/csync/src/csync_exclude.h
@@ -80,4 +80,12 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype);
 CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype);
 #endif /* _CSYNC_EXCLUDE_H */

+/**
+ * @brief Checks if filename is considered reserved by Windows
+ * @param file_name filename
+ * @return true if file is reserved, false otherwise
+ */
+bool csync_is_windows_reserved_word(const char *file_name);
+
+
 /* vim: set ft=c.doxygen ts=8 sw=2 et cindent: */
--- a/csync/src/csync_reconcile.c
+++ b/csync/src/csync_reconcile.c
@@ -138,7 +138,6 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                /* Do not remove a directory that has ignored files */
                break;
            }
-            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Will Remove %s  %d", cur->path, cur->child_modified);
            if (cur->child_modified) {
                /* re-create directory that has modified contents */
                cur->instruction = CSYNC_INSTRUCTION_NEW;
--- a/csync/src/csync_statedb.c
+++ b/csync/src/csync_statedb.c
@@ -91,89 +91,10 @@ static int _csync_check_db_integrity(sqlite3 *db) {

    if( sqlite3_threadsafe() == 0 ) {
        CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "* WARNING: SQLite module is not threadsafe!");
+        rc = -1;
    }

    return rc;
-
-}
-
-static int _csync_statedb_check(const char *statedb) {
-  int fd = -1, rc;
-  ssize_t r;
-  char buf[BUF_SIZE] = {0};
-  sqlite3 *db = NULL;
-  csync_stat_t sb;
-
-  mbchar_t *wstatedb = c_utf8_to_locale(statedb);
-
-  if (wstatedb == NULL) {
-    return -1;
-  }
-
-  /* check db version */
-#ifdef _WIN32
-    _fmode = _O_BINARY;
-#endif
-
-    fd = _topen(wstatedb, O_RDONLY);
-
-    if (fd >= 0) {
-        /* Check size. Size of zero is a valid database actually. */
-        rc = _tfstat(fd, &sb);
-
-        if (rc == 0) {
-            if (sb.st_size == 0) {
-                CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Database size is zero byte!");
-                close(fd);
-            } else {
-                r = read(fd, (void *) buf, sizeof(buf) - 1);
-                close(fd);
-                if (r >= 0) {
-                    buf[BUF_SIZE - 1] = '\0';
-                    if (c_streq(buf, "SQLite format 3")) {
-                        if( sqlite_open(statedb, &db ) == SQLITE_OK )  {
-                            rc = _csync_check_db_integrity(db);
-                            if( sqlite3_close(db) != 0 ) {
-                                CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "WARN: sqlite3_close error!");
-                            }
-
-                            if( rc >= 0 ) {
-                                /* everything is fine */
-                                c_free_locale_string(wstatedb);
-                                return 0;
-                            }
-                            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Integrity check failed!");
-                        } else {
-                            /* resources need to be freed even when open failed */
-                            sqlite3_close(db);
-                            CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "database corrupted, removing!");
-                        }
-                    } else {
-                        CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "sqlite version mismatch");
-                    }
-                }
-            }
-        } else {
-            close(fd);
-        }
-        /* if it comes here, the database is broken and should be recreated. */
-        _tunlink(wstatedb);
-    }
-
-  c_free_locale_string(wstatedb);
-
-  /* create database, use the original sqlite3_open function here as opening
-   * read only is not sufficient because that does not create a new db but
-   * bails out with error. */
-  rc = sqlite3_open(statedb, &db);
-  if (rc == SQLITE_OK) {
-    sqlite3_close(db);
-    csync_win32_set_file_hidden(statedb, true);
-    return 1;
-  }
-  sqlite3_close(db);
-   CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "sqlite3_open failed: %s %s", sqlite3_errmsg(db), statedb);
-   return -1;
 }

 static int _csync_statedb_is_empty(sqlite3 *db) {
@@ -201,7 +122,6 @@ static void sqlite_profile( void *x, const char* sql, sqlite3_uint64 time)

 int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
  int rc = -1;
-  int check_rc = -1;
  c_strlist_t *result = NULL;
  sqlite3 *db = NULL;

@@ -209,20 +129,14 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
      return -1;
  }

-  ctx->statedb.lastReturnValue = SQLITE_OK;
-
-  /* csync_statedb_check tries to open the statedb and creates it in case
-   * its not there.
-   */
-  check_rc = _csync_statedb_check(statedb);
-  if (check_rc < 0) {
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: checking csync database failed - bail out.");
-
-    rc = -1;
-    goto out;
+  if (ctx->statedb.db) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: DB already open");
+      return -1;
  }

-  /* Open or create the temporary database */
+  ctx->statedb.lastReturnValue = SQLITE_OK;
+
+  /* Openthe database */
  if (sqlite_open(statedb, &db) != SQLITE_OK) {
    const char *errmsg= sqlite3_errmsg(ctx->statedb.db);
    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: Failed to sqlite3 open statedb - bail out: %s.",
@@ -232,9 +146,16 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
    goto out;
  }

-  /* If check_rc == 1 the database is new and empty as a result. */
-  if ((check_rc == 1) || _csync_statedb_is_empty(db)) {
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "statedb doesn't exist");
+  if (_csync_check_db_integrity(db) != 0) {
+      const char *errmsg= sqlite3_errmsg(db);
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: sqlite3 integrity check failed - bail out: %s.",
+                errmsg ? errmsg : "<no sqlite3 errormsg>");
+      rc = -1;
+      goto out;
+  }
+
+  if (_csync_statedb_is_empty(db)) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "statedb contents doesn't exist");
    csync_set_statedb_exists(ctx, 0);
  } else {
    csync_set_statedb_exists(ctx, 1);
@@ -262,6 +183,8 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
 #endif
  *pdb = db;

+   CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "Success");
+
  return 0;
 out:
  sqlite3_close(db);
@@ -275,9 +198,26 @@ int csync_statedb_close(CSYNC *ctx) {
      return -1;
  }

-  csync_statedb_finalize_statements(ctx);
+  /* deallocate query resources */
+  if( ctx->statedb.by_fileid_stmt ) {
+      sqlite3_finalize(ctx->statedb.by_fileid_stmt);
+      ctx->statedb.by_fileid_stmt = NULL;
+  }
+  if( ctx->statedb.by_hash_stmt ) {
+      sqlite3_finalize(ctx->statedb.by_hash_stmt);
+      ctx->statedb.by_hash_stmt = NULL;
+  }
+  if( ctx->statedb.by_inode_stmt) {
+      sqlite3_finalize(ctx->statedb.by_inode_stmt);
+      ctx->statedb.by_inode_stmt = NULL;
+  }

-  sqlite3_close(ctx->statedb.db);
+  ctx->statedb.lastReturnValue = SQLITE_OK;
+
+  int sr = sqlite3_close(ctx->statedb.db);
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "sqlite3_close=%d", sr);
+
+  ctx->statedb.db = 0;

  return rc;
 }
@@ -386,28 +326,6 @@ csync_file_stat_t *csync_statedb_get_stat_by_hash(CSYNC *ctx,
  return st;
 }

-void   csync_statedb_finalize_statements(CSYNC *ctx) {
-    if( !ctx ) {
-        return;
-    }
-
-    /* deallocate query resources */
-    if( ctx->statedb.by_fileid_stmt ) {
-        sqlite3_finalize(ctx->statedb.by_fileid_stmt);
-        ctx->statedb.by_fileid_stmt = NULL;
-    }
-    if( ctx->statedb.by_hash_stmt ) {
-        sqlite3_finalize(ctx->statedb.by_hash_stmt);
-        ctx->statedb.by_hash_stmt = NULL;
-    }
-    if( ctx->statedb.by_inode_stmt) {
-        sqlite3_finalize(ctx->statedb.by_inode_stmt);
-        ctx->statedb.by_inode_stmt = NULL;
-    }
-
-    ctx->statedb.lastReturnValue = SQLITE_OK;
-}
-
 csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx,
                                                      const char *file_id ) {
    csync_file_stat_t *st = NULL;
--- a/csync/src/csync_statedb.h
+++ b/csync/src/csync_statedb.h
@@ -98,12 +98,6 @@ int csync_statedb_get_below_path(CSYNC *ctx, const char *path);
 */
 c_strlist_t *csync_statedb_query(sqlite3 *db, const char *statement);

-/**
- * @brief csync_statedb_finalize_statements - Clear prepared statements
- * @param ctx The csync context
- */
-void csync_statedb_finalize_statements(CSYNC *ctx);
-
 #ifdef __cplusplus
 }
 #endif
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -247,8 +247,12 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,

    if(tmp && tmp->phash == h ) { /* there is an entry in the database */
        /* we have an update! */
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Database entry found, compare: %" PRId64 " <-> %" PRId64 ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64 ", size: %" PRId64 " <-> %" PRId64,
-                  ((int64_t) fs->mtime), ((int64_t) tmp->modtime), fs->etag, tmp->etag, (uint64_t) fs->inode, (uint64_t) tmp->inode, (uint64_t) fs->size, (uint64_t) tmp->size);
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Database entry found, compare: %" PRId64 " <-> %" PRId64
+                                            ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64
+                                            ", size: %" PRId64 " <-> %" PRId64 ", perms: %s <-> %s",
+                  ((int64_t) fs->mtime), ((int64_t) tmp->modtime),
+                  fs->etag, tmp->etag, (uint64_t) fs->inode, (uint64_t) tmp->inode,
+                  (uint64_t) fs->size, (uint64_t) tmp->size, fs->remotePerm, tmp->remotePerm );
        if( !fs->etag) {
            st->instruction = CSYNC_INSTRUCTION_EVAL;
            goto out;
@@ -375,8 +379,9 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
        }
    }
  } else  {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb, setting inst to NEW" );
-      st->instruction = CSYNC_INSTRUCTION_NEW;
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb" );
+      ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+      return -1;
  }

 out:
--- a/csync/src/std/c_string.c
+++ b/csync/src/std/c_string.c
@@ -134,6 +134,14 @@ static char *c_iconv(const char* str, enum iconv_direction dir)
 }
 #endif /* defined(HAVE_ICONV) && defined(WITH_ICONV) */

+int c_strncasecmp(const char *a, const char *b, size_t n) {
+#ifdef _WIN32
+    return _strnicmp(a, b, n);
+#else
+    return strncasecmp(a, b, n);
+#endif
+}
+
 int c_streq(const char *a, const char *b) {
  register const char *s1 = a;
  register const char *s2 = b;
--- a/csync/src/std/c_string.h
+++ b/csync/src/std/c_string.h
@@ -59,6 +59,17 @@ struct c_strlist_s {
  size_t size;
 };

+/**
+ * @brief Compare to strings case insensitively.
+ *
+ * @param a  First string to compare.
+ * @param b  Second string to compare.
+ * @param n  Max comparison length.
+ *
+ * @return see strncasecmp
+ */
+int c_strncasecmp(const char *a, const char *b, size_t n);
+
 /**
 * @brief Compare to strings if they are equal.
 *
--- a/csync/tests/csync_tests/check_csync_exclude.c
+++ b/csync/tests/csync_tests/check_csync_exclude.c
@@ -174,6 +174,25 @@ static void check_csync_pathes(void **state)
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
 }

+static void check_csync_is_windows_reserved_word() {
+    assert_true(csync_is_windows_reserved_word("CON"));
+    assert_true(csync_is_windows_reserved_word("con"));
+    assert_true(csync_is_windows_reserved_word("CON."));
+    assert_true(csync_is_windows_reserved_word("con."));
+    assert_true(csync_is_windows_reserved_word("CON.ference"));
+    assert_false(csync_is_windows_reserved_word("CONference"));
+    assert_false(csync_is_windows_reserved_word("conference"));
+    assert_false(csync_is_windows_reserved_word("conf.erence"));
+    assert_false(csync_is_windows_reserved_word("co"));
+    assert_true(csync_is_windows_reserved_word("A:"));
+    assert_true(csync_is_windows_reserved_word("a:"));
+    assert_true(csync_is_windows_reserved_word("z:"));
+    assert_true(csync_is_windows_reserved_word("Z:"));
+    assert_true(csync_is_windows_reserved_word("M:"));
+    assert_true(csync_is_windows_reserved_word("m:"));
+
+}
+
 int torture_run_tests(void)
 {
    const UnitTest tests[] = {
@@ -181,6 +200,7 @@ int torture_run_tests(void)
        unit_test_setup_teardown(check_csync_exclude_load, setup, teardown),
        unit_test_setup_teardown(check_csync_excluded, setup_init, teardown),
        unit_test_setup_teardown(check_csync_pathes, setup_init, teardown),
+        unit_test_setup_teardown(check_csync_is_windows_reserved_word, setup_init, teardown),
    };

    return run_tests(tests);
--- a/csync/tests/csync_tests/check_csync_statedb_load.c
+++ b/csync/tests/csync_tests/check_csync_statedb_load.c
@@ -42,6 +42,13 @@ static void setup(void **state) {

    csync->statedb.file = c_strdup( TESTDB );
    *state = csync;
+
+    sqlite3 *db = NULL;
+    rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
+    assert_int_equal(rc, SQLITE_OK);
+
+    rc = sqlite3_close(db);
+    assert_int_equal(rc, SQLITE_OK);
 }

 static void teardown(void **state) {
@@ -57,37 +64,6 @@ static void teardown(void **state) {
    *state = NULL;
 }

-static void check_csync_statedb_check(void **state)
-{
-    int rc;
-
-    (void) state; /* unused */
-
-    rc = system("mkdir -p /tmp/check_csync1");
-
-    /* old db */
-    rc = system("echo \"SQLite format 2\" > /tmp/check_csync1/test.db");
-    assert_int_equal(rc, 0);
-    rc = _csync_statedb_check(TESTDB);
-    assert_int_equal(rc, 1);
-
-    /* db already exists */
-    rc = _csync_statedb_check(TESTDB);
-    assert_int_equal(rc, 1);
-
-    /* no db exists */
-    rc = system("rm -f /tmp/check_csync1/test.db");
-    assert_int_equal(rc, 0);
-    rc = _csync_statedb_check(TESTDB);
-    assert_int_equal(rc, 1);
-
-    rc = _csync_statedb_check("/tmp/check_csync1/");
-    assert_int_equal(rc, -1);
-
-    rc = system("rm -rf /tmp/check_csync1");
-    assert_int_equal(rc, 0);
-}
-
 static void check_csync_statedb_load(void **state)
 {
    CSYNC *csync = *state;
@@ -143,7 +119,6 @@ static void check_csync_statedb_close(void **state)
 int torture_run_tests(void)
 {
    const UnitTest tests[] = {
-        unit_test_setup_teardown(check_csync_statedb_check, setup, teardown),
        unit_test_setup_teardown(check_csync_statedb_load, setup, teardown),
        unit_test_setup_teardown(check_csync_statedb_close, setup, teardown),
    };
--- a/csync/tests/csync_tests/check_csync_statedb_query.c
+++ b/csync/tests/csync_tests/check_csync_statedb_query.c
@@ -47,6 +47,12 @@ static void setup(void **state)
    rc = csync_init(csync);
    assert_int_equal(rc, 0);

+    sqlite3 *db = NULL;
+    rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
+    assert_int_equal(rc, SQLITE_OK);
+    rc = sqlite3_close(db);
+    assert_int_equal(rc, SQLITE_OK);
+
    rc = csync_statedb_load(csync, TESTDB, &csync->statedb.db);
    assert_int_equal(rc, 0);

--- a/csync/tests/csync_tests/check_csync_update.c
+++ b/csync/tests/csync_tests/check_csync_update.c
@@ -124,9 +124,18 @@ static void setup_ftw(void **state)
    assert_int_equal(rc, 0);
    rc = csync_init(csync);
    assert_int_equal(rc, 0);
+
+    sqlite3 *db = NULL;
+    rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
+    assert_int_equal(rc, SQLITE_OK);
+    statedb_create_metadata_table(db);
+    rc = sqlite3_close(db);
+    assert_int_equal(rc, SQLITE_OK);
+
    rc = csync_statedb_load(csync, TESTDB, &csync->statedb.db);
    assert_int_equal(rc, 0);

+    csync->statedb.file = c_strdup( TESTDB );
    *state = csync;
 }

--- a/csync/tests/ownCloud/ownCloud/Test.pm
+++ b/csync/tests/ownCloud/ownCloud/Test.pm
@@ -727,7 +727,7 @@ sub createShare($$)
    my $ua  = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0 } );
    $ua->agent( "ownCloudTest_sharing");
    # http://localhost/ocm/ocs/v1.php/apps/files_sharing/api/v1/shares
-    my $puturl = $ocs_url . "ocs/v1.php/apps/files_sharing/api/v1/shares";
+    my $puturl = $ocs_url . "apps/files_sharing/api/v1/shares";

    my $string = "path=$dir&shareType=0&shareWith=$user&publicUpload=false&permissions=$readWrite";
    print ">>>>>>>>>> $puturl $string\n";
--- a/csync/tests/ownCloud/t1.pl
+++ b/csync/tests/ownCloud/t1.pl
@@ -122,8 +122,24 @@ assertLocalAndRemoteDir( '', 0);

 # The previous sync should have updated the etags, and this should NOT be a conflict
 printInfo( "Update the file again");
-createLocalFile( localDir() . "remoteToLocal1/kernelcrash.txt", 2136 );
-createLocalFile( localDir() . "remoteToLocal1/kraft_logo.gif", 2332 );
+
+my $f1 = localDir() . "remoteToLocal1/kernelcrash.txt";
+my $s1 = 2136;
+createLocalFile( $f1, $s1);
+
+# stat the file
+my @stat1 = stat $f1;
+print "Updating File $f1 to $s1, size is $stat1[7]\n";
+
+
+my $f2 = localDir() . "remoteToLocal1/kraft_logo.gif";
+my $s2 = 2332;
+
+createLocalFile( $f2, $s2);
+# stat the file
+my @stat2 = stat $f2;
+print "Updating File $f2 to $s2, size is $stat2[7]\n";
+
 system( "sleep 2 && touch " . localDir() . "remoteToLocal1/kernelcrash.txt" );
 csync( );
 assertLocalAndRemoteDir( '', 0);
--- a/csync/tests/ownCloud/t3.pl
+++ b/csync/tests/ownCloud/t3.pl
@@ -91,7 +91,10 @@ assertLocalAndRemoteDir( 'newdir', 0);
 assert( -e localDir().'newdir/rtl1/rtl11/newfile.dat' );
 assert( -e localDir().'newdir/rtl1/rtl11/myfile.txt' );
 assert( ! -e localDir().'newdir/rtl11/test.txt' );
-assert( ! -e localDir().'remoteToLocal1' );
+# BUG!  remoteToLocal1 is not deleted because changes were detected
+#       (even if the changed fileswere moved)
+# assert( ! -e localDir().'remoteToLocal1' );
+assert( ! -e localDir().'remoteToLocal1/rtl1' );

 printInfo("Move file and create another one with the same name.");
 move( localDir() . 'newdir/myfile.txt', localDir() . 'newdir/oldfile.txt' );
--- a/csync/tests/ownCloud/t6.pl
+++ b/csync/tests/ownCloud/t6.pl
@@ -39,7 +39,7 @@ sub createPostUpdateScript($)

    my $srcFile = localDir().'BIG1.file';
    my $cred = configValue("user") . ":" . configValue("passwd");
-    my $cmd = "curl -T $srcFile -u $cred " . testDirUrl().$name;
+    my $cmd = "curl -T $srcFile -u $cred --insecure " . testDirUrl().$name;
    my $script = "/tmp/post_update_script.sh";
    open SC, ">$script" || die("Can not create script file");
    print SC "#!/bin/bash\n";
--- a/shell_integration/MacOSX/CMakeLists.txt
+++ b/shell_integration/MacOSX/CMakeLists.txt
@@ -2,10 +2,10 @@
 if(APPLE)
 add_custom_target( mac_overlayplugin ALL 
                   xcodebuild -workspace ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/OwnCloud.xcworkspace 
-                            -scheme OwnCloudFinder.osax SYMROOT=${CMAKE_CURRENT_BINARY_DIR} archive
+                            -scheme SyncStateFinder.osax SYMROOT=${CMAKE_CURRENT_BINARY_DIR} archive
                   COMMENT building Mac Overlay icons)

-INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/OwnCloudFinder.osax/Contents
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/OwnCloudFinder.osax/ )
+INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/SyncStateFinder.osax/Contents
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/SyncStateFinder.osax/ )
 endif(APPLE)

--- a/shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.pbxproj
+++ b/shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.pbxproj
@@ -48,7 +48,7 @@
 		8C37DDB9161594B400016A95 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
 		8C99F6921622D145002D2135 /* IconCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconCache.h; sourceTree = "<group>"; };
 		8C99F6931622D145002D2135 /* IconCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IconCache.m; sourceTree = "<group>"; };
-		8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwnCloudFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		8D576316048677EA00EA77CD /* SyncStateFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyncStateFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */

@@ -67,7 +67,7 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
-		089C166AFE841209C02AAC07 /* OwnCloudFinder */ = {
+		089C166AFE841209C02AAC07 /* SyncStateFinder */ = {
 			isa = PBXGroup;
 			children = (
 				08FB77AFFE84173DC02AAC07 /* Source */,
@@ -75,7 +75,7 @@
 				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
 				19C28FB6FE9D52B211CA2CBB /* Products */,
 			);
-			name = OwnCloudFinder;
+			name = SyncStateFinder;
 			sourceTree = "<group>";
 			usesTabs = 1;
 		};
@@ -144,7 +144,7 @@
 		19C28FB6FE9D52B211CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */,
+				8D576316048677EA00EA77CD /* SyncStateFinder.bundle */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -152,9 +152,9 @@
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
-		8D57630D048677EA00EA77CD /* OwnCloudFinder */ = {
+		8D57630D048677EA00EA77CD /* SyncStateFinder */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder" */;
+			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder" */;
 			buildPhases = (
 				8D57630F048677EA00EA77CD /* Resources */,
 				8D576311048677EA00EA77CD /* Sources */,
@@ -164,10 +164,10 @@
 			);
 			dependencies = (
 			);
-			name = OwnCloudFinder;
+			name = SyncStateFinder;
 			productInstallPath = "$(HOME)/Library/Bundles";
-			productName = OwnCloudFinder;
-			productReference = 8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */;
+			productName = SyncStateFinder;
+			productReference = 8D576316048677EA00EA77CD /* SyncStateFinder.bundle */;
 			productType = "com.apple.product-type.bundle";
 		};
 /* End PBXNativeTarget section */
@@ -178,7 +178,7 @@
 			attributes = {
 				LastUpgradeCheck = 0460;
 			};
-			buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudFinder" */;
+			buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "SyncStateFinder" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -188,11 +188,11 @@
 				French,
 				German,
 			);
-			mainGroup = 089C166AFE841209C02AAC07 /* OwnCloudFinder */;
+			mainGroup = 089C166AFE841209C02AAC07 /* SyncStateFinder` */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				8D57630D048677EA00EA77CD /* OwnCloudFinder */,
+				8D57630D048677EA00EA77CD /* SyncStateFinder */,
 			);
 		};
 /* End PBXProject section */
@@ -252,7 +252,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
-				PRODUCT_NAME = OwnCloudFinder;
+				PRODUCT_NAME = SyncStateFinder;
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Debug;
@@ -269,7 +269,7 @@
 				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
-				PRODUCT_NAME = OwnCloudFinder;
+				PRODUCT_NAME = SyncStateFinder;
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Release;
@@ -308,7 +308,7 @@
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder" */ = {
+		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB911B08733D790010E9CD /* Debug */,
@@ -317,7 +317,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudFinder" */ = {
+		1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "SyncStateFinder" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB911F08733D790010E9CD /* Debug */,
--- a/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.m
+++ b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.m
@@ -27,7 +27,7 @@ static NSString* globalLock = @"I'm the global lock to prevent concruent handler
@end

 static bool liferayNativityLoaded = false;
-static NSString* liferayNativityBundleName = @"OwnCloudFinder";
+static NSString* liferayNativityBundleName = @"SyncStateFinder";

 typedef struct {
  NSString* location;
@@ -85,7 +85,7 @@ static OSErr loadBundle(LNBundleType type, AppleEvent* reply, long refcon) {
  }

  if (isLoaded) {
-    NSLog(@"LiferayNativityInjector: %@ already loaded.", bundleName);
+    NSLog(@"OwnCloudInjector: %@ already loaded.", bundleName);
    return noErr;
  }

--- a/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.pbxproj
+++ b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		0B36CB92182461A10039B237 /* OwnCloudFinder.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */; };
+		0B36CB92182461A10039B237 /* SyncStateFinder.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B36CB91182461A10039B237 /* SyncStateFinder.bundle */; };
 		0BD9C38E1778EF450094CF5D /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0BD9C38D1778EF450094CF5D /* license.txt */; };
 		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
 		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
@@ -19,10 +19,10 @@
 /* Begin PBXFileReference section */
 		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = OwnCloudFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		0B36CB91182461A10039B237 /* SyncStateFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = SyncStateFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		0BD9C38D1778EF450094CF5D /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = "<group>"; };
 		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		D60A992314CE37030061AD6D /* OwnCloudFinder.osax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwnCloudFinder.osax; sourceTree = BUILT_PRODUCTS_DIR; };
+		D60A992314CE37030061AD6D /* SyncStateFinder.osax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyncStateFinder.osax; sourceTree = BUILT_PRODUCTS_DIR; };
 		D6ACBE9E117B7D5600F6691C /* OwnCloudInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OwnCloudInjector.m; sourceTree = "<group>"; };
 		D6ACBE9F117B7D5600F6691C /* LNVersionComparisonProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNVersionComparisonProtocol.h; sourceTree = "<group>"; };
 		D6ACBEA0117B7D5600F6691C /* LNStandardVersionComparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNStandardVersionComparator.m; sourceTree = "<group>"; };
@@ -51,7 +51,7 @@
 				D60A992414CE37030061AD6D /* Products */,
 			);
 			indentWidth = 2;
-			name = "TotalFinder-osax";
+			name = "SyncStateFinder-osax";
 			sourceTree = "<group>";
 			tabWidth = 2;
 			usesTabs = 0;
@@ -67,7 +67,7 @@
 		089C167CFE841241C02AAC07 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */,
+				0B36CB91182461A10039B237 /* SyncStateFinder.bundle */,
 				D6ACBEA4117B7D6100F6691C /* OwnCloudInjector.sdef */,
 				8D576317048677EA00EA77CD /* Info.plist */,
 				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
@@ -90,7 +90,7 @@
 		D60A992414CE37030061AD6D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				D60A992314CE37030061AD6D /* OwnCloudFinder.osax */,
+				D60A992314CE37030061AD6D /* SyncStateFinder.osax */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -98,9 +98,9 @@
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
-		8D57630D048677EA00EA77CD /* OwnCloudFinder.osax */ = {
+		8D57630D048677EA00EA77CD /* SyncStateFinder.osax */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder.osax" */;
+			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder.osax" */;
 			buildPhases = (
 				8D57630F048677EA00EA77CD /* Resources */,
 				8D576311048677EA00EA77CD /* Sources */,
@@ -110,10 +110,10 @@
 			);
 			dependencies = (
 			);
-			name = OwnCloudFinder.osax;
+			name = SyncStateFinder.osax;
 			productInstallPath = "$(HOME)/Library/Bundles";
-			productName = "TotalFinder-osax";
-			productReference = D60A992314CE37030061AD6D /* OwnCloudFinder.osax */;
+			productName = "SyncStateFinder-osax";
+			productReference = D60A992314CE37030061AD6D /* SyncStateFinder.osax */;
 			productType = "com.apple.product-type.bundle";
 		};
 /* End PBXNativeTarget section */
@@ -139,7 +139,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				8D57630D048677EA00EA77CD /* OwnCloudFinder.osax */,
+				8D57630D048677EA00EA77CD /* SyncStateFinder.osax */,
 			);
 		};
 /* End PBXProject section */
@@ -149,7 +149,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0B36CB92182461A10039B237 /* OwnCloudFinder.bundle in Resources */,
+				0B36CB92182461A10039B237 /* SyncStateFinder.bundle in Resources */,
 				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
 				D6ACBEA5117B7D6100F6691C /* OwnCloudInjector.sdef in Resources */,
 				0BD9C38E1778EF450094CF5D /* license.txt in Resources */,
@@ -195,7 +195,7 @@
 					"-framework",
 					AppKit,
 				);
-				PRODUCT_NAME = OwnCloudFinder;
+				PRODUCT_NAME = SyncStateFinder;
 				SKIP_INSTALL = YES;
 				WRAPPER_EXTENSION = osax;
 			};
@@ -214,7 +214,7 @@
 					"-framework",
 					AppKit,
 				);
-				PRODUCT_NAME = OwnCloudFinder;
+				PRODUCT_NAME = SyncStateFinder;
 				WRAPPER_EXTENSION = osax;
 			};
 			name = Release;
@@ -245,7 +245,7 @@
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder.osax" */ = {
+		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder.osax" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB911B08733D790010E9CD /* Debug */,
--- a/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcshareddata/xcschemes/SyncStateFinder.osax.xcscheme
+++ b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcshareddata/xcschemes/SyncStateFinder.osax.xcscheme
@@ -15,8 +15,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "8D57630D048677EA00EA77CD"
-               BuildableName = "OwnCloudFinder.bundle"
-               BlueprintName = "OwnCloudFinder"
+               BuildableName = "SyncStateFinder.bundle"
+               BlueprintName = "SyncStateFinder"
               ReferencedContainer = "container:../OwnCloudFinder/OwnCloudFinder.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -29,8 +29,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "8D57630D048677EA00EA77CD"
-               BuildableName = "OwnCloudFinder.osax"
-               BlueprintName = "OwnCloudFinder.osax"
+               BuildableName = "SyncStateFinder.osax"
+               BlueprintName = "SyncStateFinder.osax"
               ReferencedContainer = "container:OwnCloudInjector.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
--- a/shell_integration/MacOSX/deploy.sh
+++ b/shell_integration/MacOSX/deploy.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # osascript $HOME/owncloud.com/mirall/shell_integration/MacOSX/unload.scpt

-sudo rm -rf /Library/ScriptingAdditions/OwnCloudFinder.osax
+sudo rm -rf /Library/ScriptingAdditions/SyncStateFinder.osax
 # Klaas' machine
-OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Products/Debug/OwnCloudFinder.osax
-[ -d $OSAXDIR ] ||OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Intermediates/ArchiveIntermediates/OwnCloudFinder.osax/IntermediateBuildFilesPath/UninstalledProducts/OwnCloudFinder.osax
+OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Products/Debug/SyncStateFinder.osax
+[ -d $OSAXDIR ] ||OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Intermediates/ArchiveIntermediates/SyncStateFinder.osax/IntermediateBuildFilesPath/UninstalledProducts/SyncStateFinder.osax

 # Markus' machine
 [ -d $OSAXDIR ] || echo "OSAX does not exist"
--- a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp
+++ b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp
@@ -62,7 +62,7 @@ HRESULT OCOverlayRegistrationHandler::RemoveRegistryEntries(PCWSTR friendlyName)
 	}

 	HKEY syncExOverlayKey = NULL;
-	hResult = HRESULT_FROM_WIN32(RegDeleteKeyEx(shellOverlayKey, friendlyName, DELETE, 0));
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(shellOverlayKey, friendlyName));
 	if (!SUCCEEDED(hResult)) {
 		return hResult;
 	}
@@ -137,12 +137,12 @@ HRESULT OCOverlayRegistrationHandler::UnregisterCOMObject(const CLSID& clsid)
 		return hResult;
 	}

-	hResult = HRESULT_FROM_WIN32(RegDeleteKeyEx(clsidKey, REGISTRY_IN_PROCESS, DELETE, 0));
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(clsidKey, REGISTRY_IN_PROCESS));
 	if(!SUCCEEDED(hResult)) {
 		return hResult;
 	}

-	hResult = HRESULT_FROM_WIN32(RegDeleteKeyEx(hKey, stringCLSID, DELETE, 0));
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(hKey, stringCLSID));
 	if(!SUCCEEDED(hResult)) {
 		return hResult;
 	}
--- a/shell_integration/windows/OCShellExtensions/OCUtil/RemotePathChecker.cpp
+++ b/shell_integration/windows/OCShellExtensions/OCUtil/RemotePathChecker.cpp
@@ -113,10 +113,15 @@ void RemotePathChecker::workerThreadLoop()
                auto state = _StrToFileState(responseStatus);
                auto erased = asked.erase(responsePath);

+                bool changed = false;
                {   std::unique_lock<std::mutex> lock(_mutex);
-                    _cache[responsePath] = state;
+                    auto &it = _cache[responsePath];
+                    changed = it == state;
+                    it = state;
+                }
+                if (changed) {
+                    SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT, responsePath.data(), NULL);
                }
-                SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH, responsePath.data(), NULL);
            }
        }

--- a/src/3rdparty/qtmacgoodies
+++ b/src/3rdparty/qtmacgoodies
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -389,8 +389,9 @@ if(NOT BUILD_LIBRARIES_ONLY)
  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
          RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
  )
+  # Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-          INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/" )
+          INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )


  target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
--- a/src/mirall/discoveryphase.cpp
+++ b/src/mirall/discoveryphase.cpp
@@ -45,7 +45,7 @@ bool DiscoveryJob::isInSelectiveSyncBlackList(const QString& path) const
        return false;
    }
    --it;
-    Q_ASSERT(it->endsWith(QLatin1Char('/'))); // SyncEngine::setSelectiveSyncBlackList makes sure of that
+    Q_ASSERT(it->endsWith(QLatin1Char('/'))); // Folder::setSelectiveSyncBlackList makes sure of that
    if (pathSlash.startsWith(*it)) {
        return true;
    }
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -61,6 +61,8 @@ Folder::Folder(const QString &alias, const QString &path, const QString& secondP
      , _wipeDb(false)
      , _proxyDirty(true)
      , _forceSyncOnPollTimeout(false)
+      , _consecutiveFailingSyncs(0)
+      , _consecutiveFollowUpSyncs(0)
      , _journal(path)
      , _csync_ctx(0)
 {
@@ -272,12 +274,19 @@ void Folder::slotPollTimerTimeout()

    bool forceSyncIntervalExpired =
            quint64(_timeSinceLastSync.elapsed()) > MirallConfigFile().forceSyncInterval();
-    bool okSyncResult =
-            _syncResult.status() == SyncResult::Success ||
-            _syncResult.status() == SyncResult::Problem;
-    if (forceSyncIntervalExpired ||
-            _forceSyncOnPollTimeout ||
-            !okSyncResult) {
+    bool syncAgainAfterFail = _consecutiveFailingSyncs > 0 && _consecutiveFailingSyncs < 3;
+
+    // There are several conditions under which we trigger a full-discovery sync:
+    // * When a suitably long time has passed since the last sync finished
+    // * When the last sync failed (only a couple of times)
+    // * When the last sync requested another sync to be done (only a couple of times)
+    //
+    // Note that the etag check (see below) and the file watcher may also trigger
+    // syncs.
+    if (forceSyncIntervalExpired
+            || _forceSyncOnPollTimeout
+            || syncAgainAfterFail) {
+
        if (forceSyncIntervalExpired) {
            qDebug() << "** Force Sync, because it has been " << _timeSinceLastSync.elapsed() << "ms "
                     << "since the last sync";
@@ -285,13 +294,18 @@ void Folder::slotPollTimerTimeout()
        if (_forceSyncOnPollTimeout) {
            qDebug() << "** Force Sync, because it was requested";
        }
-        if (!okSyncResult) {
-            qDebug() << "** Force Sync, because the last sync had status: " << _syncResult.statusString();
+        if (syncAgainAfterFail) {
+            qDebug() << "** Force Sync, because the last"
+                     << _consecutiveFailingSyncs << "syncs failed, last status:"
+                     << _syncResult.statusString();
        }
        _forceSyncOnPollTimeout = false;
        emit scheduleToSync(alias());
+
    } else {
-        // do the ordinary etag check for the root folder.
+        // Do the ordinary etag check for the root folder and only schedule a real
+        // sync if it's different.
+
        RequestEtagJob* job = new RequestEtagJob(account, remotePath(), this);
        // check if the etag is different
        QObject::connect(job, SIGNAL(etagRetreived(QString)), this, SLOT(etagRetreived(QString)));
@@ -539,19 +553,17 @@ void Folder::slotAboutToPropagate(const SyncFileItemVector& items)
 bool Folder::estimateState(QString fn, csync_ftw_type_e t, SyncFileStatus* s)
 {
    if (t == CSYNC_FTW_TYPE_DIR) {
-        qDebug() << Q_FUNC_INFO << "ASKING ERROR FOLDERS" << fn;
        if (Utility::doesSetContainPrefix(_stateLastSyncItemsWithError, fn)) {
+            qDebug() << Q_FUNC_INFO << "Folder has error" << fn;
            s->set(SyncFileStatus::STATUS_ERROR);
            return true;
        }
        // If sync is running, check _syncedItems, possibly give it STATUS_EVAL (=syncing down)
        if (!_engine.isNull()) {
-            qDebug() << Q_FUNC_INFO << "SYNC IS RUNNING, asking SyncEngine" << fn;
            if (_engine->estimateState(fn, t, s)) {
                return true;
            }
        }
-        qDebug() << Q_FUNC_INFO << "ASKING TAINTED FOLDERS" << fn;
        if (Utility::doesSetContainPrefix(_stateTaintedFolders, fn)) {
            qDebug() << Q_FUNC_INFO << "Folder is tainted, EVAL!" << fn;
            s->set(SyncFileStatus::STATUS_EVAL);
@@ -766,6 +778,17 @@ void Folder::setDirtyNetworkLimits()
    }
 }

+void Folder::setSelectiveSyncBlackList(const QStringList& blackList)
+{
+    _selectiveSyncBlackList = blackList;
+    for (int i = 0; i < _selectiveSyncBlackList.count(); ++i) {
+        if (!_selectiveSyncBlackList.at(i).endsWith(QLatin1Char('/'))) {
+            _selectiveSyncBlackList[i].append(QLatin1Char('/'));
+        }
+    }
+}
+
+
 void Folder::slotSyncError(const QString& err)
 {
    _errors.append( err );
@@ -805,11 +828,6 @@ void Folder::slotSyncFinished()
    _stateLastSyncItemsWithError = _stateLastSyncItemsWithErrorNew;
    _stateLastSyncItemsWithErrorNew.clear();
    _stateTaintedFolders.clear(); // heuristic: assume the sync had been done, new file watches needed to taint dirs
-    if (_csyncError || _csyncUnavail) {
-        // Taint the whole sync dir, we cannot give reliable state information
-        _stateTaintedFolders.insert(QLatin1String("/"));
-    }
-

    if (_csyncError) {
        _syncResult.setStatus(SyncResult::Error);
@@ -826,6 +844,18 @@ void Folder::slotSyncFinished()
        _syncResult.setStatus(SyncResult::Success);
    }

+    // Count the number of syncs that have failed in a row.
+    if (_syncResult.status() == SyncResult::Success
+            || _syncResult.status() == SyncResult::Problem)
+    {
+        _consecutiveFailingSyncs = 0;
+    }
+    else
+    {
+        _consecutiveFailingSyncs++;
+        qDebug() << "the last" << _consecutiveFailingSyncs << "syncs failed";
+    }
+
    emit syncStateChange();

    // The syncFinished result that is to be triggered here makes the folderman
@@ -836,16 +866,28 @@ void Folder::slotSyncFinished()
    // all come in.
    QTimer::singleShot(200, this, SLOT(slotEmitFinishedDelayed() ));

-    if (!anotherSyncNeeded) {
-        _pollTimer.start();
-        _timeSinceLastSync.restart();
+    _timeSinceLastSync.restart();
+
+    // Increment the follow-up sync counter if necessary.
+    if (anotherSyncNeeded) {
+        _consecutiveFollowUpSyncs++;
+        qDebug() << "another sync was requested by the finished sync, this has"
+                 << "happened" << _consecutiveFollowUpSyncs << "times";
    } else {
-        // Another sync is required.  We will make sure that the poll timer occurs soon enough.
-        qDebug() << "another sync was requested by the finished sync";
-        _forceSyncOnPollTimeout = true;
-        QTimer::singleShot(1000, this, SLOT(slotPollTimerTimeout() ));
+        _consecutiveFollowUpSyncs = 0;
    }

+    // Maybe force a follow-up sync to take place, but only a couple of times.
+    if (anotherSyncNeeded && _consecutiveFollowUpSyncs <= 3)
+    {
+        _forceSyncOnPollTimeout = true;
+        // We will make sure that the poll timer occurs soon enough.
+        // delay 1s, 4s, 9s
+        int c = _consecutiveFollowUpSyncs;
+        QTimer::singleShot(c*c * 1000, this, SLOT(slotPollTimerTimeout() ));
+    } else {
+        _pollTimer.start();
+    }
 }

 void Folder::slotEmitFinishedDelayed()
--- a/src/mirall/folder.h
+++ b/src/mirall/folder.h
@@ -119,8 +119,7 @@ public:
     SyncJournalDb *journalDb() { return &_journal; }

     QStringList selectiveSyncBlackList() { return _selectiveSyncBlackList; }
-     void setSelectiveSyncBlackList(const QStringList &blackList)
-     { _selectiveSyncBlackList = blackList; }
+     void setSelectiveSyncBlackList(const QStringList &blackList);

     bool estimateState(QString fn, csync_ftw_type_e t, SyncFileStatus* s);

@@ -205,6 +204,14 @@ private:
    QElapsedTimer _timeSinceLastSync;
    bool          _forceSyncOnPollTimeout;

+    /// The number of syncs that failed in a row.
+    /// Reset when a sync is successful.
+    int           _consecutiveFailingSyncs;
+
+    /// The number of requested follow-up syncs.
+    /// Reset when no follow-up is requested.
+    int           _consecutiveFollowUpSyncs;
+
    // For the SocketAPI folder states
    QSet<QString>   _stateLastSyncItemsWithErrorNew; // gets moved to _stateLastSyncItemsWithError at end of sync
    QSet<QString>   _stateLastSyncItemsWithError;
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -698,6 +698,17 @@ bool FolderMan::startFromScratch( const QString& localFolder )
            qDebug() << "startFromScratch: Directory is empty!";
            return true;
        }
+        // Disconnect the socket api from the database to avoid that locking of the
+        // db file does not allow to move this dir.
+        if( _socketApi ) {
+            Folder *f = folderForPath(localFolder);
+            if(f) {
+                if( localFolder.startsWith(f->path()) ) {
+                    _socketApi->slotUnregisterPath(f->alias());
+                }
+            }
+        }
+
        // Make a backup of the folder/file.
        QString newName = getBackupName( parentDir.absoluteFilePath( folderName ) );
        if( !parentDir.rename( fi.absoluteFilePath(), newName ) ) {
--- a/src/mirall/openfilemanager.cpp
+++ b/src/mirall/openfilemanager.cpp
@@ -90,18 +90,22 @@ void showInFileManager(const QString &localPath)
        }
 #endif
        QString explorer = "explorer.exe "; // FIXME: we trust it's in PATH
+        QFileInfo fi(localPath);

-        if (!QFileInfo(localPath).isDir()) {
-            explorer += QLatin1String("/select,");
+        // canonicalFilePath returns empty if the file does not exist
+        if( !fi.canonicalFilePath().isEmpty() ) {
+            if (!fi.isDir()) {
+                explorer += QLatin1String("/select,");
+            }
+            explorer += QLatin1Char('"');
+            explorer += QDir::toNativeSeparators(fi.canonicalFilePath());
+            explorer += QLatin1Char('"');
+
+            qDebug() << "OO Open explorer commandline:" << explorer;
+            QProcess p;
+            p.start(explorer);
+            p.waitForFinished(5000);
        }
-        explorer += QLatin1Char('"');
-        explorer += QDir::toNativeSeparators(localPath);
-        explorer += QLatin1Char('"');
-
-        qDebug() << "OO Open explorer commandline:" << explorer;
-        QProcess p;
-        p.start(explorer);
-        p.waitForFinished(5000);
    } else if (Utility::isMac()) {
        QStringList scriptArgs;
        scriptArgs << QLatin1String("-e")
@@ -182,4 +186,4 @@ void showInFileManager(const QString &localPath)
    }
 }

-}
+}
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -101,8 +101,9 @@ ownCloudGui::ownCloudGui(Application *parent) :

 void ownCloudGui::setupOverlayIcons()
 {
-
-    if( Utility::isMac() && QFile::exists("/Library/ScriptingAdditions/OwnCloudFinder.osax") ) {
+#ifdef Q_OS_MAC
+    const QLatin1String finderExtension("/Library/ScriptingAdditions/SyncStateFinder.osax");
+    if(QFile::exists(finderExtension) ) {
        QString aScript = QString::fromUtf8("tell application \"Finder\"\n"
                                            "  try\n"
                                            "    «event OWNCload»\n"
@@ -122,7 +123,10 @@ void ownCloudGui::setupOverlayIcons()
          QString resultAsString(result); // if appropriate
          qDebug() << "Laod Finder Overlay-Plugin: " << resultAsString << ": " << p.exitCode()
                   << (p.exitCode() != 0 ? p.errorString() : QString::null);
+    } else  {
+        qDebug() << finderExtension << "does not exist! Finder Overlay Plugin loading failed";
    }
+#endif
 }

 // This should rather be in application.... or rather in MirallConfigFile?
--- a/src/mirall/owncloudsetupwizard.cpp
+++ b/src/mirall/owncloudsetupwizard.cpp
@@ -401,7 +401,6 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
        _ocWizard->account()->deleteLater();
        qDebug() << "Rejected the new config, use the old!";
    } else if( result == QDialog::Accepted ) {
-
        Account *newAccount = _ocWizard->account();
        Account *origAccount = AccountManager::instance()->account();

@@ -410,6 +409,13 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
            localFolder.append(QLatin1Char('/'));
        }

+        Folder *f = folderMan->folderForPath(localFolder);
+        if( f ) {
+            folderMan->setSyncEnabled(false);
+            folderMan->terminateSyncProcess(f->alias());
+            f->journalDb()->close();
+        }
+
        bool isInitialSetup = (origAccount == 0);

        // check if either the account or the local folder changed, than reinit
--- a/src/mirall/ownsql.cpp
+++ b/src/mirall/ownsql.cpp
@@ -99,7 +99,7 @@ sqlite3* SqlDatabase::sqliteDb()

 /* =========================================================================================== */

-SqlQuery::SqlQuery( SqlDatabase db )
+SqlQuery::SqlQuery( SqlDatabase& db )
    :_db(db.sqliteDb()),
      _stmt(0)
 {
@@ -113,7 +113,7 @@ SqlQuery::~SqlQuery()
    }
 }

-SqlQuery::SqlQuery(const QString& sql, SqlDatabase db)
+SqlQuery::SqlQuery(const QString& sql, SqlDatabase& db)
    :_db(db.sqliteDb()),
      _stmt(0)
 {
@@ -168,7 +168,7 @@ bool SqlQuery::exec()
                rc = sqlite3_reset(_stmt); /* This will also return SQLITE_LOCKED */
                n++;
                Mirall::Utility::usleep(SQLITE_SLEEP_TIME_USEC);
-            } else if( (rc == SQLITE_BUSY) ) {
+            } else if( rc == SQLITE_BUSY ) {
                Mirall::Utility::usleep(SQLITE_SLEEP_TIME_USEC);
                n++;
            }
@@ -236,6 +236,9 @@ void SqlQuery::bindValue(int pos, const QVariant& value)
            break; }
        }
    }
+    if (res != SQLITE_OK) {
+        qDebug() << Q_FUNC_INFO << "ERROR" << value.toString() << res;
+    }
    Q_ASSERT( res == SQLITE_OK );
 }

--- a/src/mirall/ownsql.h
+++ b/src/mirall/ownsql.h
@@ -25,6 +25,7 @@ namespace Mirall {

 class OWNCLOUDSYNC_EXPORT SqlDatabase
 {
+    Q_DISABLE_COPY(SqlDatabase)
 public:
    explicit SqlDatabase();

@@ -48,8 +49,8 @@ class OWNCLOUDSYNC_EXPORT SqlQuery
    Q_DISABLE_COPY(SqlQuery)
 public:
    explicit SqlQuery();
-    explicit SqlQuery(SqlDatabase db);
-    explicit SqlQuery(const QString& sql, SqlDatabase db);
+    explicit SqlQuery(SqlDatabase& db);
+    explicit SqlQuery(const QString& sql, SqlDatabase& db);

    ~SqlQuery();
    QString error() const;
--- a/src/mirall/protocolwidget.cpp
+++ b/src/mirall/protocolwidget.cpp
@@ -254,7 +254,7 @@ void ProtocolWidget::computeResyncButtonEnabled()

    QString t = tr("Currently no files are ignored because of previous errors.");
    if(cnt > 0) {
-        t = tr("%1 files are ignored because of previous errors.\n Try to sync these again.").arg(cnt);
+        t = tr("%n files are ignored because of previous errors.\n Try to sync these again.", 0, cnt);
    }

    _clearBlacklistBtn->setEnabled(cnt > 0);
--- a/src/mirall/selectivesyncdialog.cpp
+++ b/src/mirall/selectivesyncdialog.cpp
@@ -33,6 +33,7 @@ namespace Mirall {
 SelectiveSyncTreeView::SelectiveSyncTreeView(Account *account, QWidget* parent)
    : QTreeWidget(parent), _inserting(false), _account(account)
 {
+    _loading = new QLabel(tr("Loading ..."), this);
    connect(this, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(slotItemExpanded(QTreeWidgetItem*)));
    connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemChanged(QTreeWidgetItem*,int)));
    header()->hide();
@@ -47,6 +48,8 @@ void SelectiveSyncTreeView::refreshFolders()
            this, SLOT(slotUpdateDirectories(QStringList)));
    job->start();
    clear();
+    _loading->show();
+    _loading->move(10,10);
 }

 static QTreeWidgetItem* findFirstChild(QTreeWidgetItem *parent, const QString& text)
@@ -78,7 +81,7 @@ void SelectiveSyncTreeView::recursiveInsert(QTreeWidgetItem* parent, QStringList
                    || parent->checkState(0) == Qt::PartiallyChecked) {
                item->setCheckState(0, Qt::Checked);
                foreach(const QString &str , _oldBlackList) {
-                    if (str + "/" == path) {
+                    if (str == path) {
                        item->setCheckState(0, Qt::Unchecked);
                        break;
                    } else if (str.startsWith(path)) {
@@ -104,6 +107,8 @@ void SelectiveSyncTreeView::slotUpdateDirectories(const QStringList&list)
    QScopedValueRollback<bool> isInserting(_inserting);
    _inserting = true;

+    _loading->hide();
+
    QTreeWidgetItem *root = topLevelItem(0);
    if (!root) {
        root = new QTreeWidgetItem(this);
@@ -132,6 +137,9 @@ void SelectiveSyncTreeView::slotUpdateDirectories(const QStringList&list)
        if (paths.last().isEmpty()) paths.removeLast();
        if (paths.isEmpty())
            continue;
+        if (!path.endsWith('/')) {
+            path.append('/');
+        }
        recursiveInsert(root, paths, path);
    }
    root->setExpanded(true);
@@ -218,7 +226,7 @@ QStringList SelectiveSyncTreeView::createBlackList(QTreeWidgetItem* root) const

    switch(root->checkState(0)) {
    case Qt::Unchecked:
-        return QStringList(root->data(0, Qt::UserRole).toString());
+        return QStringList(root->data(0, Qt::UserRole).toString() + "/");
    case  Qt::Checked:
        return QStringList();
    case Qt::PartiallyChecked:
@@ -260,6 +268,7 @@ SelectiveSyncDialog::SelectiveSyncDialog(Account* account, const QStringList& bl

 void SelectiveSyncDialog::init(Account *account)
 {
+    setWindowTitle(tr("Choose What to Sync"));
    QVBoxLayout *layout = new QVBoxLayout(this);
    _treeView = new SelectiveSyncTreeView(account, this);
    layout->addWidget(new QLabel(tr("Unchecked folders will not be sync to this computer")));
--- a/src/mirall/selectivesyncdialog.h
+++ b/src/mirall/selectivesyncdialog.h
@@ -18,6 +18,7 @@

 class QTreeWidgetItem;
 class QTreeWidget;
+class QLabel;
 namespace Mirall {

 class Account;
@@ -28,8 +29,12 @@ class SelectiveSyncTreeView : public QTreeWidget {
    Q_OBJECT
 public:
    explicit SelectiveSyncTreeView(Account *account, QWidget* parent = 0);
+
+    /// Returns a list of blacklisted paths, each including the trailing /
    QStringList createBlackList(QTreeWidgetItem* root = 0) const;
    void refreshFolders();
+
+    // oldBlackList is a list of excluded paths, each including a trailing /
    void setFolderInfo(const QString &folderPath, const QString &rootName,
                       const QStringList &oldBlackList = QStringList()) {
        _folderPath = folderPath;
@@ -48,6 +53,7 @@ private:
    QStringList _oldBlackList;
    bool _inserting; // set to true when we are inserting new items on the list
    Account *_account;
+    QLabel *_loading;
 };

 class SelectiveSyncDialog : public QDialog {
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -75,7 +75,11 @@ SocketApi::SocketApi(QObject* parent)

    if (Utility::isWindows()) {
        socketPath = QLatin1String("\\\\.\\pipe\\")
-                + Theme::instance()->appName();
+        + QLatin1String("ownCloud");
+        // TODO: once the windows extension supports multiple
+        // client connections, switch back to the theme name
+        // See issue #2388
+        // + Theme::instance()->appName();
    } else if (Utility::isMac()) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
        // Always using Qt5 on OS X
@@ -244,6 +248,10 @@ void SocketApi::slotUnregisterPath( const QString& alias )

 void SocketApi::slotUpdateFolderView(const QString& alias)
 {
+    if (_listeners.isEmpty()) {
+        return;
+    }
+
    Folder *f = FolderMan::instance()->folder(alias);
    if (f) {
        // do only send UPDATE_VIEW for a couple of status
@@ -253,11 +261,11 @@ void SocketApi::slotUpdateFolderView(const QString& alias)
                f->syncResult().status() == SyncResult::Problem ||
                f->syncResult().status() == SyncResult::Error   ||
                f->syncResult().status() == SyncResult::SetupError ) {
-            if( Utility::isWindows() ) {
-                Utility::winShellChangeNotify( f->path() );
-            } else {
-                broadcastMessage(QLatin1String("UPDATE_VIEW"), f->path() );
-            }
+
+            broadcastMessage(QLatin1String("STATUS"), f->path() ,
+                             this->fileStatus(f, "", _excludes).toSocketAPIString());
+
+            broadcastMessage(QLatin1String("UPDATE_VIEW"), f->path() );
        } else {
            qDebug() << "Not sending UPDATE_VIEW for" << alias << "because status() is" << f->syncResult().status();
        }
@@ -266,6 +274,10 @@ void SocketApi::slotUpdateFolderView(const QString& alias)

 void SocketApi::slotJobCompleted(const QString &folder, const SyncFileItem &item)
 {
+    if (_listeners.isEmpty()) {
+        return;
+    }
+
    Folder *f = FolderMan::instance()->folder(folder);
    if (!f) {
        return;
@@ -282,6 +294,10 @@ void SocketApi::slotJobCompleted(const QString &folder, const SyncFileItem &item

 void SocketApi::slotSyncItemDiscovered(const QString &folder, const SyncFileItem &item)
 {
+    if (_listeners.isEmpty()) {
+        return;
+    }
+
    if (item._instruction == CSYNC_INSTRUCTION_NONE) {
        return;
    }
@@ -342,7 +358,7 @@ void SocketApi::command_RETRIEVE_FOLDER_STATUS(const QString& argument, SocketTy
 {
    // This command is the same as RETRIEVE_FILE_STATUS

-    qDebug() << Q_FUNC_INFO << argument;
+    //qDebug() << Q_FUNC_INFO << argument;
    command_RETRIEVE_FILE_STATUS(argument, socket);
 }

@@ -363,7 +379,9 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, SocketType
        DEBUG << "folder offline or not watched:" << argument;
        statusString = QLatin1String("NOP");
    } else {
-        const QString file = argument.mid(syncFolder->path().length());
+
+
+        const QString file = QDir::cleanPath(argument).mid(QDir::cleanPath(syncFolder->path()).length()+1);
        SyncFileStatus fileStatus = this->fileStatus(syncFolder, file, _excludes);

        statusString = fileStatus.toSocketAPIString();
@@ -459,6 +477,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
 {
    QString file = folder->path();
    QString fileName = systemFileName.normalized(QString::NormalizationForm_C);
+    QString fileNameSlash = fileName;

    if( fileName != QLatin1String("/") && !fileName.isEmpty() ) {
        file = folder->path() + fileName;
@@ -467,6 +486,8 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
    if( fileName.endsWith(QLatin1Char('/')) ) {
        fileName.truncate(fileName.length()-1);
        qDebug() << "Removed trailing slash: " << fileName;
+    } else {
+        fileNameSlash += QLatin1Char('/');
    }

    QFileInfo fi(file);
@@ -486,71 +507,106 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
        type = CSYNC_FTW_TYPE_DIR;
    }

-    // '\' is ignored, so convert to unix path before passing the path in.
-    QString unixFileName = QDir::fromNativeSeparators(fileName);
-
-    CSYNC_EXCLUDE_TYPE excl = csync_excluded_no_ctx(excludes, unixFileName.toUtf8(), type);
+    // Is it excluded?
+    CSYNC_EXCLUDE_TYPE excl = csync_excluded_no_ctx(excludes, fileName.toUtf8(), type);
    if( excl != CSYNC_NOT_EXCLUDED ) {
        return SyncFileStatus(SyncFileStatus::STATUS_IGNORE);
    }

-
-    SyncFileStatus status(SyncFileStatus::STATUS_NONE);
-    if (type == CSYNC_FTW_TYPE_DIR) {
-        if (folder->estimateState(fileName, type, &status)) {
-            qDebug() << Q_FUNC_INFO << "Folder estimated status for" << fileName << "to" << status.toSocketAPIString();
-            return status;
+    // Error if it is in the selective sync blacklistr
+    foreach(const auto &s, folder->selectiveSyncBlackList()) {
+        if (fileNameSlash.startsWith(s)) {
+            return SyncFileStatus(SyncFileStatus::STATUS_ERROR);
        }
-        if (fileName == "") {
-            // sync folder itself
-            if (folder->syncResult().status() == SyncResult::Undefined
-                    || folder->syncResult().status() == SyncResult::NotYetStarted
-                    || folder->syncResult().status() == SyncResult::SyncPrepare
-                    || folder->syncResult().status() == SyncResult::SyncRunning
-                    || folder->syncResult().status() == SyncResult::Paused) {
-                status.set(SyncFileStatus::STATUS_EVAL);
-                return status;
-            } else if (folder->syncResult().status() == SyncResult::Success
-                       || folder->syncResult().status() == SyncResult::Problem) {
-                status.set(SyncFileStatus::STATUS_SYNC);
-                return status;
-            }  else if (folder->syncResult().status() == SyncResult::Error
-                        || folder->syncResult().status() == SyncResult::SetupError
-                        || folder->syncResult().status() == SyncResult::SyncAbortRequested) {
-                status.set(SyncFileStatus::STATUS_ERROR);
-                return status;
-            }
-        }
-        SyncJournalFileRecord rec = dbFileRecord_capi(folder, unixFileName );
-        if (rec.isValid()) {
-            status.set(SyncFileStatus::STATUS_SYNC);
-            if (rec._remotePerm.contains("S")) {
-               status.setSharedWithMe(true);
-            }
-        } else {
-            status.set(SyncFileStatus::STATUS_EVAL);
-        }
-    } else if (type == CSYNC_FTW_TYPE_FILE) {
-        if (folder->estimateState(fileName, type, &status)) {
-            return status;
-        }
-        SyncJournalFileRecord rec = dbFileRecord_capi(folder, unixFileName );
-        if (rec.isValid()) {
-            if (rec._remotePerm.contains("S")) {
-               status.setSharedWithMe(true);
-            }
-            if( FileSystem::getModTime(fi.absoluteFilePath()) == Utility::qDateTimeToTime_t(rec._modtime) ) {
-                status.set(SyncFileStatus::STATUS_SYNC);
-                return status;
-            } else {
-                status.set(SyncFileStatus::STATUS_EVAL);
-                return status;
-            }
-        }
-        status.set(SyncFileStatus::STATUS_NEW);
-        return status;
    }

+    SyncFileStatus status(SyncFileStatus::STATUS_NONE);
+    SyncJournalFileRecord rec = dbFileRecord_capi(folder, fileName );
+
+    if (folder->estimateState(fileName, type, &status)) {
+        qDebug() << Q_FUNC_INFO << "Folder estimated status for" << fileName << "to" << status.toSocketAPIString();
+    } else if (fileName == "") {
+        // sync folder itself
+        switch (folder->syncResult().status()) {
+        case SyncResult::Undefined:
+        case SyncResult::NotYetStarted:
+        case SyncResult::SyncPrepare:
+        case SyncResult::SyncRunning:
+            status.set(SyncFileStatus::STATUS_EVAL);
+            return status;
+
+        case SyncResult::Success:
+        case SyncResult::Problem:
+            status.set(SyncFileStatus::STATUS_SYNC);
+            return status;
+
+        case SyncResult::Error:
+        case SyncResult::SetupError:
+        case SyncResult::SyncAbortRequested:
+            status.set(SyncFileStatus::STATUS_ERROR);
+            return status;
+
+        case SyncResult::Paused:
+            status.set(SyncFileStatus::STATUS_IGNORE);
+            return status;
+        }
+    } else if (type == CSYNC_FTW_TYPE_DIR) {
+        if (rec.isValid()) {
+            status.set(SyncFileStatus::STATUS_SYNC);
+        } else {
+            qDebug() << Q_FUNC_INFO << "Could not determine state for folder" << fileName << "will set STATUS_NEW";
+            status.set(SyncFileStatus::STATUS_NEW);
+        }
+    } else if (type == CSYNC_FTW_TYPE_FILE) {
+        if (rec.isValid()) {
+            if( FileSystem::getModTime(fi.absoluteFilePath()) == Utility::qDateTimeToTime_t(rec._modtime) ) {
+                status.set(SyncFileStatus::STATUS_SYNC);
+            } else {
+                if (rec._remotePerm.isNull() || rec._remotePerm.contains("W") ) {
+                    status.set(SyncFileStatus::STATUS_EVAL);
+                } else {
+                    status.set(SyncFileStatus::STATUS_ERROR);
+                }
+            }
+        } else {
+            qDebug() << Q_FUNC_INFO << "Could not determine state for file" << fileName << "will set STATUS_NEW";
+            status.set(SyncFileStatus::STATUS_NEW);
+        }
+    }
+
+    if (rec.isValid()) {
+        if (rec._remotePerm.isNull()) {
+            // probably owncloud 6, that does not have permissions flag yet.
+            QString url = folder->remoteUrl().toString() + fileName;
+            if (url.contains(QLatin1String("/remote.php/webdav/Shared/"))) {
+                status.setSharedWithMe(true);
+            }
+        } else if (rec._remotePerm.contains("S")) {
+            status.setSharedWithMe(true);
+        }
+    }
+    if (status.tag() == SyncFileStatus::STATUS_NEW) {
+        // check the parent folder if it is shared and if it is allowed to create a file/dir within
+        QDir d( fi.path() );
+        auto parentPath = d.path();
+        auto dirRec = dbFileRecord_capi(folder, parentPath);
+        bool isDir = type == CSYNC_FTW_TYPE_DIR;
+        while( !d.isRoot() && !(d.exists() && dirRec.isValid()) ) {
+            d.cdUp(); // returns true if the dir exists.
+
+            parentPath = d.path();
+            // cut the folder path
+            dirRec = dbFileRecord_capi(folder, parentPath);
+
+            isDir = true;
+        }
+        if( dirRec.isValid() && !dirRec._remotePerm.isNull()) {
+            if( (isDir && !dirRec._remotePerm.contains("K"))
+                    || (!isDir && !dirRec._remotePerm.contains("C")) ) {
+                status.set(SyncFileStatus::STATUS_ERROR);
+            }
+        }
+    }
    return status;
 }

--- a/src/mirall/socketapi.h
+++ b/src/mirall/socketapi.h
@@ -65,7 +65,6 @@ private slots:

 private:
    SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName, c_strlist_t *excludes );
-    SyncJournalFileRecord dbFileRecord( Folder *folder, QString fileName );
    SyncJournalFileRecord dbFileRecord_capi( Folder *folder, QString fileName );
    SyncFileStatus recursiveFolderStatus(Folder *folder, const QString& fileName, c_strlist_t *excludes  );
    SqlQuery *getSqlQuery( Folder *folder );
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -544,9 +544,11 @@ void SyncEngine::startSync()
    }

    if (fileRecordCount >= 1 && isUpdateFrom_1_5) {
-        qDebug() << "detected update from 1.5";
+        qDebug() << "detected update from 1.5" << fileRecordCount << isUpdateFrom_1_5;
        // Disable the read from DB to be sure to re-read all the fileid and etags.
        csync_set_read_from_db(_csync_ctx, false);
+    } else {
+        csync_set_read_from_db(_csync_ctx, true);
    }

    bool usingSelectiveSync = (!_selectiveSyncBlackList.isEmpty());
@@ -1070,11 +1072,6 @@ QByteArray SyncEngine::getPermissions(const QString& file) const
 void SyncEngine::setSelectiveSyncBlackList(const QStringList& list)
 {
    _selectiveSyncBlackList = list;
-    for (int i = 0; i < _selectiveSyncBlackList.count(); ++i) {
-        if (!_selectiveSyncBlackList.at(i).endsWith(QLatin1Char('/'))) {
-            _selectiveSyncBlackList[i].append(QLatin1Char('/'));
-        }
-    }
 }

 bool SyncEngine::estimateState(QString fn, csync_ftw_type_e t, SyncFileStatus* s)
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -14,6 +14,7 @@
 #include <QFile>
 #include <QStringList>
 #include <QDebug>
+#include <QElapsedTimer>
 #include "mirall/ownsql.h"

 #include <inttypes.h>
@@ -22,6 +23,7 @@
 #include "syncjournalfilerecord.h"
 #include "utility.h"
 #include "version.h"
+#include "filesystem.h"

 #include "../../csync/src/std/c_jhash.h"

@@ -51,6 +53,22 @@ QString SyncJournalDb::databaseFilePath()
    return _dbFile;
 }

+// Note that this does not change the size of the -wal file, but it is supposed to make
+// the normal .db faster since the changes from the wal will be incorporated into it.
+// Then the next sync (and the SocketAPI) will have a faster access.
+void SyncJournalDb::walCheckpoint()
+{
+    QElapsedTimer t;
+    t.start();
+    SqlQuery pragma1(_db);
+    pragma1.prepare("PRAGMA wal_checkpoint(FULL);");
+    if (!pragma1.exec()) {
+        qDebug() << pragma1.error();
+    } else {
+        qDebug() << Q_FUNC_INFO << "took" << t.elapsed() << "msec";
+    }
+}
+
 void SyncJournalDb::startTransaction()
 {
    if( _transaction == 0 ) {
@@ -99,6 +117,8 @@ bool SyncJournalDb::checkConnect()
        return false;
    }

+    bool isNewDb = !QFile::exists(_dbFile);
+
    // The database file is created by this call (SQLITE_OPEN_CREATE)
    if( !_db.open(_dbFile) ) {
        QString error = _db.error();
@@ -138,6 +158,11 @@ bool SyncJournalDb::checkConnect()
        return sqlFail("Set PRAGMA case_sensitivity", pragma1);
    }

+    // Hide 'em all!
+    FileSystem::setFileHidden(databaseFilePath(), true);
+    FileSystem::setFileHidden(databaseFilePath() + "-wal", true);
+    FileSystem::setFileHidden(databaseFilePath() + "-shm", true);
+
    /* Because insert are so slow, e do everything in a transaction, and one need to call commit */
    startTransaction();

@@ -212,18 +237,42 @@ bool SyncJournalDb::checkConnect()
        return sqlFail("Create table version", createQuery);
    }

-    SqlQuery versionQuery("SELECT major, minor FROM version;", _db);
+    _possibleUpgradeFromMirall_1_5 = false;
+    SqlQuery versionQuery("SELECT major, minor, patch FROM version;", _db);
    if (!versionQuery.next()) {
        // If there was no entry in the table, it means we are likely upgrading from 1.5
-        _possibleUpgradeFromMirall_1_5 = true;
-    }
+        if (!isNewDb) {
+            qDebug() << Q_FUNC_INFO << "_possibleUpgradeFromMirall_1_5 detected!";
+            _possibleUpgradeFromMirall_1_5 = true;
+        }
+        createQuery.prepare("INSERT INTO version VALUES (?1, ?2, ?3, ?4);");
+        createQuery.bindValue(1, MIRALL_VERSION_MAJOR);
+        createQuery.bindValue(2, MIRALL_VERSION_MINOR);
+        createQuery.bindValue(3, MIRALL_VERSION_PATCH);
+        createQuery.bindValue(3, MIRALL_VERSION_BUILD);
+        createQuery.exec();

-    createQuery.prepare("INSERT OR REPLACE INTO version (major, minor, patch) VALUES ( ?1, ?2 , ?3 );");
-    createQuery.bindValue(1, MIRALL_VERSION_MAJOR);
-    createQuery.bindValue(2, MIRALL_VERSION_MINOR);
-    createQuery.bindValue(3, MIRALL_VERSION_PATCH);
-    if (!createQuery.exec()) {
-        return sqlFail("Insert Version", createQuery);
+    } else {
+        int major = versionQuery.intValue(0);
+        int minor = versionQuery.intValue(1);
+        int patch = versionQuery.intValue(2);
+
+        // Not comparing the BUILD id here, correct?
+        if( !(major == MIRALL_VERSION_MAJOR && minor == MIRALL_VERSION_MINOR && patch == MIRALL_VERSION_PATCH) ) {
+            createQuery.prepare("UPDATE version SET major=?1, minor=?2, patch =?3, custom=?4 "
+                                "WHERE major=?5 AND minor=?6 AND patch=?7;");
+            createQuery.bindValue(1, MIRALL_VERSION_MAJOR);
+            createQuery.bindValue(2, MIRALL_VERSION_MINOR);
+            createQuery.bindValue(3, MIRALL_VERSION_PATCH);
+            createQuery.bindValue(4, MIRALL_VERSION_BUILD);
+            createQuery.bindValue(5, major);
+            createQuery.bindValue(6, minor);
+            createQuery.bindValue(7, patch);
+            if (!createQuery.exec()) {
+                return sqlFail("Update version", createQuery);
+            }
+
+        }
    }

    commitInternal("checkConnect");
@@ -310,7 +359,6 @@ void SyncJournalDb::close()
    _possibleUpgradeFromMirall_1_5 = false;

    _db.close();
-    _db = SqlDatabase(); // avoid the warning SqlDatabasePrivate::removeDatabase: connection [...] still in use
    _avoidReadFromDbOnNextSyncFilter.clear();
 }

@@ -444,6 +492,7 @@ bool SyncJournalDb::setFileRecord( const SyncJournalFileRecord& _record )
        if( fileId.isEmpty() ) fileId = "";
        QString remotePerm (record._remotePerm);
        if (remotePerm.isEmpty()) remotePerm = QString(); // have NULL in DB (vs empty)
+        _setFileRecordQuery->reset();
        _setFileRecordQuery->bindValue(1, QString::number(phash));
        _setFileRecordQuery->bindValue(2, plen);
        _setFileRecordQuery->bindValue(3, record._path );
@@ -467,8 +516,8 @@ bool SyncJournalDb::setFileRecord( const SyncJournalFileRecord& _record )
                 << record._mode
                 << QString::number(Utility::qDateTimeToTime_t(record._modtime)) << QString::number(record._type)
                 << record._etag << record._fileId << record._remotePerm;
-        _setFileRecordQuery->reset();

+        _setFileRecordQuery->reset();
        return true;
    } else {
        qDebug() << "Failed to connect database.";
@@ -485,6 +534,7 @@ bool SyncJournalDb::deleteFileRecord(const QString& filename, bool recursively)
        // always delete the actual file.

        qlonglong phash = getPHash(filename);
+        _deleteFileRecordPhash->reset();
        _deleteFileRecordPhash->bindValue( 1, QString::number(phash) );

        if( !_deleteFileRecordPhash->exec() ) {
@@ -496,6 +546,7 @@ bool SyncJournalDb::deleteFileRecord(const QString& filename, bool recursively)
        qDebug() <<  _deleteFileRecordPhash->lastQuery() << phash << filename;
        _deleteFileRecordPhash->reset();
        if( recursively) {
+            _deleteFileRecordRecursively->reset();
            _deleteFileRecordRecursively->bindValue(1, filename);
            if( !_deleteFileRecordRecursively->exec() ) {
                qWarning() << "Exec error of SQL statement: "
@@ -522,6 +573,7 @@ SyncJournalFileRecord SyncJournalDb::getFileRecord( const QString& filename )
    SyncJournalFileRecord rec;

    if( checkConnect() ) {
+        _getFileRecordQuery->reset();
        _getFileRecordQuery->bindValue(1, QString::number(phash));

        if (!_getFileRecordQuery->exec()) {
@@ -541,12 +593,11 @@ SyncJournalFileRecord SyncJournalDb::getFileRecord( const QString& filename )
            rec._etag    = _getFileRecordQuery->baValue(7);
            rec._fileId  = _getFileRecordQuery->baValue(8);
            rec._remotePerm = _getFileRecordQuery->baValue(9);
-
-            _getFileRecordQuery->reset();
        } else {
            QString err = _getFileRecordQuery->error();
            qDebug() << "No journal entry found for " << filename;
        }
+        _getFileRecordQuery->reset();
    }
    return rec;
 }
@@ -589,6 +640,14 @@ bool SyncJournalDb::postSyncCleanup(const QSet<QString> &items )
            return false;
        }
    }
+
+    // Incoroporate results back into main DB
+    walCheckpoint();
+
+    if (_possibleUpgradeFromMirall_1_5) {
+        _possibleUpgradeFromMirall_1_5 = false; // should be handled now
+    }
+
    return true;
 }

@@ -634,6 +693,7 @@ static bool deleteBatch(SqlQuery & query, const QStringList & entries, const QSt
    qDebug() << "Removing stale " << qPrintable(name) << " entries: " << entries.join(", ");
    // FIXME: Was ported from execBatch, check if correct!
    foreach( const QString& entry, entries ) {
+        query.reset();
        query.bindValue(1, entry);
        if (!query.exec()) {
            QString err = query.error();
@@ -642,7 +702,8 @@ static bool deleteBatch(SqlQuery & query, const QStringList & entries, const QSt
            return false;
        }
    }
-    query.reset();
+    query.reset(); // viel hilft viel ;-)
+
    return true;
 }

@@ -653,6 +714,7 @@ SyncJournalDb::DownloadInfo SyncJournalDb::getDownloadInfo(const QString& file)
    DownloadInfo res;

    if( checkConnect() ) {
+        _getDownloadInfoQuery->reset();
        _getDownloadInfoQuery->bindValue(1, file);

        if (!_getDownloadInfoQuery->exec()) {
@@ -680,6 +742,7 @@ void SyncJournalDb::setDownloadInfo(const QString& file, const SyncJournalDb::Do
    }

    if (i._valid) {
+        _setDownloadInfoQuery->reset();
        _setDownloadInfoQuery->bindValue(1, file);
        _setDownloadInfoQuery->bindValue(2, i._tmpfile);
        _setDownloadInfoQuery->bindValue(3, i._etag );
@@ -694,6 +757,7 @@ void SyncJournalDb::setDownloadInfo(const QString& file, const SyncJournalDb::Do
        _setDownloadInfoQuery->reset();

    } else {
+        _deleteDownloadInfoQuery->reset();
        _deleteDownloadInfoQuery->bindValue( 1, file );

        if( !_deleteDownloadInfoQuery->exec() ) {
@@ -751,6 +815,7 @@ SyncJournalDb::UploadInfo SyncJournalDb::getUploadInfo(const QString& file)

    if( checkConnect() ) {

+        _getUploadInfoQuery->reset();
        _getUploadInfoQuery->bindValue(1, file);

        if (!_getUploadInfoQuery->exec()) {
@@ -782,6 +847,7 @@ void SyncJournalDb::setUploadInfo(const QString& file, const SyncJournalDb::Uplo
    }

    if (i._valid) {
+        _setUploadInfoQuery->reset();
        _setUploadInfoQuery->bindValue(1, file);
        _setUploadInfoQuery->bindValue(2, i._chunk);
        _setUploadInfoQuery->bindValue(3, i._transferid );
@@ -797,6 +863,7 @@ void SyncJournalDb::setUploadInfo(const QString& file, const SyncJournalDb::Uplo
        qDebug() <<  _setUploadInfoQuery->lastQuery() << file << i._chunk << i._transferid << i._errorCount;
        _setUploadInfoQuery->reset();
    } else {
+        _deleteUploadInfoQuery->reset();
        _deleteUploadInfoQuery->bindValue(1, file);

        if( !_deleteUploadInfoQuery->exec() ) {
@@ -847,6 +914,7 @@ SyncJournalBlacklistRecord SyncJournalDb::blacklistEntry( const QString& file )
    // SELECT lastTryEtag, lastTryModtime, retrycount, errorstring

    if( checkConnect() ) {
+        _blacklistQuery->reset();
        _blacklistQuery->bindValue( 1, file );
        if( _blacklistQuery->exec() ){
            if( _blacklistQuery->next() ) {
@@ -856,11 +924,11 @@ SyncJournalBlacklistRecord SyncJournalDb::blacklistEntry( const QString& file )
                entry._errorString    = _blacklistQuery->stringValue(3);
                entry._file           = file;
            }
+            _blacklistQuery->reset();
        } else {
            qWarning() << "Exec error blacklist: " << _blacklistQuery->lastQuery() <<  " : "
                       << _blacklistQuery->error();
        }
-        _blacklistQuery->reset();
    }

    return entry;
@@ -1094,6 +1162,25 @@ bool SyncJournalDb::isUpdateFrom_1_5()
    return _possibleUpgradeFromMirall_1_5;
 }

+bool operator==(const SyncJournalDb::DownloadInfo & lhs,
+                const SyncJournalDb::DownloadInfo & rhs)
+{
+    return     lhs._errorCount == rhs._errorCount
+            && lhs._etag == rhs._etag
+            && lhs._tmpfile == rhs._tmpfile
+            && lhs._valid == rhs._valid;

+}
+
+bool operator==(const SyncJournalDb::UploadInfo & lhs,
+                const SyncJournalDb::UploadInfo & rhs)
+{
+    return     lhs._errorCount == rhs._errorCount
+            && lhs._chunk == rhs._chunk
+            && lhs._modtime == rhs._modtime
+            && lhs._valid == rhs._valid
+            && lhs._size == rhs._size
+            && lhs._transferid == rhs._transferid;
+}

 } // namespace Mirall
--- a/src/mirall/syncjournaldb.h
+++ b/src/mirall/syncjournaldb.h
@@ -42,6 +42,7 @@ public:
    bool deleteFileRecord( const QString& filename, bool recursively = false );
    int getFileRecordCount();
    bool exists();
+    void walCheckpoint();

    QString databaseFilePath();
    static qint64 getPHash(const QString& );
@@ -141,5 +142,10 @@ private:
    QList<QString> _avoidReadFromDbOnNextSyncFilter;
 };

+bool operator==(const SyncJournalDb::DownloadInfo & lhs,
+                const SyncJournalDb::DownloadInfo & rhs);
+bool operator==(const SyncJournalDb::UploadInfo & lhs,
+                const SyncJournalDb::UploadInfo & rhs);
+
 }  // namespace Mirall
 #endif // SYNCJOURNALDB_H
--- a/src/mirall/syncjournalfilerecord.cpp
+++ b/src/mirall/syncjournalfilerecord.cpp
@@ -88,4 +88,18 @@ SyncJournalBlacklistRecord::SyncJournalBlacklistRecord(const SyncFileItem& item,

 }

+
+bool operator==(const SyncJournalFileRecord & lhs,
+                const SyncJournalFileRecord & rhs)
+{
+    return     lhs._path == rhs._path
+            && lhs._inode == rhs._inode
+            && lhs._modtime == rhs._modtime
+            && lhs._type == rhs._type
+            && lhs._etag == rhs._etag
+            && lhs._fileId == rhs._fileId
+            && lhs._remotePerm == rhs._remotePerm
+            && lhs._mode == rhs._mode;
+}
+
 }
--- a/src/mirall/syncjournalfilerecord.h
+++ b/src/mirall/syncjournalfilerecord.h
@@ -43,6 +43,9 @@ public:
    int       _mode;
 };

+bool operator==(const SyncJournalFileRecord & lhs,
+                const SyncJournalFileRecord & rhs);
+
 class SyncJournalBlacklistRecord
 {
 public:
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@ -224,7 +224,7 @@ QString Utility::toCSyncScheme(const QString &urlStr)
    return url.toString();
 }

-bool Utility::doesSetContainPrefix(QSet<QString> &l, QString &p) {
+bool Utility::doesSetContainPrefix(const QSet<QString> &l, const QString &p) {

    Q_FOREACH (const QString &setPath, l) {
        //qDebug() << Q_FUNC_INFO << p << setPath << setPath.startsWith(p);
@@ -372,17 +372,6 @@ bool Utility::isLinux()
 #endif
 }

-void Utility::winShellChangeNotify( const QString& path )
-{
-#ifdef Q_OS_WIN
-    SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT,
-                   reinterpret_cast<const wchar_t *>(QDir::toNativeSeparators(path).utf16()), NULL );
-#else
-    Q_UNUSED(path);
-    qDebug() << Q_FUNC_INFO << " is not implemented on non Windows systems.";
-#endif
-}
-

 static const char STOPWATCH_END_TAG[] = "_STOPWATCH_END";

--- a/src/mirall/utility.h
+++ b/src/mirall/utility.h
@@ -42,7 +42,7 @@ namespace Utility
    OWNCLOUDSYNC_EXPORT QString toCSyncScheme(const QString &urlStr);
    /** Like QLocale::toString(double, 'f', prec), but drops trailing zeros after the decimal point */

-    OWNCLOUDSYNC_EXPORT bool doesSetContainPrefix(QSet<QString> &l, QString &p);
+    OWNCLOUDSYNC_EXPORT bool doesSetContainPrefix(const QSet<QString> &l, const QString &p);



@@ -63,8 +63,6 @@ namespace Utility
    OWNCLOUDSYNC_EXPORT QDateTime qDateTimeFromTime_t(qint64 t);
    OWNCLOUDSYNC_EXPORT qint64 qDateTimeToTime_t(const QDateTime &t);

-    OWNCLOUDSYNC_EXPORT void winShellChangeNotify( const QString& path );
-
    /**
     * @brief Convert milliseconds to HMS string.
     * @param quint64 msecs the milliseconds to convert to string.
--- a/src/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/wizard/owncloudadvancedsetuppage.cpp
@@ -118,8 +118,7 @@ void OwncloudAdvancedSetupPage::updateStatus()
    _ui.pbSelectLocalFolder->setText(QDir::toNativeSeparators(locFolder));
    if (dataChanged()) {
        if( _remoteFolder.isEmpty() || _remoteFolder == QLatin1String("/") ) {
-            t = tr("Your entire account will be synced to the local folder '%1'.")
-                .arg(QDir::toNativeSeparators(locFolder));
+            t = "";
        } else {
            t = tr("%1 folder '%2' is synced to local folder '%3'")
                .arg(Theme::instance()->appName()).arg(_remoteFolder)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -28,6 +28,7 @@ endif(UNIX AND NOT APPLE)
 owncloud_add_test(CSyncSqlite "")
 owncloud_add_test(NetrcParser ../src/owncloudcmd/netrcparser.cpp)
 owncloud_add_test(OwnSql ../src/mirall/ownsql.cpp)
+owncloud_add_test(SyncJournalDB ../src/mirall/syncjournaldb.cpp)



--- a/test/testsyncjournaldb.h
+++ b/test/testsyncjournaldb.h
@@ -0,0 +1,118 @@
+/*
+ *    This software is in the public domain, furnished "as is", without technical
+ *       support, and with no warranty, express or implied, as to its usefulness for
+ *          any purpose.
+ *          */
+
+#ifndef MIRALL_TESTSYNCJOURNALDB_H
+#define MIRALL_TESTSYNCJOURNALDB_H
+
+#include <QtTest>
+
+#include <sqlite3.h>
+
+#include "mirall/syncjournaldb.h"
+#include "mirall/syncjournalfilerecord.h"
+
+using namespace Mirall;
+
+namespace {
+
+const char testdbC[] = "/tmp";
+}
+
+class TestSyncJournalDB : public QObject
+{
+    Q_OBJECT
+
+public:
+    TestSyncJournalDB()
+        : _db(testdbC)
+    {
+    }
+
+    QDateTime dropMsecs(QDateTime time)
+    {
+        return Utility::qDateTimeFromTime_t(Utility::qDateTimeToTime_t(time));
+    }
+
+private slots:
+
+    void initTestCase()
+    {
+    }
+
+    void cleanupTestCase()
+    {
+    }
+
+    void testFileRecord()
+    {
+        SyncJournalFileRecord record = _db.getFileRecord("nonexistant");
+        QVERIFY(!record.isValid());
+
+        record._path = "foo";
+        record._inode = 1234;
+        record._modtime = dropMsecs(QDateTime::currentDateTime());
+        record._type = 5;
+        record._etag = "789789";
+        record._fileId = "abcd";
+        record._remotePerm = "744";
+        record._mode = -17;
+        QVERIFY(_db.setFileRecord(record));
+
+        SyncJournalFileRecord storedRecord = _db.getFileRecord("foo");
+        QVERIFY(storedRecord == record);
+
+        QVERIFY(_db.deleteFileRecord("foo"));
+        record = _db.getFileRecord("foo");
+        QVERIFY(!record.isValid());
+    }
+
+    void testDownloadInfo()
+    {
+        typedef SyncJournalDb::DownloadInfo Info;
+        Info record = _db.getDownloadInfo("nonexistant");
+        QVERIFY(!record._valid);
+
+        record._errorCount = 5;
+        record._etag = "ABCDEF";
+        record._valid = true;
+        record._tmpfile = "/tmp/foo";
+        _db.setDownloadInfo("foo", record);
+
+        Info storedRecord = _db.getDownloadInfo("foo");
+        QVERIFY(storedRecord == record);
+
+        _db.setDownloadInfo("foo", Info());
+        Info wipedRecord = _db.getDownloadInfo("foo");
+        QVERIFY(!wipedRecord._valid);
+    }
+
+    void testUploadInfo()
+    {
+        typedef SyncJournalDb::UploadInfo Info;
+        Info record = _db.getUploadInfo("nonexistant");
+        QVERIFY(!record._valid);
+
+        record._errorCount = 5;
+        record._chunk = 12;
+        record._transferid = 812974891;
+        record._size = 12894789147;
+        record._modtime = dropMsecs(QDateTime::currentDateTime());
+        record._valid = true;
+        _db.setUploadInfo("foo", record);
+
+        Info storedRecord = _db.getUploadInfo("foo");
+        QVERIFY(storedRecord == record);
+
+        _db.setUploadInfo("foo", Info());
+        Info wipedRecord = _db.getUploadInfo("foo");
+        QVERIFY(!wipedRecord._valid);
+    }
+
+private:
+    SyncJournalDb _db;
+};
+
+#endif
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -386,12 +386,12 @@ Temps restant total %5</translation>
        <translation>Activitat de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
 Esteu segur que voleu executar aquesta operació?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Esborra tots els fitxers?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Esborra tots els fitxers</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Mantén els fitxers</translation>
    </message>
@@ -1044,32 +1044,27 @@ for additional privileges during the process.</source>
        <translation>Connecta...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>El compte sencer es sincronitzarà amb la carpeta local &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 carpeta &apos;%2&apos; està sincronitzat amb la carpeta local &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Avís:&lt;/strong&gt; Teniu múltiples carpetes configurades. Si continueu amb la configuració actual, la configuració de carpetes es descartarà i només es crearà una única carpeta arrel de sincronització!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Avís:&lt;/strong&gt; La carpeta local no està buida. Escolliu una resolució!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Fitxer local de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Configuració avançada d&apos;actualització</translation>
    </message>
@@ -1537,22 +1532,34 @@ No és aconsellada usar-la.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Actualment no s&apos;ha ignorat cap fitxer a causa d&apos;errors anteriors.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 fixers  són ignorats per errors previs.
-Proveu de sincronitzar-los de nou.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Carregant...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ Proveu de sincronitzar-los de nou.</translation>
        <translation>No es pot inicialitzar un periòdic de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>No es pot obrir el diari de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>No es permet perquè no teniu permisos per afegir una carpeta inferior</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No es permet l&apos;eliminació, es restaura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Fitxers locals i carpeta compartida esborrats.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>No es permet moure&apos;l, l&apos;element es restaura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>No es permet moure perquè %1 només és de lectura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>el destí</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>l&apos;origen</translation>
    </message>
@@ -2111,137 +2118,137 @@ Proveu de sincronitzar-los de nou.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Acrediteu-vos</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Desconnectat del servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Carpeta %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>No hi ha fitxers de sincronització configurats</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>No hi han carpetes sincronitzades configurades.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Cap.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Canvis recents</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Obre la carpeta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Fitxers gestionats:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Obre carpeta &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Obre %1 en el navegador</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Calculant la quota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Estat desconegut</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Arranjament...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Detalls...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Ajuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Surt %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Acredita...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Surt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Quota n/d</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1 de %2 en ús</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>No hi ha elements sincronitzats recentment</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Sincronitzant %1 de %2  (%3 pendents)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Sincronitzant %1 (%2 pendents)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Actualitzat</translation>
    </message>
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -386,12 +386,12 @@ Celkový zbývající čas %5</translation>
        <translation>Průběh synchronizace</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Nezdařilo se přečtení systémového exclude souboru</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
 Opravdu chcete provést tuto akci?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Odstranit všechny soubory?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Odstranit všechny soubory</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Ponechat soubory</translation>
    </message>
@@ -1044,32 +1044,27 @@ si může v průběhu vyžádat dodatečná práva.</translation>
        <translation>Připojit...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Celý váš účet bude synchronizován do místní složky &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 složka &apos;%2&apos; je synchronizována do místní složky &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varování:&lt;/strong&gt; Aktuálně máte nastavenu synchronizaci více složek. Pokud budete pokračovat s tímto nastavení, nastavení složek bude zapomenuto a bude vytvořena synchronizace jedné kořenové složky!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varování:&lt;/strong&gt; Místní adresář není prázdný. Zvolte další postup.&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Místní synchronizovaná složka</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Změnit pokročilé nastavení</translation>
    </message>
@@ -1537,23 +1532,37 @@ Nedoporučuje se jí používat.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Nyní nejsou v seznamu ignorovaných žádné soubory kvůli předchozím chybám.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 souborů je na seznamu ignorovaných kvůli předchozím chybovým stavům.
-Zkuste provést novou synchronizaci.
-</translation>
+        <translation><numerusform>%n soubor je ignorován kvůli předchozím chybovým hlášením.
+Zkuste ho znovu synchronizovat.</numerusform><numerusform>%n soubory jsou ignorovány kvůli předchozím chybovým hlášením.
+Zkuste je znovu synchronizovat.</numerusform><numerusform>%n souborů je ignorováno kvůli předchozím chybovým hlášením.
+Zkuste je znovu synchronizovat.</numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Vybrat co synchronizovat</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Neoznačené adresáře se nebudou sychronizovat na tento počitač.</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Načítám ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2031,64 +2040,64 @@ Zkuste provést novou synchronizaci.
        <translation>Nemohu inicializovat synchronizační žurnál.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Nelze otevřít synchronizační žurnál</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorováno podle nastavení &quot;vybrat co synchronizovat&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Odstranění není povoleno, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Přesun není povolen, položka obnovena</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>cílové umístění</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -2112,137 +2121,137 @@ Zkuste provést novou synchronizaci.
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Přihlašte se prosím</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Odpojen od serveru</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Složka %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Nejsou nastaveny žádné synchronizované složky.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Nejsou nastaveny žádné složky pro synchronizaci.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Nic.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Poslední změny</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Otevřít složku %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Spravované složky:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Otevřít složku &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Otevřít %1 v prohlížeči</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Počítám kvóty...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Neznámý stav</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Nastavení...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Podrobnosti...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Nápověda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Ukončit %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Přihlásit...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Odhlásit</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Kvóta nedostupná</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% z %2 v používání</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Žádné položky nebyly nedávno synchronizovány</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Hledám &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Synchronizuji %1 ze %2 (zbývá %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Synchronizuji %1 (zbývá %2)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Aktuální</translation>
    </message>
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -387,12 +387,12 @@ Gesamtzeit übrig %5</translation>
        <translation>Synchronisierungsaktivität</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -401,17 +401,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
 Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Alle Dateien löschen?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Lösche alle Dateien</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Dateien behalten</translation>
    </message>
@@ -1045,32 +1045,27 @@ nach zusätzlichen Privilegien während des Prozesses.</translation>
        <translation>Verbinden …</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Das gesamte Konto wird mit dem lokalen Ordner &apos;%1&apos; synchronisiert. </translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 Ordner &apos;%2&apos; wird mit dem lokalen Ordner &apos;%3&apos; synchronisiert</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warnung:&lt;/strong&gt; Sie haben zur Zeit mehrere Ordner konfiguriert. Wenn Sie mit den aktuellen Einstellungen fortfahren, werden diese Einstellungen verworfen und eine vollständige Server-Synchronisation wird erstellt!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Achtung:&lt;/strong&gt; Das lokale Verzeichnis ist nicht leer. Wähle eine entsprechende Lösung!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Lokaler Ordner für die Synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Erweiterte Einstellungen aktualisieren</translation>
    </message>
@@ -1538,22 +1533,36 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Aktuell werden keine Dateien, aufgrund vorheriger Fehler, ignoriert.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 Datei(en) werden aufgrund vorheriger Fehler ignoriert.
-Versuchen Sie diese nochmals zu synchronisieren.</translation>
+        <translation><numerusform>%n Datei wurde aufgrund eines vorherigen Fehlers ignoriert.
+Versuchen Sie diese nochmals zu synchronisieren.</numerusform><numerusform>%n Dateien werden aufgrund vorheriger Fehler ignoriert.
+Versuchen Sie diese nochmals zu synchronisieren.</numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Zu synchronisierende Elemente auswählen</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Nicht markierte Ordner werden nicht auf diesem Rechner synchronisiert</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Lade …</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2031,64 +2040,64 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
        <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Löschen nicht erlaubt, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>Das Ziel</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>Die Quelle</translation>
    </message>
@@ -2112,137 +2121,137 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Bitte melden Sie sich an</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Vom Server getrennt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Ordner %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Keine Sync-Ordner konfiguriert.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Es wurden keine Synchonisationsordner konfiguriert.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Keine.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Letzte Änderungen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Ordner %1 öffnen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Verwaltete Ordner:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Ordner &apos;%1&apos; öffnen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>%1 im Browser öffnen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Kontingent wird berechnet …</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Unbekannter Status</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Einstellungen …</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Details …</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Hilfe</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>%1 beenden</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Anmeldung …</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Abmeldung</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Kontingent unbekannt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% von %2 benutzt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Keine kürzlich synchronisierten Elemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Entdecke &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Synchronisiere %1 von %2  (%3 übrig)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Synchronisiere %1 (%2 übrig)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Aktuell</translation>
    </message>
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -198,7 +198,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="608"/>
        <source>Discovering &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Εντοπισμός &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="648"/>
@@ -374,12 +374,12 @@ Total time left %5</source>
        <location filename="../src/mirall/folder.cpp" line="480"/>
        <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
        <comment>%1 names a file.</comment>
-        <translation type="unfinished"/>
+        <translation>%1 και %2 άλλα αρχεία δεν ήταν δυνατό να συγχρονιστούν εξαιτίας σφαλμάτων. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="482"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
-        <translation type="unfinished"/>
+        <translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="490"/>
@@ -387,12 +387,12 @@ Total time left %5</source>
        <translation>Δραστηριότητα Συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -401,17 +401,17 @@ Are you sure you want to perform this operation?</source>
 Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Αφαίρεση Όλων των Αρχείων;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Αφαίρεση όλων των αρχείων</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Διατήρηση αρχείων</translation>
    </message>
@@ -1019,7 +1019,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/updater/ocupdater.cpp" line="89"/>
        <source>Update status is unknown: Did not check for new updates.</source>
-        <translation type="unfinished"/>
+        <translation>Η κατάσταση ενημέρωσης είναι άγνωστη: Δεν έγινε έλεγχος για για νέες ενημερώσεις.</translation>
    </message>
    <message>
        <location filename="../src/updater/ocupdater.cpp" line="93"/>
@@ -1045,32 +1045,27 @@ for additional privileges during the process.</source>
        <translation>Σύνδεση...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Ολόκληρος ο λογαριασμός σας θα συγχρονιστεί με τον τοπικό φάκελο &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>Ο %1 φάκελος &apos;%2&apos; είναι συγχρονισμένος με τον τοπικό φάκελο &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Προειδοποίηση:&lt;/strong&gt; Επί του παρόντος έχετε ρυθμισμένους πολλαπλούς φακέλους. Εάν συνεχίσετε με τις παρούσες ρυθμίσεις, οι ρυθμίσεις φακέλων θα απορριφθούν και ένας μοναδικός φάκελος ρίζας για συγχρονισμό θα δημιουργηθεί!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Προειδοποίηση:&lt;/strong&gt; Ο τοπικός κατάλογος αρχείων δεν είναι άδειος. Διαλέξτε μια λύση!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Τοπικός Φάκελος Συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Ενημέρωση προχωρημένων ρυθμίσεων</translation>
    </message>
@@ -1538,20 +1533,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Προς το παρόν κανένα αρχείο δεν θα αγνοηθεί λόγω προηγούμενων σφαλμάτων.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 αρχεία θα ανγοηθούν λόγω προηγούμενων σφαλμάτων.
-Προσπαθείστε να τα συγχρονίσετε ξανά.</translation>
+        <translation><numerusform>%n αρχείο αγνοήθηκε λόγω προηγούμενων σφαλμάτων.
+Προσπαθείστε να τα συγχρονίσετε ξανά.</numerusform><numerusform>%n αρχεία αγνοήθηκαν λόγω προηγούμενων σφαλμάτων.
+Προσπαθείστε να τα συγχρονίσετε ξανά.</numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Επιλέξτε Τι θα Συγχρονιστεί</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
-        <translation type="unfinished"/>
+        <translation>Οι μη επιλεγμένοι φάκελοι δε θα συγχρονιστούν σε αυτόν τον υπολογιστή</translation>
+    </message>
+</context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Φόρτωση ...</translation>
    </message>
 </context>
 <context>
@@ -2013,7 +2022,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/syncengine.cpp" line="360"/>
        <source>Hard links are not supported in syncing.</source>
-        <translation type="unfinished"/>
+        <translation>Οι συνδέσεις υλικού δεν υποστηρίζονται για συγχρονισμό.</translation>
    </message>
    <message>
        <location filename="../src/mirall/syncengine.cpp" line="363"/>
@@ -2031,64 +2040,64 @@ It is not advisable to use it.</source>
        <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
-        <translation type="unfinished"/>
+        <translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας &quot;διάλεξε τι να συγχρονιστεί&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
-        <translation type="unfinished"/>
+        <translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>ο προορισμός</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>η προέλευση</translation>
    </message>
@@ -2112,137 +2121,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Παρκαλώ συνδεθείτε</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Αποσύνδεση από το διακομιστή</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Φάκελος %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Δεν έχουν ρυθμιστεί φάκελοι συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Κανένας.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Πρόσφατες Αλλαγές</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Άνοιγμα %1 φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Φάκελοι υπό Διαχείριση:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Άνοιγμα φακέλου &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Άνοιγμα %1 στον περιηγητή</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Υπολογισμός μεριδίου χώρου αποθήκευσης...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Άγνωστη κατάσταση</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Ρυθμίσεις...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Λεπτομέρειες...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Βοήθεια</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Κλείσιμο %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Σύνδεση...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Αποσύνδεση</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Μερίδιο χώρου αποθήκευσης μ/δ</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% από %2 σε χρήση</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Εντοπισμός &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Συγχρονισμός %1 από %2 (%3 απομένουν)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Συγχρονισμός %1 (%2 απομένουν)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Ενημερωμένο</translation>
    </message>
@@ -2252,7 +2261,7 @@ It is not advisable to use it.</source>
    <message utf8="true">
        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;br/&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Έκδοση %2. Για περισσότερες πληροφορίες επισκεφθείτε &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Των Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz και άλλων.&lt;br/&gt;Βασισμένο στο Mirall του Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Πνευματικά δικαιώματα ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Αδειοδότηση υπό την GNU General Public License (GPL) Η Έκδοση 2.0&lt;br/&gt;του ownCloud και το λογότυπο ownCloud είναι σήματα κατατεθέντα της ownCloud, Inc. στις Η.Π.Α., σε άλλες χώρες ή όλες&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -387,29 +387,29 @@ Total time left %5</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder &apos;%1&apos;.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1040,32 +1040,27 @@ for additional privileges during the process.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1532,21 +1527,37 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2022,64 +2033,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2103,137 +2114,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -386,12 +386,12 @@ Tiempo restante %5</translation>
        <translation>Actividad en la Sincronización</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>No se pudo leer el archivo de exclusión del sistema</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
 Está seguro de que desea realizar esta operación?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Eliminar todos los archivos?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Eliminar todos los archivos</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Conservar archivos</translation>
    </message>
@@ -1044,32 +1044,27 @@ pida privilegios adicionales durante el proceso.</translation>
        <translation>Conectar...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Su cuenta completa será sincronizada a la carpeta local &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>La carpeta %1 &apos;%2&apos; está sincronizada con la carpeta local &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Advertencia:&lt;/strong&gt;Tiene actualmente múltiples carpetas configuradas. Si continua con los ajustes actuales, la carpeta de configuración se descartará y se creará una única carpeta principal!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Advertencia:&lt;/strong&gt;El directorio local no está vacío. ¡Seleccione otra!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Carpeta local de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Actualizar configuración avanzada</translation>
    </message>
@@ -1537,22 +1532,36 @@ No se recomienda usarlo.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Actualmente no hay ficheros ignorados por errores previos.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>1% de los archivos fueron ignorados debido a errores previos.
-Intente sincronizar los archivos nuevamente.</translation>
+        <translation><numerusform>%n archivo ha sido ignorado por causa de errores previos.
+ Intente volver a sincronizarlo.</numerusform><numerusform>%n archivos han sido ignorados por causa de errores previos.
+ Intente volver a sincronizarlos.</numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Escoja qué sincronizar</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Las carpetas sin marcar no seran sincronizadas con esta compuradora</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Cargando...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2039,64 @@ Intente sincronizar los archivos nuevamente.</translation>
        <translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>No es posible abrir el diario de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por que se encuentra en la lista negra de &quot;elige que vas a sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>No está permitido porque no tiene permisos para añadir un directorio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>No está permitido, porque no tiene permisos para crear archivos en este directorio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No está permitido borrar, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Se eliminaron los archivos locales y la carpeta compartida.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>No está permitido mover, elemento restaurado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>No está permitido mover, porque %1 es solo lectura.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>destino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>origen</translation>
    </message>
@@ -2111,137 +2120,137 @@ Intente sincronizar los archivos nuevamente.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Por favor Registrese</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Desconectado del servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Archivo %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>No hay carpetas de sincronización configuradas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>No hay carpetas configuradas para sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Ninguno.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Cambios recientes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Abrir carpeta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Carpetas administradas:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Abrir carpeta &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Abrir %1 en el navegador</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Calculando cuota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Estado desconocido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Configuraciones...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Detalles...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Ayuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Salir de %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Registrarse...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Cerrar sesión</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Cuota no disponible</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% de %2 en uso</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>No se han sincronizado elementos recientemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Descubriendo &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Sincronizando %1 de %2  (quedan %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Sincronizando %1 (quedan %2)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Actualizado</translation>
    </message>
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -385,12 +385,12 @@ Total time left %5</source>
        <translation>Actividad de Sync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -399,17 +399,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
 ¿Estás seguro de que querés realizar esta operación?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>¿Borrar todos los archivos?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Borrar todos los archivos</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Conservar archivos</translation>
    </message>
@@ -1042,32 +1042,27 @@ for additional privileges during the process.</source>
        <translation>Conectar...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Tu cuenta completa va a ser sincronizada en el directorio local &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>El directorio %1 &apos;%2&apos; está sincronizado con el directorio local &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Advertencia:&lt;/strong&gt;Actualmente tenés múltiples directorios configurados. ¡Si seguís con la configuración actual, el directorio de configuración será descartado y se creará un único directorio raíz!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Advertencia:&lt;/strong&gt;El directorio local no está vacío. ¡Seleccioná otro!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Directorio local de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Actualizar configuración avanzada</translation>
    </message>
@@ -1534,22 +1529,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Actualmente ningún archivo es ignorado por errores previos.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 archivos fueron ignorados por errores previos.
-Intente sincronizar estos nuevamente.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Cargando...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2025,64 +2032,64 @@ Intente sincronizar estos nuevamente.</translation>
        <translation>Imposible inicializar un diario de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -2106,137 +2113,137 @@ Intente sincronizar estos nuevamente.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Por favor, inicie sesión</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Directorio %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Los directorios de sincronización no están configurados.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Ninguno.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Cambios recientes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Abrir directorio %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Directorios administrados:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Abrir carpeta &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Abrir %1 en el navegador...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Calculando cuota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Estado desconocido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Configuraciones...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Detalles...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Ayuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Cancelar %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Iniciando sesión...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Salir</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Cuota no disponible</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% de %2 en uso</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>No se sincronizaron elementos recientemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>actualizado</translation>
    </message>
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -386,12 +386,12 @@ Aega kokku jäänud %5</translation>
        <translation>Sünkroniseerimise tegevus</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
 Oled kindel, et soovid seda operatsiooni teostada?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Kustutada kõik failid?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Kustutada kõik failid</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Säilita failid</translation>
    </message>
@@ -1044,32 +1044,27 @@ täiendavaid õigusi protsessi käigus.</translation>
        <translation>Ühenda...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Kogu su konto sünkroniseeritakse kohalikku kataloogi &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 kataloog &apos;%2&apos; on sünkroniseeritud kohalikku kataloogi &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Hoiatus:&lt;/strong&gt;Sul on seadistatud mitu kataloogi. Kui sa jätkad olemasoleva seadistusega, siis kataloogide seadistus hüljatakse ning selle asemel luuakse üks peakataloogi sünkroniseering!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Hoiatus:&lt;/strong&gt; Kohalik kataloog ei ole tühi. Vali lahendus!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Kohalik Sync Kataloog</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Uuenda täpsemat seadistust</translation>
    </message>
@@ -1537,22 +1532,34 @@ Selle kasutamine pole soovitatav.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Hetkel ei ignoreerita ühtegi faili eelnenud vigade tõttu.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 faili on ignoreeritud eelnenud vigade tõttu.
-Proovi neid uuesti sünkroniseerida.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Vali, mida sünkroniseerida</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Valimata kaustasid selle arvutiga ei sünkroniseerita.</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Laadimine ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ Proovi neid uuesti sünkroniseerida.</translation>
        <translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;Vali, mida sünkroniseerida&quot; musta nimekirja tõttu vahele jäetud</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Eemaldamine pole lubatud, taastan</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Liigutamine pole lubatud, üksus taastatud</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>sihtkoht</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>allikas</translation>
    </message>
@@ -2111,137 +2118,137 @@ Proovi neid uuesti sünkroniseerida.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Palun logi sisse</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Serverist lahtiühendatud</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Kaust %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Sünkroniseeritavaid kaustasid pole määratud.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Pole.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Hiljutised muudatused</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Ava kaust %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Hallatavad kaustad:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Ava kaust &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Ava %1 veebilehitsejas</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Mahupiiri arvutamine...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Tundmatu staatus</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Seaded...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Üksikasjad...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Abiinfo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Lõpeta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Logi sisse...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Logi välja</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Mahupiir n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>Kasutusel %1% / %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>&apos;%1&apos; avastamine</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Sünkroniseerin %1 %2-st (%3 veel)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Sünkroniseerin %1 (%2 veel)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Ajakohane</translation>
    </message>
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -386,12 +386,12 @@ Geratzen den denbora %5</translation>
        <translation>Sinkronizazio Jarduerak</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Izan daiteke karpeta isilpean birkonfiguratu delako edo fitxategi guztiak eskuz
 Ziur zaude eragiketa hau egin nahi duzula?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Ezabatu Fitxategi Guztiak?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Ezabatu fitxategi guztiak</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Mantendu fitxategiak</translation>
    </message>
@@ -1044,32 +1044,27 @@ for additional privileges during the process.</source>
        <translation>Konektatu...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Zure kontu osoa &apos;%1&apos; karpeta lokalera sinkronizatuko da.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Sinkronizazio karpeta lokala</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Eguneratu ezarpen aurreratuak</translation>
    </message>
@@ -1537,22 +1532,34 @@ Ez da gomendagarria erabltzea.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Oraintxe ez da fitxategirik baztertzen aurreko erroreak direla eta.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 fitxategi baztertu dira aurreko erroreak direla eta.
-Saiatu horiek berriz sinkronizatzen.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Kargatzen...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2028,64 +2035,64 @@ Saiatu horiek berriz sinkronizatzen.</translation>
        <translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -2109,137 +2116,137 @@ Saiatu horiek berriz sinkronizatzen.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Mesedez saioa hasi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Ez dago sinkronizazio karpetarik definituta.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Bat ere ez.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Azkenengo Aldaketak</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Ireki %1 karpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Kudeatutako karpetak:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Ireki &apos;%1&apos; karpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Ireki %1 arakatzailean</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Egoera ezezaguna</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Ezarpenak...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Xehetasunak...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Laguntza</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>%1etik Irten</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Saioa hasi...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Saioa bukatu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%2tik %%1 erabilita</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Ez da azken aldian ezer sinkronizatu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Eguneratua</translation>
    </message>
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -385,29 +385,29 @@ Total time left %5</source>
        <translation>فعالیت همگام سازی</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>نگه داشتن فایل ها</translation>
    </message>
@@ -1038,32 +1038,27 @@ for additional privileges during the process.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation type="unfinished"/>
    </message>
@@ -1530,21 +1525,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation type="unfinished"/>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>درحال بارگذاری...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2020,64 +2028,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -2101,137 +2109,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>پوشه  %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>هیچ پوشه ای همگام سازی شده‌ای تنظیم نشده است</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>بازکردن %1 پوشه</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>پوشه های مدیریت شده:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>راه‌نما</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>تا تاریخ</translation>
    </message>
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -386,29 +386,29 @@ Aikaa jäljellä yhteensä %5</translation>
        <translation>Synkronointiaktiviteetti</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Poistetaanko kaikki tiedostot?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Poista kaikki tiedostot</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Säilytä tiedostot</translation>
    </message>
@@ -1040,32 +1040,27 @@ saattaa kysyä lisäoikeuksia toimenpiteen aikana.</translation>
        <translation>Yhdistä...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Koko tilisi synkronoidaan paikalliseen kansioon &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1-kansio &apos;%2&apos; on synkronoitu paikalliseen kansioon &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varoitus:&lt;/strong&gt; Paikallinen kansio ei ole tyhjä. Valitse ratkaisu!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Paikallinen synkronointikansio</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation type="unfinished"/>
    </message>
@@ -1533,21 +1528,34 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation type="unfinished"/>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Valitse synkronoitavat tiedot</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Ladataan...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2025,64 +2033,64 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Poistaminen ei ole sallittua, palautetaan</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Siirto ei ole sallittu, koska %1 on &quot;vain luku&quot;-tilassa</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>kohde</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>lähde</translation>
    </message>
@@ -2106,137 +2114,137 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Kirjaudu sisään</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Yhteys palvelimeen katkaistu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Kansio %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Synkronointikansioita ei ole määritetty.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Synkronointikansioita ei ole määritelty.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Viimeisimmät muutokset</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Avaa %1-kansio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Hallitut kansiot:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Avaa kansio &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Avaa %1 selaimeen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Lasketaan kiintiötä...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Tuntematon tila</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Asetukset...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Tiedot...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Ohje</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Lopeta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Kirjaudu sisään...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Kirjaudu ulos</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1%/%2 käytössä</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Kohteita ei ole synkronoitu äskettäin</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Synkronoidaan %1/%2  (%3 jäljellä)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Synkronoidaan %1 (%2 jäljellä)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Ajan tasalla</translation>
    </message>
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -386,12 +386,12 @@ Temps restant total %5</translation>
        <translation>Activité de synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Impossible de lire le fichier d&apos;exclusion du système</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
 Voulez-vous réellement effectuer cette opération ?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Supprimer tous les fichiers ?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Supprimer tous les fichiers</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Garder les fichiers</translation>
    </message>
@@ -1044,32 +1044,27 @@ peut demander des privilèges additionnels durant le processus.</translation>
        <translation>Connexion…</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Votre compte sera entièrement synchronisé vers le dossier local &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 le dossier &apos;%2&apos; est synchronisé vers le dossier local &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Attention :&lt;/strong&gt; Vous avez de multiples dossiers configurés. Si vous continuez avec les paramètres courants, les configurations du dossier seront perdues et seule la racine des dossiers synchronisés sera créée !&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Attention :&lt;/strong&gt; Le dossier local n&apos;est pas vide. Résolvez d&apos;abord ce point !&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Dossier de synchronisation local</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Mise à jour de la configuration avancée</translation>
    </message>
@@ -1537,22 +1532,34 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Actuellement aucun fichier n&apos;a été ignoré en raison d&apos;erreurs précédentes.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 fichiers ont été ignorés en raison des erreurs précédentes.
- Essayez à nouveau de les synchroniser.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Choisir le contenu à synchroniser</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Les dossiers non sélectionnés ne seront pas synchronisés sur cet ordinateur</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Chargement…</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Impossible d&apos;initialiser un journal de synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossible d&apos;ouvrir le journal de synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignoré à cause de la liste noire du contenu à synchroniser.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des sous-dossiers dans ce dossier</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des dossiers parents</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des fichiers dans ce dossier</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non autorisé à supprimer. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Fichiers locaux et répertoire de partage supprimés.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Déplacement non autorisé, élément restauré</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>la destination</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>la source</translation>
    </message>
@@ -2111,137 +2118,137 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Veuillez vous connecter</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Déconnecté du serveur</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Dossier %1 : %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Aucun répertoire synchronisé n&apos;est configuré.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Aucun répertoire à synchroniser n&apos;est configuré.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Aucun.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Modifications récentes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Ouvrir le répertoire %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Répertoires suivis :</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Ouvrir le dossier &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Ouvrir %1 dans le navigateur</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Calcul du quota en cours...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Statut inconnu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Paramètres...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Détails...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Aide</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Quitter %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Se connecter...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Se déconnecter</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Quota n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% sur %2 utilisés</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Aucun item synchronisé récemment</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Découverte de &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Synchronisation %1 de %2 (%3 restant)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Synchronisation %1 (%2 restant)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>À jour</translation>
    </message>
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -386,12 +386,12 @@ Tempo total restante %5</translation>
        <translation>Actividade de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
 Confirma que quere realizar esta operación?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Retirar todos os ficheiros?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Retirar todos os ficheiros</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Manter os ficheiros</translation>
    </message>
@@ -1044,32 +1044,27 @@ actualización pode pedir privilexios adicionais durante o proceso.</translation
        <translation>Conectar...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Toda a súa conta vai seren sincronizada co cartafol local «%1».</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>O cartafol %1 «%2» está sincronizado co cartafol local «%3»</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Aviso:&lt;/strong&gt;  Actualmente ten varios cartafoles configurados. Se continúa cos axustes actuais, desbotaranse as configuracións dos cartafoles e crearase un único cartafol raíz de sincronización!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Aviso:&lt;/strong&gt; O directorio local non está baleiro. Escolla unha resolución!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Sincronización do cartafol local</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Actualizar a configuración avanzada</translation>
    </message>
@@ -1537,22 +1532,34 @@ Recomendámoslle que non o use.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Actualmente non hai ficheiros ignorados por mor de erros anteriores.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 ficheiros foron ignorados por mor de erros anteriores.
-Tente sincronizalos de novo.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Cargando ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ Tente sincronizalos de novo.</translation>
        <translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Non foi posíbel abrir o rexistro de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Non está permitido xa que non ten permiso para engadir un directorio pai</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Non está permitido xa que non ten permiso para engadir ficheiros nese directorio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non está permitido retiralo, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Nos está permitido movelo, elemento restaurado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>a orixe</translation>
    </message>
@@ -2111,137 +2118,137 @@ Tente sincronizalos de novo.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Ten que rexistrarse</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Desconectado do servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Cartafol %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Non se configuraron cartafoles de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Nada.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Cambios recentes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Abrir o cartafol %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Cartafoles xestionados:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Abrir o cartafol «%1»</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Abrir %1 nun navegador</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Calculando a cota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Estado descoñecido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Axustes...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Detalles...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Axuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Saír de %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Rexistrarse...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Saír</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Cota n/d</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>Usado %1% de %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Non hai elementos sincronizados recentemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Sincronizando %1 of %2  (restan %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Sincronizando %1 (restan %2)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Actualizado</translation>
    </message>
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -385,29 +385,29 @@ Total time left %5</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>El legyen távolítva az összes fájl?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Összes fájl eltávolítása</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Fájlok megtartása</translation>
    </message>
@@ -1038,32 +1038,27 @@ for additional privileges during the process.</source>
        <translation>Kapcsolódás...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation type="unfinished"/>
    </message>
@@ -1530,21 +1525,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation type="unfinished"/>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Betöltés ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2020,64 +2028,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -2101,137 +2109,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Belépés szükséges</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Mappa %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Nincsenek megadva szinkronizálandó mappák.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Nincs</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Legutóbbi változások</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>%1 mappa megnyitása</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Kezelt mappák:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Kvóta kiszámítása...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Ismeretlen állapot</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Beállítások...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Részletek...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Súgó</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Belépés...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Kilépés</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Kvóta n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Frissítve</translation>
    </message>
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -386,12 +386,12 @@ Totale tempo rimanente %5</translation>
        <translation>Sincronizza attività</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Impossibile leggere il file di esclusione di sistema</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
 Sei sicuro di voler eseguire questa operazione?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Vuoi rimuovere tutti i file?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Rimuovi tutti i file</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Mantieni i file</translation>
    </message>
@@ -1043,32 +1043,27 @@ for additional privileges during the process.</source>
        <translation>Connetti...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>L&apos;intero account sarà sincronizzato con la cartella locale &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>La cartella &apos;%2&apos; di %1 è sincronizzata con la cartella locale &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Avviso:&lt;/strong&gt; attualmente hai configurato più cartelle. Se procedi con le impostazioni attuali, le configurazioni delle cartelle saranno scartate, mentre sarà creata un&apos;unica cartella radice di sincronizzazione.&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Avviso:&lt;/strong&gt; la cartella locale non è vuota. Scegli una soluzione.&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Cartella locale di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Aggiorna la configurazione avanzata</translation>
    </message>
@@ -1536,22 +1531,34 @@ Non è consigliabile utilizzarlo.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Attualmente nessun file è ignorato a causa di errori precedenti.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 file sono ignorati a causa di errori precedenti.
-Prova a sincronizzare nuovamente.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Scegli cosa sincronizzare</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Le caselle non marcate non saranno sincronizzate con questo computer</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Caricamento in corso...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2029,64 +2036,64 @@ Prova a sincronizzare nuovamente.</translation>
        <translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossibile aprire il registro di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Rimozione non consentita, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>I file locali e la cartella condivisa sono stati rimossi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Spostamento non consentito, elemento ripristinato</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>la destinazione</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>l&apos;origine</translation>
    </message>
@@ -2110,137 +2117,137 @@ Prova a sincronizzare nuovamente.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Accedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Disconnesso dal server</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Cartella %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Nessuna cartella configurata per la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Nessuna.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Modifiche recenti</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Apri la cartella %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Cartelle gestite:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Apri la cartella &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Apri %1 nel browser...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Calcolo quota in corso...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Stato sconosciuto</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Impostazioni...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Dettagli...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Aiuto</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Esci da %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Accedi...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Esci</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Quota n/d</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% di %2 utilizzati</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Nessun elemento sincronizzato di recente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Rilevamento &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Sincronizzazione di %1 di %2  (%3 rimanenti)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Sincronizzazione di %1 (%2 rimanenti)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Aggiornato</translation>
    </message>
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -386,12 +386,12 @@ Total time left %5</source>
        <translation>同期アクティビティ</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>システム上の除外ファイルを読み込めません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Are you sure you want to perform this operation?</source>
 本当にこの操作を実行しますか？</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>すべてのファイルを削除しますか？</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>すべてのファイルを削除</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>ファイルを残す</translation>
    </message>
@@ -1043,32 +1043,27 @@ for additional privileges during the process.</source>
        <translation>接続...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>すべてのアカウントはローカルフォルダー &apos;%1&apos; と同期されます。</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 フォルダー &apos;%2&apos; はローカルフォルダー &apos;%3&apos; と同期しています</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;警告:&lt;/strong&gt; 現在、複数のフォルダーを設定しています。現在の設定で続けた場合、フォルダー設定は無視され、単一のルートフォルダーの同期が生成されます！&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;警告:&lt;/strong&gt; ローカルディレクトリは空ではありません。拡張設定で解決方法を選択してください！&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>ローカル同期フォルダー</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>高度なセットアップを更新</translation>
    </message>
@@ -1535,22 +1530,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>処理前にエラーが発生したため、ファイルは何も除外されていません。</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>処理前にエラーが発生したため、%1 個のファイルが除外されました。
-これらの同期をもう一度実行してください。</translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>同期フォルダーを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>チェックを外したフォルダは、このパソコンへの同期対象外になります。</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>読込中 ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2028,64 +2035,64 @@ It is not advisable to use it.</source>
        <translation>同期ジャーナルの初期化ができません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>同期ジャーナルを開くことができません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;同期対象先&quot; ブラックリストにより無視されました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>そのディレクトリにサブディレクトリを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>親ディレクトリを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>そのディレクトリにファイルを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>削除できません、復元しています</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>ローカルファイルと共有フォルダが削除されました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>移動できません、項目を復元しました</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>%1 は読み取り専用のため移動できません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>移動先</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>移動元</translation>
    </message>
@@ -2109,137 +2116,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>サインインしてください</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>サーバーから切断しました</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>フォルダー %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>同期フォルダーが設定されていません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>同期するフォルダーがありません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>なし</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>最近変更されたファイル</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>%1 フォルダーを開く</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>管理フォルダー:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>フォルダー ’%1’ を開く</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>%1をブラウザーで開く</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>クォータを計算中...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>不明な状態</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>設定</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>詳細...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>ヘルプ</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>%1 を終了</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>サインイン...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>サインアウト</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>クォータ n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%2 のうち %1% を使用中</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>最近同期されたアイテムはありません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>同期中 %2 中 %1 (残り %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>同期中 %1 (残り %2)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>最新です</translation>
    </message>
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -386,12 +386,12 @@ Totaal resterende tijd %5</translation>
        <translation>Synchronisatie-activiteit</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Dit kan komen doordat de map ongemerkt opnieuw geconfigureerd is of doordat alle
 Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Verwijder alle bestanden?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Verwijder alle bestanden</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Bewaar bestanden</translation>
    </message>
@@ -1044,32 +1044,27 @@ vragen om extra autorisaties tijdens installatie.</translation>
        <translation>Verbinden...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Uw volledige account zal worden gesynchroniseerd met de lokale map &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 map &apos;%2&apos; is gesynchroniseerd naar de lokale map &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Waarschuwing:&lt;/strong&gt; U heeft momenteel meerdere mappen geconfigureerd. Als u doorgaat met de huidige instellingen, zullen de map-configuraties ongedaan worden gemaakt en zal een enkele rootmap worden gemaakt!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Waarschuwing:&lt;/strong&gt; De lokale map is niet leeg. Maak een keuze!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Lokale synchronisatiemap</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Update geavanceerde setup</translation>
    </message>
@@ -1537,22 +1532,36 @@ We adviseren deze site niet te gebruiken.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Er zijn nu geen bestanden genegeerd vanwege eerdere fouten.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 bestanden zijn genegeerd vanwege eerdere fouten.
-Probeer opnieuw te synchroniseren.</translation>
+        <translation><numerusform>%1 bestand genegeerd vanwege eerdere fouten.
+Probeer opnieuw te synchroniseren.</numerusform><numerusform>%1 bestanden zijn genegeerd vanwege eerdere fouten.
+Probeer opnieuw te synchroniseren.</numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Kies wat moet worden gesynchroniseerd</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Niet geselecteerde mappen worden niet gesynched naar deze computer</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Laden ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2039,64 @@ Probeer opnieuw te synchroniseren.</translation>
        <translation>Niet in staat om een synchornisatie journaal te starten.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan het sync journal niet openen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Genegeerd vanwege de &quot;kies wat te synchen&quot; zwarte lijst</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Niet toegestaan te verwijderen, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale bestanden en share-map verwijderd. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Verplaatsen niet toegestaan, object hersteld</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verplaatsen niet toegestaan omdat %1 alleen-lezen is</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>bestemming</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>bron</translation>
    </message>
@@ -2111,137 +2120,137 @@ Probeer opnieuw te synchroniseren.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Log alstublieft in</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Verbinding met server verbroken</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Map %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Geen synchronisatie-mappen geconfigureerd.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Er zijn geen sync mappen geconfigureerd.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Geen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Recente wijzigingen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Open %1 map</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Beheerde mappen:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Open map &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Open %1 in browser</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Quota worden berekend ...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Onbekende status</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Instellingen...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Details ...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Help</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>%1 afsluiten</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Inloggen...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Uitloggen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Quota niet beschikbaar</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% van %2 gebruikt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Recent niets gesynchroniseerd</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>&apos;%1&apos; onderzoeken</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Sync %1 van %2  (%3 over)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Sync %1 (%2 over)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Bijgewerkt</translation>
    </message>
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -386,12 +386,12 @@ Pozostało czasu %5</translation>
        <translation>Aktywności synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Nie można przeczytać pliku wyłączeń</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
 Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Usunąć wszystkie pliki?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Usuń wszystkie pliki</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Pozostaw pliki</translation>
    </message>
@@ -1044,32 +1044,27 @@ poprosić o dodatkowe uprawnienia podczas tego procesu.</translation>
        <translation>Połącz...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Twoje całe konto zostanie zsynchronizowane z twoim lokalnym katalogiem &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 katalog &apos;%2&apos; jest zsynchronizowany do katalogu lokalnego &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Uwaga:&lt;/strong&gt; Masz obecnie skonfigurowane wielokrotne katalogi . Jeśli będziesz kontynuować z obecnymi ustawieniami, konfiguracje katalogów będą odrzucone i pojedyncza synchronizacja głównego katalogu będzie utworzona!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Uwaga:&lt;/strong&gt; Lokalny katalog nie jest pusty. Wybierz rozważnie!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Folder lokalnej synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Zaktualizuj zaawansowane ustawienia</translation>
    </message>
@@ -1537,22 +1532,34 @@ Niezalecane jest jego użycie.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Obecnie nie ma plików, które są ignorowane z powodu wcześniejszych błędów.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 pliki są ignorowane z powodu błędów.
- Spróbuj zsynchronizować ponownie.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Wybierz co synchronizować</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Wczytuję ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ Niezalecane jest jego użycie.</translation>
        <translation>Nie można zainicjować synchronizacji dziennika.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Nie można otworzyć dziennika synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Nie masz uprawnień do dodawania podkatalogów w tym katalogu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Nie masz uprawnień by dodać katalog nadrzędny</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Nie masz uprawnień by dodać pliki w tym katalogu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Brak uprawnień by usunąć, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>docelowy</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>źródło</translation>
    </message>
@@ -2111,137 +2118,137 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Proszę się zalogować</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Rozłączono z serwerem</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Folder %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Nie skonfigurowano synchronizowanych folderów.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Nie skonfigurowano żadnych folderów synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Brak.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Ostatnie zmiany</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Otwórz folder %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Zarządzane foldery:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Otwórz katalog &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Otwórz %1 w przeglądarce</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Obliczam quote...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Nieznany status</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Ustawienia...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Szczegóły...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Pomoc</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Wyjdź %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Loguję...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Wyloguj</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Quota n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% z %2 w użyciu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Brak ostatnich synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Synchronizacja %1 z %2 (%3 pozostało)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Synchronizuję %1 (%2 pozostało)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Aktualne</translation>
    </message>
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -386,12 +386,12 @@ Total time left %5</source>
        <translation>Actividade de sincronicação</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Não foi possível ler o ficheiro system exclude</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -399,17 +399,17 @@ Are you sure you want to perform this operation?</source>
 Se você, ou o seu administrador, reiniciou  a sua conta no servidor, escolha &quot;Manter os ficheiros&quot;. Se quer apagar os seus dados, escolha &quot;Remover todos os ficheiros&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Remover todos os ficheiros?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Remover todos os ficheiros</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Manter os ficheiros</translation>
    </message>
@@ -1042,32 +1042,27 @@ for additional privileges during the process.</source>
        <translation>Ligar...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>A sua conta vai ser sincronizada para a pasta local &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 pasta &apos;%2&apos; sincronizada para pasta &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Aviso:&lt;/strong&gt; Tem várias pastas configuradas. Se prosseguir com as definições actuais, a configuração das pastas será rejeotada e será criada uma pasta raiz de sincronização!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Aviso:&lt;/strong&gt; A pasta local não está vazia. Faça a sua escolha!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Pasta local de sincronização</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Actualize definições avançadas</translation>
    </message>
@@ -1534,22 +1529,36 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Devido a erros anteriores, nenhum ficheiro é ignorado.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 ficheiros ignorados devido a erros anteriore. 
-Por favor tente sincronizar novamente.</translation>
+        <translation><numerusform>%n ficheiros são ignorados devido a erros anteriores.
+Tente sincronizá-los novamente.</numerusform><numerusform>%n ficheiros são ignorados devido a erros anteriores.
+Tente sincronizá-los novamente.</numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Escolher o que sincronizar</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Pastas não seleccionadas não irão sincronizar com este computador</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>A carregar...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2028,64 +2037,64 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
        <translation>Impossível inicializar sincronização &apos;journal&apos;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossível abrir o jornal de sincronismo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado devido à blacklist de escolha para sincronização</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Não permitido, porque não tem permissão para adicionar sub-directórios ao directório</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Não permitido, porque não tem permissão para adicionar o directório principal</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Não permitido, porque não tem permissão para adicionar ficheiros no directório</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Não autorizado para remoção, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Ficheiros locais e pasta partilhada removidos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Mover não foi permitido, item restaurado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Mover não foi autorizado porque %1 é só de leitura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>a origem</translation>
    </message>
@@ -2109,137 +2118,137 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Por favor inicie a sessão</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Desligar do servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Pasta %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Nenhuma pasta de sincronização configurada.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Não há pastas de sincronização configurado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Nada.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Alterações recentes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Abrir a pasta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Pastas Geridas:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Abrir pasta &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Abrir %1 no browser</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>A calcular quota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Estado desconhecido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Configurações...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Detalhes...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Ajuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Sair do %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Entrar...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Sair</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Quota não disponível</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% de %2 utilizado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Sem itens sincronizados recentemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Descobrindo &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Sincronizar %1 de %2 (%3 faltando)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Sincronizando %1 (%2 faltando)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Actualizado</translation>
    </message>
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -386,12 +386,12 @@ Total de tempo que falta 5%</translation>
        <translation>Atividade de Sincronização</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
 Você tem certeza que quer executar esta operação?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Deseja Remover Todos os Arquivos?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Remover todos os arquivos</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Manter arquivos</translation>
    </message>
@@ -1043,32 +1043,27 @@ for additional privileges during the process.</source>
        <translation>Conectar...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Toda a sua conta será sincronizado com a pasta local &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 Pasta &apos;% 2&apos; está sincronizada com pasta local &apos;% 3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt; Atenção: &lt;/strong&gt; Você está atualmente com várias pastas configuradas. Se você continuar com as configurações atuais, as configurações de pasta serão descartadas e uma única sincronizaçãoda  pasta raiz será criada! &lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Atenção:&lt;/strong&gt; O diretório local não está vazio. Escolha a resolução!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Sincronizar Pasta Local</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Atualizar configuração avançada</translation>
    </message>
@@ -1535,22 +1530,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Correntemente nenhum arquivo será ignorado por causa de erros prévios.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 arquivos são ignorados por causa de erros prévios.
-Tente sincronizar novamente.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Escolher o que Sincronizar</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Pastas não selecionadas não serão sincronizada com este computador</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Carregando...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2028,64 +2035,64 @@ Tente sincronizar novamente.</translation>
        <translation>Impossibilitado de iniciar a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Não é possível abrir o arquivo de sincronização</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por causa da lista negra &quot;escolher o que sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Não permitido porque você não tem permissão de criar sub-pastas nesta pasta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Não permitido porque você não tem permissão de criar pastas mãe</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Não permitido porque você não tem permissão de adicionar arquivos a esta pasta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Não é permitido remover, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Arquivos locais e pasta compartilhada removida.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Não é permitido mover, item restaurado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Não é permitido mover porque %1 é somente para leitura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>a fonte</translation>
    </message>
@@ -2109,137 +2116,137 @@ Tente sincronizar novamente.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Favor conectar</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Desconectado do servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Pasta %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Pastas de sincronização não configuradas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Não há pastas de sincronização configuradas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Nenhum.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Alterações Recentes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Abrir pasta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Pastas Gerenciadas:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Abrir pasta &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Abrir %1 no navegador</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Calculando cota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Status desconhecido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Configurações...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Detalhes...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Ajuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Sair %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Conectar em...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Sair</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Cota n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% de %2 em uso</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Não há itens sincronizados recentemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Descobrir &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Sincronizar %1 de %2 (%3 faltando)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Sincronizando %1 (%2 faltando)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Até a data</translation>
    </message>
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -386,12 +386,12 @@ Total time left %5</source>
        <translation>Журнал синхронизации</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Невозможно прочесть исключенный системный файл</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Are you sure you want to perform this operation?</source>
 Вы уверены, что хотите выполнить операцию?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Удалить все файлы?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Удалить все файлы</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Сохранить файлы</translation>
    </message>
@@ -1044,32 +1044,27 @@ for additional privileges during the process.</source>
        <translation>Соединение...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Вся ваша учётная запись будет синхронизирована с локальной папкой &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 папка &apos;%2&apos; синхронизирована с локальной папкой &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Внимание:&lt;/strong&gt; У вас настроено несколько папок. Если вы продолжите с текущими настройками, настройки папок будут отменены и будет создана одна корневая папка!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Внимание:&lt;/strong&gt; Локальная папка не пуста. Выберите разрешение&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Локальная папка для синхронизации</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Обновить дополнительные настройки</translation>
    </message>
@@ -1537,22 +1532,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>На данный момент файлы, игнорируемые из-за ошибок, отсутствуют.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 файлов проигнорировано из-за ошибок.
-Повторить попытку синхронизации.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Выберите то, что хотите Синхронизировать</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Не отмеченные папки не будут синхронизированы с этим компьютером</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Загружается...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ It is not advisable to use it.</source>
        <translation>Не удалось инициализировать журнал синхронизации.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Не удаётся открыть журнал синхронизации</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Игнорируется из-за черного списка в &quot;выбрать что синхронизировать&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Недопустимо из-за отсутствия у вас разрешений на добавление подпапок в этой папке</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Недопустимо из-за отсутствия у вас разрешений на добавление родительской папки</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Недопустимо из-за отсутствия у вас разрешений на добавление файлов в эту папку</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Недопустимо отправить этот файл поскольку на севрере он помечен только для чтения, восстанавливаем</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Недопустимо удалить, восстанавливаем</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Локальные файлы и папки, добавленные в общий доступ, удалены.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Перемещение недопустимо, элемент восстановлен</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Перемещение недопустимо, поскольку %1 помечен только для чтения</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation> Назначение</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>Источник</translation>
    </message>
@@ -2111,137 +2118,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Пожалуйста войдите в учётную запись</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Отсоединен от сервера</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Папка %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Нет папок для синхронизации.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Нет настроенных папок для синхронизации</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Пусто</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Недавние изменения</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Открыть %1 папку</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Управляемые папки:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Открыть папку &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Открыть %1 в браузере</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Расчёт квоты...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Неизвестный статус</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Настройки...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Детали...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Помощь</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Закрыть %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Войти...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Выйти</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Квота недоступна</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>Используется %1% из %2.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Недавно ничего не синхронизировалсь</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Синхронизация %1 из %2  (%3 осталось)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Синхронизация %1 (%2 осталось)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Актуальная версия</translation>
    </message>
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -386,12 +386,12 @@ Celkom zostáva %5</translation>
        <translation>Aktivita synchronizácie</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
 Ste si istý, že chcete uskutočniť danú operáciu?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Odstrániť všetky súbory?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Odstrániť všetky súbory</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Ponechať súbory</translation>
    </message>
@@ -1044,32 +1044,27 @@ si počas procesu aktualizácie môže vyžiadať dodatočné práva.</translati
        <translation>Pripojiť...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Celý váš účet bude zosynchronizovaný do lokálneho priečinka &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 priečinok &apos;%2&apos; je zosynchronizovaný do lokálneho priečinka &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varovanie:&lt;/strong&gt; V súčasnosti máte nakonfigurovaných viac priečinkov. Pokiaľ budete pokračovať z danými nastaveniami, konfigurácie priečinkov budú zabudnuté a jednotný koreňový priečinok bude následne vytvorený!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varovanie:&lt;/strong&gt; Lokálny priečinok nie je prázdny. Vyberte riešenie!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Lokálny synchronizačný priečinok</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Aktualizovať pokročilé nastavenie</translation>
    </message>
@@ -1537,21 +1532,34 @@ Nie je vhodné ju používať.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>V súčastnosti nie sú na čiernej listine žiadne súbory kvôli predchádzajúcim chybovým stavom.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 súborov je na čiernej listine kvôli predchádzajúcim chybovým stavom.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Vybrať čo synchronizovať</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Nahrávam...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2029,64 +2037,64 @@ Nie je vhodné ju používať.</translation>
        <translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Nemožno otvoriť sync žurnál</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára podadresáre.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Nie je dovolené, pretože nemáte oprávnenie pridať nadradený adresár.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára súbory.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Nie je dovolené odstrániť. Obnovuje sa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Presunutie nie je dovolené. Položka obnovená.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>cieľ</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -2110,137 +2118,137 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Prihláste sa prosím</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Odpojený od servera</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Priečinok %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Nie sú nastavené žiadne synchronizačné priečinky.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Žiaden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Nedávne zmeny</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Otvoriť %1 priečinok</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Spravované priečinky:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Otvoriť priečinok &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Otvoriť %1 v prehliadači</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Počítanie kvóty...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Neznámy stav</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Nastavenia...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Podrobnosti...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Pomoc</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Ukončiť %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Prihlásiť do...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Odhlásiť</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Kvóta n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% z %2 sa používa</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Žiadne nedávno synchronizované položky</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Synchronizuje sa %1 z %2  (zostáva %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Synchronizuje sa %1  (zostáva %2)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Až do dnešného dňa</translation>
    </message>
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -385,12 +385,12 @@ Total time left %5</source>
        <translation>Dejavnost usklajevanja</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -399,17 +399,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
 Ali sta prepričani, da želite izvesti to opravilo?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Ali naj bodo odstranjene vse datoteke?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Odstrani vse datoteke</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Ohrani datoteke</translation>
    </message>
@@ -1043,32 +1043,27 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
        <translation>Vzpostavi povezavo ...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Celoten račun bo usklajen s krajevno mapo &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 mapa &apos;%2&apos; je usklajena s krajevno mapo &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Opozorilo:&lt;/strong&gt; Trenutno je nastavljenih več map. Če kolikor ta nastavitev ne bo popravljena, bo nastavitev prepisana, uporabljena pa bo nastavitev enojne korenske mape za usklajevanje!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Opozorilo:&lt;/strong&gt; krajevna mapa ni prazna. Kaj storiti?&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Krajevna mapa usklajevanja</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Posodobi napredne nastavitve</translation>
    </message>
@@ -1536,22 +1531,34 @@ Uporaba ni priporočljiva.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Trenutno zaradi predhodnih napak ni prezrta nobena datoteka.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 datotek je prezrtih zaradi predhodnih napak.
-Te je treba uskladiti znova.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Izbor datotek za usklajevanje</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Nalaganje ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2029,64 +2036,64 @@ Te je treba uskladiti znova.</translation>
        <translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>cilj</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>vir</translation>
    </message>
@@ -2110,137 +2117,137 @@ Te je treba uskladiti znova.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Pred nadaljevanjem je zahtevana prijava</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Povezava s strežnikom je prekinjena</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Mapa %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Ni nastavljenih map za usklajevanje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Ni nastavljenih map za usklajevanje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Brez</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Nedavne spremembe</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Odpri %1 mapo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Upravljane mape:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Odpri mapo &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Odpri %1 v brskalniku</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Preračunavanje količinske omejitve ...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Neznano stanje</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Nastavitve ...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Podrobnosti ...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Pomoč</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Končaj %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Prijava ...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Odjava</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Količinska omejitev ni na voljo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% od %2 v uporabi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Ni nedavno usklajenih predmetov</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Poteka usklajevanje %1 od %2  (preostaja %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Usklajevanje %1 (%2 do konca)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Ni posodobitev</translation>
    </message>
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -386,12 +386,12 @@ Total tid kvar %5</translation>
        <translation>Synk aktivitet</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
 Är du säker på att du vill fortsätta?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Ta bort alla filer?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Ta bort alla filer</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Behåll filer</translation>
    </message>
@@ -1044,32 +1044,27 @@ efter ytterligare privilegier under processen.</translation>
        <translation>Anslut...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Alla filer kommer att synkroniseras till den lokala mappen &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 mappen &apos;%2&apos; är synkroniserad mot den lokala mappen &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varning:&lt;/strong&gt; Du har för närvarande flera mappar konfigurerade. Om du fortsätter med nuvarande inställningar så kommer inställningarna för synkronisering av mapparna att tas bort och ersättas med en enda synkronisering av själva rot-mappen!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varning:&lt;/strong&gt; Den lokala mappen är inte tom. Välj en lösning!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Lokal mapp för synkning</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Uppdatera avancerade inställningar</translation>
    </message>
@@ -1537,22 +1532,34 @@ Det är inte lämpligt använda den.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>För närvarande ignoreras inga filer på grund av föregående fel.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 filer ignoreras på grund av föregående fel.
-Försök att synka dessa igen.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Välj vad som ska synkas</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Mappar som inte är valda kommer inte att synkas till den här datorn</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Laddar  ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ Försök att synka dessa igen.</translation>
        <translation>Kan inte initialisera en synk journal. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Kunde inte öppna synk journalen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Inte behörig att radera, återställer</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokala filer och mappar som är delade är borttagna.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Det gick inte att genomföra flytten, objektet återställs</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>destinationen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>källan</translation>
    </message>
@@ -2111,137 +2118,137 @@ Försök att synka dessa igen.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Vänliga logga in</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Bortkopplad från servern</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Mapp %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Ingen synkroniseringsmapp är konfigurerad.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Det finns inga synkmappar konfigurerade.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Ingen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Senaste ändringar</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Öppna %1 mappen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Hanterade mappar:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Öppna mapp &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Öppna %1 i webbläsaren</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Beräknar kvot...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Okänd status</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Inställningar...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Detaljer...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Hjälp</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Avsluta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Logga in...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Logga ut</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Kvot n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%1% av %2 används</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Inga filer har synkroniseras nyligen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Synkroniserar %1 av %2 (%3 kvar)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Synkroniserar %1 (%2 kvar)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Aktuell version</translation>
    </message>
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -385,29 +385,29 @@ Total time left %5</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation type="unfinished"/>
    </message>
@@ -1038,32 +1038,27 @@ for additional privileges during the process.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation type="unfinished"/>
    </message>
@@ -1530,21 +1525,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation type="unfinished"/>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2020,64 +2028,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -2101,137 +2109,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>เปิดโฟลเดอร์ %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>ช่วยเหลือ</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -386,12 +386,12 @@ Toplam kalan süre: %5</translation>
        <translation>Eşitleme Etkinliği</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Sistem hariç tutulma dosyası okunamadı</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
 Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Tüm Dosyalar Kaldırılsın mı?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Tüm dosyaları kaldır</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Dosyaları koru</translation>
    </message>
@@ -1044,32 +1044,27 @@ bu süreç sırasında ek yetki talebinde bulunabilir.</translation>
        <translation>Bağlan...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Tüm hesabınız yerel &apos;%1&apos; klasörü ile eşitlenecek.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 klasörü &apos;%2&apos;, yerel &apos;%3&apos; klasörü ile eşitlendi</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Uyarı:&lt;/strong&gt; Şu anda birden fazla yapılandırılmış klasörünüz var. Eğer geçerli ayarlarla devam ederseniz, klasör yapılandırmaları silinecek ve tek bir kök klasör eşitlemesi oluşturulacak!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Uyarı:&lt;/strong&gt; Yerel klasör boş değil. Bir çözüm seçin!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Yerel Eşitleme Klasörü</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Gelişmiş kurulumu güncelle</translation>
    </message>
@@ -1537,22 +1532,34 @@ Kullanmanız önerilmez.</translation>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>Önceki hata koşullarından dolayı yoksayılmış dosya yok.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>Önceki hata koşullarından dolayı %1 dosya yoksayıldı.
-Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Ne Eşitleneceğini Seçin</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>İşareti kaldırılan klasörler, bu bilgisayarla eşitlenmeyecektir</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Yükleniyor...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
        <translation>Bir eşitleme günlüğü başlatılamadı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Eşitleme günlüğü açılamıyor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;Eşitlenecekleri seçin&quot; kara listesinde olduğundan yoksayıldı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Kaldırmaya izin verilmedi, geri alınıyor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Yerel dosyalar ve paylaşım klasörü kaldırıldı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Taşımaya izin verilmedi, öge geri alındı</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>%1 salt okunur olduğundan taşımaya izin verilmedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>hedef</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>kaynak</translation>
    </message>
@@ -2111,137 +2118,137 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Lütfen oturum açın</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Sunucu bağlantısı kesildi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Klasör %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Yapılandırılmış eşitleme klasörü yok.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Yapılandırılmış eşitleme klasörü yok.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Hiçbir şey.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Son Değişiklikler</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>%1 klasörünü aç</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Yönetilen Klasörler:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>&apos;%1&apos; klasörünü aç</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>%1&apos;ı tarayıcıda aç</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Kota hesaplanıyor...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Bilinmeyen durum</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Ayarlar...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Ayrıntılar...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Yardım</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>%1&apos;tan çık</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Oturum aç...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Oturumu kapat</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Kota kullanılamıyor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>%2&apos;ın % %1 kısmı kullanımda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Yakın zamanda eşitlenen öge yok</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Ortaya çıkarılan: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Eşitlenen %1/%2  (%3 kaldı)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Eşitlenen %1 (%2 kaldı)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Güncel</translation>
    </message>
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -386,12 +386,12 @@ Total time left %5</source>
        <translation>Журнал синхронізації</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation>Неможливо прочитати виключений системний файл</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -400,17 +400,17 @@ Are you sure you want to perform this operation?</source>
 Ви дійсно бажаєте продовжити цю операцію?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>Видалити усі файли?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>Видалити усі файли</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>Зберегти файли</translation>
    </message>
@@ -1044,32 +1044,27 @@ for additional privileges during the process.</source>
        <translation>Підключення ...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>Ваш запис цілком синхронізовано із локальною текою &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 тека &apos;%2&apos; синхронізована з локальним каталогом &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Увага:&lt;/strong&gt; У вас налаштовано декілька каталогів. Якщо ви продовжите з цими налаштуваннями, налаштування тек будуть відкинуті та буде створена одна батьківська тека!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Увага:&lt;/strong&gt; Локальна тека не пуста. Оберіть рішення!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>Локальна Тека для Синхронізації</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>Оновити додаткові налаштування</translation>
    </message>
@@ -1537,22 +1532,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation>На даний час, проігноровані файли відсутні через помилки.</translation>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation>%1 проігноровано через помилки.
-Спробуйте повторити синхронізацію.</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation>Оберіть, що хочете синхронізувати</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation>Не відмічені теки не будуть синхронізовані на цьому компь&apos;ютері</translation>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>Завантаження ...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2030,64 +2037,64 @@ It is not advisable to use it.</source>
        <translation>Не вдалося ініціалізувати протокол синхронізації.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>Не вдається відкрити протокол синхронізації</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ігнорується через чорний список в &quot;обрати що синхронізувати&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Не дозволено через відсутність прав на додавання підкаталогів в цій теці.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Не дозволено через відсутність прав на додавання батьківської теки.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Не дозволено через відсутність прав на додавання файлів в цю теку.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Не дозволено завантажувати цей файл, оскільки він має дозвіл лише на перегляд, відновлюємо</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Не дозволено видаляти, відновлюємо</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation>Локальні файли та теки в загальному доступі було видалено.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation>Переміщення не дозволено, елемент відновлено </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Переміщення не дозволено, оскільки %1 помічений тільки для перегляду</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation>призначення</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation>джерело</translation>
    </message>
@@ -2111,137 +2118,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>Будь ласка ввійдіть в обліковий запис</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>Від&apos;єднано від серверу</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>Тека %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>Жодна тека не налаштована для синхронізації.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation>Немає налаштованих тек для синхронізації.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>Пусто.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>Недавні зміни</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>Відкрити %1 каталог</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>Керовані теки:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Відкрити теку &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>Відкрити %1 в браузері</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>Підрахунок квоти...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>Невідомий статус</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>Налаштування...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>Деталі...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>Допомога</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>Закрити %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>Ввійти...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>Вийти</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>Квота недоступна</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>Використовується %1% з %2.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation>Нещодавно нічого не синхронізувалося</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation>Виявлення &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation>Синхронізовано %1 з %2 (залишилося %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation>Синхронізовано %1 (залишилося %2)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>Оновлено</translation>
    </message>
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -385,12 +385,12 @@ Total time left %5</source>
        <translation>同步活动</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -399,17 +399,17 @@ Are you sure you want to perform this operation?</source>
 你确定执行该操作吗？</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>删除所有文件？</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>删除所有文件</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>保持所有文件</translation>
    </message>
@@ -1042,32 +1042,27 @@ for additional privileges during the process.</source>
        <translation>连接...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation>您的整个账户将被同步到本地文件夹 %1。</translation>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation>%1 文件夹 &apos;%2&apos; 将被同步到本地文件夹 &apos;%3&apos;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>警告：当前设置了多个文件夹。如果继续当前操作，文件夹设置将丢失，且一个根文件夹会被建立并同步。</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;警告：&lt;/strong&gt; 本地目录非空。选择一个操作！&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>本地同步文件夹</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>更新高级设置</translation>
    </message>
@@ -1534,21 +1529,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation type="unfinished"/>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>加载中...</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2026,64 +2034,64 @@ It is not advisable to use it.</source>
        <translation>无法初始化同步日志</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation>无法打开同步日志</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -2107,137 +2115,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>请登录</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation>已从服务器断开</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>文件夹 %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>没有已配置的同步文件夹。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>无。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation>最近修改</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>打开 %1 目录</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>管理的文件夹：</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>打开文件夹“%1”</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>在浏览器中打开%1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation>计算配额....</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>未知状态</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>设置...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>细节...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>帮助</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>退出 %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>登录...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>注销</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>配额无限制</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation>已使用 %2，总计 %1%</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>更新</translation>
    </message>
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -385,29 +385,29 @@ Total time left %5</source>
        <translation>同步啟用</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="709"/>
+        <location filename="../src/mirall/folder.cpp" line="707"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="899"/>
+        <location filename="../src/mirall/folder.cpp" line="903"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the file were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="903"/>
+        <location filename="../src/mirall/folder.cpp" line="907"/>
        <source>Remove All Files?</source>
        <translation>移除所有檔案?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="905"/>
+        <location filename="../src/mirall/folder.cpp" line="909"/>
        <source>Remove all files</source>
        <translation>移除所有檔案</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="906"/>
+        <location filename="../src/mirall/folder.cpp" line="910"/>
        <source>Keep files</source>
        <translation>保留檔案</translation>
    </message>
@@ -1038,32 +1038,27 @@ for additional privileges during the process.</source>
        <translation>連線中...</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="121"/>
-        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="130"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="137"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local directory is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="253"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="252"/>
        <source>Local Sync Folder</source>
        <translation>本地同步資料夾</translation>
    </message>
    <message>
-        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="266"/>
+        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="265"/>
        <source>Update advanced setup</source>
        <translation>更新進階設定</translation>
    </message>
@@ -1530,21 +1525,34 @@ It is not advisable to use it.</source>
        <source>Currently no files are ignored because of previous errors.</source>
        <translation type="unfinished"/>
    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="257"/>
-        <source>%1 files are ignored because of previous errors.
+        <source>%n files are ignored because of previous errors.
 Try to sync these again.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
 </context>
 <context>
    <name>Mirall::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/mirall/selectivesyncdialog.cpp" line="265"/>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="268"/>
+        <source>Choose What to Sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Unchecked folders will not be sync to this computer</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Mirall::SelectiveSyncTreeView</name>
+    <message>
+        <location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
+        <source>Loading ...</source>
+        <translation>載入中…</translation>
+    </message>
+</context>
 <context>
    <name>Mirall::SettingsDialog</name>
    <message>
@@ -2020,64 +2028,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="619"/>
+        <location filename="../src/mirall/syncengine.cpp" line="621"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="851"/>
-        <location filename="../src/mirall/syncengine.cpp" line="858"/>
+        <location filename="../src/mirall/syncengine.cpp" line="853"/>
+        <location filename="../src/mirall/syncengine.cpp" line="860"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="876"/>
+        <location filename="../src/mirall/syncengine.cpp" line="878"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="882"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="889"/>
+        <location filename="../src/mirall/syncengine.cpp" line="891"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="909"/>
+        <location filename="../src/mirall/syncengine.cpp" line="911"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="926"/>
-        <location filename="../src/mirall/syncengine.cpp" line="946"/>
+        <location filename="../src/mirall/syncengine.cpp" line="928"/>
+        <location filename="../src/mirall/syncengine.cpp" line="948"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="961"/>
+        <location filename="../src/mirall/syncengine.cpp" line="963"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1016"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1018"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1025"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1027"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1026"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1028"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -2101,137 +2109,137 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::ownCloudGui</name>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="224"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
        <translation>請登入</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="229"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
        <source>Disconnected from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="261"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
        <source>Folder %1: %2</source>
        <translation>資料夾 %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="267"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
        <source>No sync folders configured.</source>
        <translation>尚未指定同步資料夾</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="276"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="280"/>
        <source>There are no sync folders configured.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
        <source>None.</source>
        <translation>無。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="306"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="310"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="323"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="327"/>
        <source>Open %1 folder</source>
        <translation>開啟%1資料夾</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
        <source>Managed Folders:</source>
        <translation>管理的資料夾:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="336"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>開啟 %1 資料夾</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
        <source>Open %1 in browser</source>
        <translation>瀏覽器中開啟 %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="412"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="416"/>
        <source>Unknown status</source>
        <translation>未知狀態</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="414"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
        <source>Settings...</source>
        <translation>設定…</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="415"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="419"/>
        <source>Details...</source>
        <translation>細節…</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="420"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="424"/>
        <source>Help</source>
        <translation>說明</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="422"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
        <source>Quit %1</source>
        <translation>離開 %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="425"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="429"/>
        <source>Sign in...</source>
        <translation>登入中...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="427"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
        <source>Sign out</source>
        <translation>登出</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="435"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="439"/>
        <source>Quota n/a</source>
        <translation>無配額</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="442"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="446"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="454"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="458"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="466"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
        <source>Discovering &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="470"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="474"/>
        <source>Syncing %1 of %2  (%3 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="475"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="479"/>
        <source>Syncing %1 (%2 left)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="495"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="499"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudgui.cpp" line="523"/>
+        <location filename="../src/mirall/owncloudgui.cpp" line="527"/>
        <source>Up to date</source>
        <translation>最新的</translation>
    </message>
Author	SHA1	Message	Date
Daniel Molkentin	d0b40bab47	Merge pull request #2391 from owncloud/ignore_windows_reserved_characters Ignore reserved words on Windows	2014-10-24 15:39:21 -04:00
Daniel Molkentin	d76192cce1	Ignore reserved words on Windows Fixes #2385 and #2386	2014-10-24 13:18:57 -04:00
Klaas Freitag	0e828d802e	Bump version to 1.7.0rc1	2014-10-24 18:20:41 +02:00
Klaas Freitag	9505d7cc51	Updated changelog for 1.7.0	2014-10-24 18:19:16 +02:00
Christian Kamm	1c4072e231	Selective sync ui: Fix #2390	2014-10-24 16:11:29 +02:00
Klaas Freitag	86e13ea06f	FolderMan: Use folderForPath method to get the folder object for a path	2014-10-24 15:07:33 +02:00
Klaas Freitag	c12d3870cd	Merging work branch for a bug fix for bug #2379 . It closes all db connections if the new local path is a already synced folder path.	2014-10-24 14:43:48 +02:00
Christian Kamm	fce76a13cb	Sync scheduling: Only do a follow-up sync 3 times. #2355 After trying again immediately for 3 times, no more fast follow-ups are run until a sync finishes without needing a fast follow-up.	2014-10-24 13:31:48 +02:00
Christian Kamm	82b14370fc	Sync scheduling: Only retry up to twice after fail. #2386 Previously when a sync failed, we'd retry very soon (30s) no matter how often a sync had failed before. After this change we'll retry twice and then back off to the regular 5min interval.	2014-10-24 13:31:48 +02:00
Klaas Freitag	a9d8e9dcd8	Setupwizard: Close the database in case of moving the folder.	2014-10-24 13:05:29 +02:00
Klaas Freitag	542e989046	Setup Dialog: Terminate sync if the new folder is a an actual folder.	2014-10-24 11:59:56 +02:00
Klaas Freitag	f5c199740d	Followup: To unregister a path in socket api use the alias of folder.	2014-10-24 11:36:01 +02:00
Klaas Freitag	f37b81c8b7	Unregister path in socketapi before removing it.	2014-10-24 11:12:06 +02:00
Christian Kamm	c0ea69ee24	SqlQuery: Reset after each successful exec(). In `e5269a4151` I moved the reset calls to before the first bindValue() because we didn't consistently reset() after exec(). However, some queries may keep a lock on the database so it is necessary to reset() as soon as the data is read. This commit reintroduces these reset() calls.	2014-10-24 10:11:00 +02:00
Christian Kamm	5640cbf653	SqlDatabase: Make it non-copyable.	2014-10-24 09:56:30 +02:00
Jenkins for ownCloud	6d81e5c87a	[tx-robot] updated from transifex	2014-10-24 01:25:23 -04:00
Daniel Molkentin	3c7ff97ed4	SocketAPI: Don't use a theme dependent name for now We will revert this once #2388 is implemented	2014-10-23 17:46:17 -04:00
Craig Morrissey	2120ff8037	fix resources path and permissions	2014-10-23 16:42:32 -04:00
Daniel Molkentin	92c35c6aa6	Update reference to binary submodule	2014-10-23 15:09:49 -04:00
Daniel Molkentin	149b16aefd	Win32 Shell Integration: Use RegDeleteKey instead of RegDeleteKeyEx RegDeleteKeyEx does not exist on Windows XP 32 bit Fixes: #2165	2014-10-23 21:00:31 +02:00
Klaas Freitag	114c38c1ff	csync tests: add some debug code to get behind the jenkins fails.	2014-10-23 17:33:47 +02:00
Christian Kamm	e5269a4151	Add SyncJournalDB autotests. There also was a bug in syncjournaldb: in some error conditions the sql query wasn't reset properly. We now always reset a query before calling bindValue.	2014-10-23 15:15:47 +02:00
Markus Goetz	81584c6d51	VERSION.cmake: rc1	2014-10-23 12:22:07 +02:00
Markus Goetz	0d9ae241c9	OwnCloudFinder: Rename to SyncStateFinder Project file names stay the same, only the output file(s) changed	2014-10-23 12:19:19 +02:00
Klaas Freitag	e726e7aad8	util: Use canonicalFilePath to clean the path opened by explorer. This fixes bug #2299	2014-10-23 10:41:07 +02:00
Jenkins for ownCloud	c7c05ea869	[tx-robot] updated from transifex	2014-10-23 01:25:33 -04:00
Daniel Molkentin	83880aed52	Add proper background for OS X installer Fixes #2335	2014-10-22 18:02:19 -04:00
Olivier Goffart	de56b753d1	protocolwidget: fix string that need to use plural translation	2014-10-22 18:26:40 +02:00
Olivier Goffart	dab01e3f3f	csync_update: add the perms in the log	2014-10-22 17:25:38 +02:00
Olivier Goffart	e46ab72718	SocketAPI: Show error when we are not allowed Issue #1931	2014-10-22 17:25:38 +02:00
Klaas Freitag	9f6d7eb587	tests: use the ocs_url in the same semantics as the 1.6 branch.	2014-10-22 16:06:39 +02:00
Daniel Molkentin	bbd9098e44	Switch git submodule for qtmacgoodies back to shadone	2014-10-22 09:58:08 -04:00
Markus Goetz	47ad4e3fe8	CSync: Close/Reopen DB between update and reconcile update and reconcile happen in different threads. This code is safer. (Even though depending on sqlite3 version it should work anyway)	2014-10-22 15:42:13 +02:00
Olivier Goffart	9330d2e1e8	SocketAPI: always clean the path and use the normal slash	2014-10-22 15:33:35 +02:00
Olivier Goffart	020e19f770	SocketAPI: Fix all files are new (Introduced because of bad resolution of merge conflict in my last commit)	2014-10-22 15:32:09 +02:00
Olivier Goffart	3be5600caf	t6.pl: fix missing space in curl command	2014-10-22 15:16:22 +02:00
Olivier Goffart	22dd275b15	SocketAPI: Fix the shared symbol, including for owncloud6 Shared dir The shared symbol would not appear if the status came for estimateState Also added the shared symbol for the Shared/ directories (owncloud 6 compat)	2014-10-22 15:10:21 +02:00
Markus Goetz	6342e76e19	Wizard: Change misleading text	2014-10-22 15:06:33 +02:00
Markus Goetz	55dd149a03	SocketAPI: Less verbose	2014-10-22 14:43:23 +02:00
Markus Goetz	39a0f28753	Move qtmacgoodies module forward	2014-10-22 14:43:03 +02:00
Olivier Goffart	dd45b448d9	t6.pl: pass the --insecure flag to curl so it works on the test machine	2014-10-22 13:57:22 +02:00
Olivier Goffart	7740150576	Selective Sync widget: add a "Loading..." label Task #2088	2014-10-22 13:48:05 +02:00
Olivier Goffart	4f367faf4d	SocketAPI: Show an error for files inside the selective sync folders Task #2283	2014-10-22 13:31:20 +02:00
Olivier Goffart	3840186dd8	Utility: fix function signature	2014-10-22 13:31:20 +02:00
Christian Kamm	d77fcea365	Csync tests: Don't use sqlite3_close_v2.	2014-10-22 12:44:33 +02:00
Daniel Molkentin	ed51a45187	Add title to selective sync dialog	2014-10-22 06:29:22 -04:00
Christian Kamm	ba86988101	Csync tests: Fix broken tests. It is no longer ok to call csync_statedb_load() on a non-existant database since it opens readonly only.	2014-10-22 12:22:13 +02:00
Olivier Goffart	6073e3f345	SocketAPI: do not show a progress icon in case of errors	2014-10-22 12:19:57 +02:00
Olivier Goffart	d31ccacf57	SocketAPI: show an ignored icon for paused folders	2014-10-22 12:19:57 +02:00
Christian Kamm	de48e65091	Csync tests: Fix compile.	2014-10-22 11:45:48 +02:00
Klaas Freitag	3243365210	JournalDb: Do not longer always have a write operation on version table. Rather read the value from the table and if it is what we expect do not write it.	2014-10-22 10:59:58 +02:00
Jenkins for ownCloud	8dc3f2146a	[tx-robot] updated from transifex	2014-10-22 01:25:37 -04:00
Markus Goetz	a993496ab4	SyncJournalDB/SyncEngine: Properly detect 1.5 upgrade Else we end up never reading file data from the DB.	2014-10-21 20:25:15 +02:00
Markus Goetz	61e72ef50b	CSync: statedb sanity check changes	2014-10-21 18:09:23 +02:00
Markus Goetz	d7ac878efd	SyncJournalDB: Fix deleteBatch	2014-10-21 16:37:51 +02:00
Markus Goetz	e5a0db8782	SyncJournalDB: Fix version table filling up	2014-10-21 16:37:39 +02:00
Markus Goetz	24d4840c93	SyncJournalDB: Set WAL files to hidden	2014-10-21 15:58:56 +02:00
Markus Goetz	fa70798fb5	SyncJournalDB: WAL checkpoint at end of sync	2014-10-21 15:41:11 +02:00
Markus Goetz	1af480ea3b	CMake: Fix RPATH	2014-10-21 15:39:31 +02:00
Olivier Goffart	a76fc0ee5a	SocketAPI: send the change of the parent folder in the broatcast Also do not compute the status if there is nno listeners	2014-10-21 15:26:51 +02:00
Olivier Goffart	80e86d6c1b	ownsql: fix warning with clang warning: equality comparison with extraneous parentheses [-Wparentheses-equality]	2014-10-21 14:59:42 +02:00
Olivier Goffart	dc13e39bb1	SocketAPI: do not have a special case for UPDATE_VIEW on windows This is a relique on the old times when there was no persistant connection in the windows plugin	2014-10-21 14:57:50 +02:00
Olivier Goffart	98c5871d38	Windows shell integration: Add SHCNF_FLUSHNOWAIT to SHChangeNotify (TortoiseSVN have this flag) Also do not call SHChangeNotify if there was no change	2014-10-21 14:51:18 +02:00
Olivier Goffart	5a109d9293	Fix t3.pl The fix in commit `86d8079` made the detection of changes inside a directory more robust. As a result, changes are detected inside a directory, even if the files that are changed were moved away on the other remote, the algorithm won't let the directory be removed and the directory will be re-created	2014-10-21 12:10:12 +02:00
Olivier Goffart	56316bc980	csync_reconcile: remove useless debug output	2014-10-21 11:47:18 +02:00