1.4.0 final

Hide quota and display explanation if no quota info is available.
Added logging to quota info result slot.
2013-09-04 11:09:12 +02:00 · 2013-09-03 14:25:28 +02:00 · 2013-09-03 14:25:28 +02:00 · 2013-09-03 14:24:34 +02:00 · 2013-09-03 12:35:40 +02:00 · 2013-09-03 06:30:41 -04:00
@@ -1,3 +1,4 @@
+.gitmodules
 *build*/
 *flymake*
 CMakeLists.txt.user*
@@ -0,0 +1,3 @@
+[submodule "doc/ocdoc"]
+	path = doc/ocdoc
+	url = https://github.com/owncloud/documentation
@@ -13,12 +13,16 @@ else ()
     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
 endif()

+if (NOT DEFINED APPLICATION_SHORTNAME)
+     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
+endif()
+
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")

 include(GNUInstallDirs)
-
+include(DefineInstallationPaths)
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)

@@ -34,10 +38,8 @@ if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
    endif()
 endif()

-## stupid, we should upstream this
-if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND NOT CMAKE_INSTALL_SYSCONFDIR)
-    set(CMAKE_INSTALL_SYSCONFDIR "/etc")
-endif()
+set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
+set(DATADIR ${DATA_INSTALL_DIR})

 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE
@@ -83,25 +85,6 @@ set(USE_INOTIFY ${INOTIFY_FOUND})

 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

-set(CPACK_SOURCE_IGNORE_FILES
-  # hidden files
-  "/\\\\..+$"
-  # temporary files
-  "\\\\.swp$"
-  # backup files
-  "~$"
-  # others
-  "\\\\.#"
-  "/#"
-  "/build/"
-  "/_build/"
-  # used before
-  "\\\\.o$"
-  "\\\\.lo$"
-  "\\\\.la$"
-  "Makefile\\\\.in$"
-)
-
 include(OwnCloudCPack.cmake)

 add_definitions(-DUNICODE)
@@ -123,5 +106,5 @@ endif(UNIT_TESTING)
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
    configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
 else()
-    install( FILES sync-exclude.lst DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} )
+    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
 endif()
@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 1.4.0beta1 (release 2013-08-08 ), csync 0.81.0 required
+version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required

  * New Scheduler: Only sync when there are actual changes in the server
  * Add a Settings Dialog, move Proxy Settings there
@@ -19,6 +19,9 @@ version 1.4.0beta1 (release 2013-08-08 ), csync 0.81.0 required
  * Add an editor for ingore patterns
  * ALlow to flag certain ignore patterns as discardable
  * Ensure to ship with all valid translations
+  * Progress Dialog now preserves the last syncned items across sync runs
+  * Split Setup Wizard into multiple pages again
+  * Implement "--logfile -" to log to stdout
  * Add preliminary support for Shibboleth authentication
  * Linux: Provide more icon sizes
  * Linux: Do not trigger notifier on ignored files
@@ -1,9 +1,9 @@
-set( APPLICATION_SHORTNAME  "owncloud" )
 set( APPLICATION_NAME       "ownCloud" )
-set( APPLICATION_EXECUTABLE "owncloud"        )
-set( APPLICATION_DOMAIN     "owncloud.com"    )
-set( APPLICATION_VENDOR     "ownCloud, Inc"   )
-set( THEME_CLASS            "ownCloudTheme"   )
+#set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
+set( APPLICATION_EXECUTABLE "owncloud" )
+set( APPLICATION_DOMAIN     "owncloud.com" )
+set( APPLICATION_VENDOR     "ownCloud, Inc" )
+set( THEME_CLASS            "ownCloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
@@ -1,6 +1,6 @@
 set( VERSION_MAJOR 1 )
 set( VERSION_MINOR 4 )
 set( VERSION_PATCH 0 )
-set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}beta2")
+set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}")
 set( SOVERSION 0 )

@@ -10,8 +10,7 @@ mount="/Volumes/$(basename $src_dmg|cut -d"-" -f1)"

 test -e $tmp_dmg && rm -rf $tmp_dmg
 hdiutil convert $src_dmg -format UDRW -o $tmp_dmg
-open $tmp_dmg
-sleep 12s
+hdiutil attach $tmp_dmg
 pushd $mount
 codesign -s "$identity" $mount/*.app
 popd
@@ -0,0 +1,108 @@
+if (UNIX)
+  # Suffix for Linux
+  SET(LIB_SUFFIX
+    CACHE STRING "Define suffix of directory name (32/64)"
+  )
+
+  SET(EXEC_INSTALL_PREFIX
+    "${CMAKE_INSTALL_PREFIX}"
+    CACHE PATH  "Base directory for executables and libraries"
+  )
+  SET(SHARE_INSTALL_PREFIX
+    "${CMAKE_INSTALL_PREFIX}/share"
+    CACHE PATH "Base directory for files which go to share/"
+  )
+  SET(DATA_INSTALL_PREFIX
+    "${SHARE_INSTALL_PREFIX}/${APPLICATION_SHORT_NAME}"
+    CACHE PATH "The parent directory where applications can install their data")
+
+  # The following are directories where stuff will be installed to
+  SET(BIN_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/bin"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} binary install dir (default prefix/bin)"
+  )
+  SET(SBIN_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/sbin"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} sbin install dir (default prefix/sbin)"
+  )
+  SET(LIB_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
+  )
+  SET(LIBEXEC_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/libexec"
+    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
+  )
+  SET(PLUGIN_INSTALL_DIR
+    "${LIB_INSTALL_DIR}/${APPLICATION_SHORT_NAME}"
+    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_SHORT_NAME})"
+  )
+  SET(INCLUDE_INSTALL_DIR
+    "${CMAKE_INSTALL_PREFIX}/include"
+    CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
+  )
+
+  SET(DATA_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}"
+    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_SHORT_NAME})"
+  )
+  SET(HTML_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/doc/HTML"
+    CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
+  )
+  SET(ICON_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/icons"
+    CACHE PATH "The icon install dir (default data/icons/)"
+  )
+  SET(SOUND_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/sounds"
+    CACHE PATH "The install dir for sound files (default data/sounds)"
+  )
+
+  SET(LOCALE_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/locale"
+    CACHE PATH "The install dir for translations (default prefix/share/locale)"
+  )
+
+  SET(XDG_APPS_DIR
+    "${SHARE_INSTALL_PREFIX}/applications/"
+    CACHE PATH "The XDG apps dir"
+  )
+  SET(XDG_DIRECTORY_DIR
+    "${SHARE_INSTALL_PREFIX}/desktop-directories"
+    CACHE PATH "The XDG directory"
+  )
+
+  IF(NOT "${EXEC_INSTALL_PREFIX}" STREQUAL "/usr")
+    SET(SYSCONFDIR_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}")
+  endif()
+
+  SET(SYSCONF_INSTALL_DIR
+    "${SYSCONFDIR_INSTALL_PREFIX}/etc"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} sysconfig install dir (default prefix/etc)"
+  )
+  SET(MAN_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/man"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} man install dir (default prefix/man)"
+  )
+  SET(INFO_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/info"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} info install dir (default prefix/info)"
+  )
+endif (UNIX)
+
+if (WIN32)
+  # Same same
+  set(SHARE_INSTALL_PREFIX "share" CACHE PATH "-")
+  set(BIN_INSTALL_DIR "." CACHE PATH "-")
+  set(SBIN_INSTALL_DIR "." CACHE PATH "-")
+  set(LIB_INSTALL_DIR "lib" CACHE PATH "-")
+  set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
+  set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
+  set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
+  set(ICON_INSTALL_DIR "." CACHE PATH "-")
+  set(SOUND_INSTALL_DIR "." CACHE PATH "-")
+  set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
+  set(SYSCONF_INSTALL_DIR "config" CACHE PATH "-")
+  set(MAN_INSTALL_DIR "man" CACHE PATH "-")
+endif (WIN32)
@@ -1,6 +1,6 @@
 ;ownCloud installer script.

-!define APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
+!define APPLICATION_SHORTNAME "@APPLICATION_EXECUTABLE@"
 !define APPLICATION_NAME "@APPLICATION_NAME@"
 !define APPLICATION_VENDOR "@APPLICATION_VENDOR@"
 !define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe"
@@ -8,4 +8,10 @@
 #cmakedefine APPLICATION_DOMAIN @APPLICATION_DOMAIN@
 #cmakedefine THEME_CLASS @THEME_CLASS@
 #cmakedefine THEME_INCLUDE @THEME_INCLUDE@
+
+#cmakedefine APPLICATION_NAME "@APPLICATION_NAME@"
+#cmakedefine APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
+
+#cmakedefine SYSCONFDIR "@SYSCONFDIR@"
+#cmakedefine DATADIR "@DATADIR@"
 #endif
@@ -22,6 +22,11 @@ if(SPHINX_FOUND)
       add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
    endif(WITH_DOC)

+    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ocdoc")
+       add_dependencies(doc doc-html-org)
+       add_dependencies(doc doc-html-com)
+    endif()
+
    if(PDFLATEX_FOUND)
        # if this still fails on Debian/Ubuntu, run
        # apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
@@ -56,7 +61,19 @@ if(SPHINX_FOUND)
 	                        -q -c . -b html
 				-d ${SPHINX_CACHE_DIR}/html
 				${CMAKE_CURRENT_SOURCE_DIR}
-				${SPHINX_HTML_DIR} )
+				${SPHINX_HTML_DIR}/unthemed )
+    add_custom_target( doc-html-org ${SPHINX_EXECUTABLE}
+	                        -q -c . -b html
+				-d ${SPHINX_CACHE_DIR}/html
+                                -D html_theme=owncloud_org
+				${CMAKE_CURRENT_SOURCE_DIR}
+				${SPHINX_HTML_DIR}/org )
+    add_custom_target( doc-html-com ${SPHINX_EXECUTABLE}
+	                        -q -c . -b html
+				-d ${SPHINX_CACHE_DIR}/html
+                                -D html_theme=owncloud_com
+				${CMAKE_CURRENT_SOURCE_DIR}
+				${SPHINX_HTML_DIR}/com )
    add_custom_target( doc-man  ${SPHINX_EXECUTABLE}
 	                        -q -c . -b man
 				-d ${SPHINX_CACHE_DIR}/man
@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/OwncloudDocumentation.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OwncloudDocumentation.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/OwncloudDocumentation"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/OwncloudDocumentation"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
@@ -0,0 +1,37 @@
+Setting up an Account
+=====================
+
+If no account has been configured, ownCloud Client will automatically assist
+you in connecting to your ownCloud Server after the application has been
+started.
+
+As a first step, specify the URL to your Server, just
+like you would when you open your ownCloud instance inside a browser.
+
+.. image:: images/wizard_url.png
+   :scale: 50 %
+
+.. note:: Make sure to use ``https://`` if the server supports it. Otherwise,
+   your password and all data will be transferred to the server unencrypted.
+   This makes it easy for third parties to intercept your communication, and
+   getting hold of your password!
+
+Next, you are prompted for your username and password. Again, use the same
+credentials that you would use to log on via the web interface.
+
+.. image:: images/wizard_user.png
+   :scale: 50 %
+
+Finally, choose the folder that ownCloud Client is supposed to sync the
+contents of your ownCloud account with. By default, this is a folder
+called `ownCloud`, which will reside in your home directory.
+
+.. image:: images/wizard_targetfolder.png
+   :scale: 50 %
+
+After pressing `Connect`, ownCloud Client will commence with the syncing
+process. The next screen will give you the opportunity to review your
+settings:
+
+.. image:: images/wizard_overview.png
+   :scale: 50 %
@@ -0,0 +1,14 @@
+Advanced Usage
+==============
+
+.. index:: Advanced Usage
+
+Options
+-------
+.. index:: command line switches, command line, options, parameters
+.. include:: options.rst
+
+Config File
+-----------
+.. index:: config file
+.. include:: conffile.rst
@@ -1,5 +1,6 @@
-Architecture
-============
+Appendix B: Architecture
+========================
+
 .. index:: architecture 

 The ownCloud project provides desktop sync clients to synchronize the
@@ -11,11 +12,10 @@ csync was written to synchronize with ownCloud’s built-in WebDAV server.

 The ownCloud sync client is based on a tool called mirall initially written by
 Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to work
-with ownCloud server. Both mirall and ownCloud Client (oCC) build from the same
-source, currently hosted in the ownCloud source repo on gitorious.
+with ownCloud server.

-oCC is written in C++ using the `Qt Framework`_. As a result oCC runs on the
-three important platforms Linux, Windows and MacOS.
+ownCloud Client is written in C++ using the `Qt Framework`_. As a result, the
+ownCloud Client runs on the three important platforms Linux, Windows and MacOS.

 .. _csync: http://www.csync.org
 .. _`Qt Framework`: http://www.qt-project.org
@@ -23,8 +23,8 @@ three important platforms Linux, Windows and MacOS.
 The Sync Process
 ----------------

-First it is important to recall what syncing is. Syncing tries to keep the files
-on both repositories the same. That means if a file is added to one repository
+First it is important to recall what syncing is: It tries to keep the files
+on two repositories the same. That means if a file is added to one repository
 it is going to be copied to the other repository. If a file is changed on one
 repository, the change is propagated to the other repository. Also, if a file
 is deleted on one side, it is deleted on the other. As a matter of fact, in
@@ -34,10 +34,10 @@ server is always master.
 This is the major difference to other systems like a file backup where just
 changes and new files are propagated but files never get deleted.

-The oCC checks both repositories for changes frequently after a certain time
-span. That is refered to as a sync run. In between the local repository is 
-monitored by a file system monitor system that starts a sync run immediately
-if something was edited, added or removed.
+The ownCloud Client checks both repositories for changes frequently after a
+certain time span. That is refered to as a sync run. In between the local
+repository is monitored by a file system monitor system that starts a sync run
+immediately if something was edited, added or removed.

 Sync by Time versus ETag
 ------------------------
@@ -62,16 +62,18 @@ machines.
 Since this strategy is rather fragile without NTP, ownCloud 4.5 introduced a
 unique number, which changes whenever the file changes. Although it is a unique
 value, it is not a hash of the file, but a randomly chosen number, which it will
-transmit in the Etag_ field. Since the file number is guaranteed to change if the 
-file changes, it can now be used to determine if one of the files has changed.
+transmit in the Etag_ field. Since the file number is guaranteed to change if
+the file changes, it can now be used to determine if one of the files has
+changed.

-.. note:: oCC 1.1 and newer require file ID capabilities on the ownCloud server,
-  hence using them with a server earlier than 4.5.0 is not supported.
+.. note:: ownCloud Client 1.1 and newer require file ID capabilities on the
+   ownCloud server, hence using them with a server earlier than 4.5.0 is
+   not supported.

-Before the 1.3.0 release of the client the sync process might create faux conflict 
-files if time deviates. The original and the conflict files only differed in the 
-timestamp, but not in content. This behaviour was changed towards a binary check 
-if the files are different.
+Before the 1.3.0 release of the client the sync process might create faux
+conflict files if time deviates. The original and the conflict files only
+differed in the timestamp, but not in content. This behaviour was changed
+towards a binary check if the files are different.

 Just like files, directories also hold a unique id, which changes whenever
 one of the contained files or directories gets modified. Since this is a
@@ -105,7 +107,8 @@ are involved and one of them is not in sync with NTP time.
 .. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag

 Comparison and Conflict Cases
----------------------------
+-----------------------------
+
 In a sync run the client first has to detect if one of the two repositories have
 changed files. On the local repository, the client traverses the file
 tree and compares the modification time of each file with the value it was 
@@ -118,25 +121,41 @@ For the remote (ie. ownCloud) repository, the client compares the ETag of each
 file with it's previous value. Again the previous value is queried from the
 database. If the ETag is still the same, the file has not changed.

-So what happens if a file has changed on both, the local and the remote repository 
-since the last sync run? That means it can not easily be decided which version
-of the file is the one that should be used. Moreover, changes to any side must
-not be lost. That is called the conflict case and the client solves it by creating 
-a conflict file of the older of the two files and save the newer one under the 
-original file name. Conflict files are always created on the client and never on
-the server. The conflict file has the same name as the original file appended
-with the timestamp of the conflict detection.
+In case a file has changed on both, the local and the remote repository since
+the last sync run, it can not easily be decided which version of the file is
+ the one that should be used. However, changes to any side must not be lost.
+
+That is called a **conflict case**. The client solves it by creating a conflict
+file of the older of the two files and save the newer one under the original
+file name. Conflict files are always created on the client and never on the
+server. The conflict file has the same name as the original file appended with
+the timestamp of the conflict detection.
+
+
+.. _ignored-files-label:
+
+Ignored Files
+-------------
+
+ownCloud Client will refuse to sync the following files:
+
+* Files matched by one of the pattern in :ref:`ignoredFilesEditor-label`
+* Files containing characters that do not work on certain file systems.
+  Currently, these characters are: `\, :, ?, *, ", >, <, |`
+* Files starting in ``.csync_journal.db`` (reserved for journalling)

 The Sync Journal
 ----------------
-The client stores the ETag number in a per-directory database, called the journal. 
-It is located in the application directory (until version 1.1) or as a hidden file 
-right in the directory to be synced (later versions). 

-If the journal database gets removed, oCC's CSync backend will rebuild the database
-by comparing the files and their modification times. Thus it should be made sure 
-that both server and client synchronized to NTP time before restarting the client 
-after a database removal. 
+The client stores the ETag number in a per-directory database,
+called the journal.  It is a hidden file right in the directory
+to be synced.

-The oCC also provides a button in the Settings Dialog that allows to "reset" the 
-journal. That can be used to recreate the journal database.
+If the journal database gets removed, ownCloud Client's CSync backend will
+rebuild the database by comparing the files and their modification times. Thus
+it should be made sure that both server and client synchronized with NTP time
+before restarting the client after a database removal.
+
+Pressing ``F5`` in the Account Settings Dialog that allows to "reset" the
+journal. That can be used to recreate the journal database. Use this only
+if advised to do so by the developer or support staff.
@@ -1,5 +1,7 @@
-Building the Client
-===================
+.. _building-label:
+
+Appendix A: Building the Client
+===============================

 This section explains how to build the ownCloud Client from source
 for all major platforms. You should read this section if you want
@@ -28,7 +28,7 @@ import sys, os
 extensions = ['sphinx.ext.todo']

 # Add any paths that contain templates here, relative to this directory.
-#templates_path = ['templates']
+templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/templates']

 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -95,7 +95,7 @@ pygments_style = 'sphinx'
 #html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = ['themes']
+html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/themes']

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -120,7 +120,7 @@ html_short_title = "Client Manual"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['static']
+html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -4,8 +4,8 @@ Glossary
 .. glossary::
   :sorted:

+   ownCloud Sync Client
   ownCloud Client
-   oCC
     Name of the official ownCloud syncing client for desktop, which runs on
     Windows, Mac OS X and Linux. It is based Mirall, and uses the CSync
     sync engine for synchronization with the ownCloud server.
@@ -23,6 +23,7 @@ Glossary
     exist in the client directory.

   unique id
+   ETag
     ID assigned to every file starting with ownCloud server 4.5 and submitted
     via the HTTP ``Etag``. Used to check if files on client and server have
     changed.
@@ -6,8 +6,11 @@ Contents
 .. toctree::
   :maxdepth: 2

-   install
-   usage 
+   introduction
+   accountsetup
+   visualtour
+   advancedusage
+
   building 
   architecture
   troubleshooting
@@ -1,36 +0,0 @@
-Installation
-============
-
-General
-------
-
-The latest version of ownCloud client can be obtained at
-http://owncloud.org/sync-clients/.
-
-Windows
-------
-
-ownCloud client for Windows is provided as a NSIS-based setup file for
-machine-wide install.
-
-Mac OS X
--------
-
-Installing the ownCloud client on your Mac follows the normal app installation
-pattern: 
-
-1. Download the installation file Click ownCloud-x.y.z.dmg, a window with the
-2. ownCloud icon opens In that window, drag the ownCloud application into the
-3. ‘Applications’ folder on the right hand side From ‘Applications’, choose
-   ownCloud
-
-Linux
------
-
-The ownCloud client is provided as in a convenient repository for a wide range
-of popular Linux distributions. If you want to build the sources instead.
-
-Supported distributions are CentOS/RHEL, Fedora, SLES, openSUSE, Ubuntu and
-Debian.
-
-To support other distributions, a source build is required.
@@ -0,0 +1,37 @@
+Introduction
+============
+
+This is the documentation for the ownCloud Sync Client, also referred to as
+the ownCloud Client.
+
+The ownCloud Sync Client is a desktop program you install on your computer.
+Specify one ore more directories on the local machine to sync your ownCloud
+server, and always have your latest files wherever you are. Make a change to the
+files on one computer, it will flow across the others using these desktop sync
+clients.
+
+ownCloud Client is available for Windows, Mac OS X and various Linux
+distributions. See below for details on how to obtain the Client.
+
+Obtaining the Client
+--------------------
+
+The latest version of the ownCloud Client can be obtained at
+http://owncloud.org/sync-clients/.
+
+ownCloud client for **Windows** is provided as a NSIS-based setup file for
+machine-wide install. Installing the ownCloud client on **Mac OS** follows
+the normal app bundle installation pattern:
+
+1. Download the installation file: Click ``ownCloud-x.y.z.dmg``, a window with
+   the ownCloud icon opens.
+2. In that window, drag the ownCloud application into the ``Applications``
+   folder.
+3. On the right hand side From ``Applications``, choose ``ownCloud``.
+
+The ownCloud Client is also provided as in a convenient repository for a wide
+range of popular **Linux distributions**. If you want to build the sources
+instead.
+
+Supported distributions are Fedora, openSUSE, Ubuntu and Debian.
+To support other distributions, a is required, see :ref:`building-label`
@@ -15,9 +15,6 @@ ownCloud Client supports the following command line switches:
 ``--logflush``
        flush the log file after every write.

-``--monoicons``
-        Use black/white pictograms for systray.
-
 ``--confdir`` `<dirname>`
        Use the given configuration directory.

@@ -1,5 +1,5 @@
-Troubleshooting
-===============
+Appendix C: Troubleshooting
+===========================

 If the client fails to start syncing it basically can have two
 basic reasons: Either the server setup has a problem or the client
@@ -55,6 +55,12 @@ ownCloud is not shared with other syncing apps.
          not be attempted. In the worst case, doing so can result in data
          loss.

+If some files do not get take a look at the sync protocol. Some files are
+automatically automatically being ignored because they are system files,
+others get ignored because their file name contains characters that cannot
+be represented on certain file systems. See :ref:`_ignored-files-label` for
+details.
+
 If you are operating your own server and use the local storage backend (the
 default), make sure that ownCloud has exclusive access to the directory.

@@ -65,13 +71,15 @@ If you are using a different backend, you can try to exclude a bug in the
 backend by reverting to the local backend.

 Logfiles
-========
+--------

 Doing effective debugging requires to provide as much as relevant logs as
 possible. The log output can help you with tracking down problem, and if you 
 report a bug, you're advised to include the output.

-:Client Logfile:
+Client Logfile
+~~~~~~~~~~~~~~
+
 Start the client with ``--logwindow``. That opens a window providing a view
 on the current log. It provides a Save button to let you save the log to a 
 file.
@@ -97,11 +105,14 @@ given expiry period.

 For example, for a long running test where you intend to keep the log data of the
 last two days, this would be the command line:
+
 ```
 owncloud --logdir /tmp/owncloud_logs --logexpire 48
 ```

-:ownCloud server Logfile:
+ownCloud server Logfile
+~~~~~~~~~~~~~~~~~~~~~~~
+
 The ownCloud server maintains an ownCloud specific logfile as well. It can and
 must be enabled through the ownCloud Administration page. There you can adjust
 the loglevel. It is advisable to set it to a verbose level like ``Debug`` or
@@ -110,7 +121,9 @@ the loglevel. It is advisable to set it to a verbose level like ``Debug`` or
 The logfile can be viewed either in the web interface or can be found in the
 filesystem in the ownCloud server data dir.

-:Webserver Logfiles:
+Webserver Logfiles
+~~~~~~~~~~~~~~~~~~
+
 Also, please take a look at your webservers error log file to check if there
 are problems. For Apache on Linux, the error logs usually can be found at
 ``/var/log/apache2``. A file called ``error_log`` shows errors like PHP code
@@ -1,95 +0,0 @@
-Usage
-=====
-.. index:: usage, client sync usage
-
-To start ownCloud Client, click on the desktop icon or start it from the
-application menu. In the system tray, an ownCloud icon appears.
-
-.. index:: start application
-
-Overview
--------
-
-ownCloud is represented by an icon in the Desktop's system tray, also known
-as notification area.
-
-The clients menu is accessed with a right click (Windows, Linux) or left click
-(Mac OS).
-
-The status of the current sync can be observed in the Status dialog, available
-trough the ``Open status...`` option. On Windows, a left click on the tray icon
-also opens the status dialog.
-
-.. note:: Until the intial setup has finished, the Connection Wizard will be
-          shown instead when left-clicking on Windows.
- 
-The dialog provides an overview on the configured sync folders and allows to add
-and remove more sync folder connections as well as pausing a sync connection.
-
-Changing Your Password and Account Settings
-------------------------------------------
-
-In the ``Settings`` Dialog, choose ``Account`` -> ``Modify Account``. It will open
-Setup Wizard, which next to reconfiguring your connection to use a different
-user or server also will allow to change the password for the local account,
-or to switch from HTTP to HTTPS.
-
-Setting up a Proxy
------------------
-
-By default, the configured system proxy will be picked up. This may not be
-working reliably on some Linux distributions, as only the ``http_proxy``
-variable gets picked up. You can configure a proxy different from your
-system default in the ``Network`` section of the ``Settings`` dialog.
-
-The default settings  assume an HTTP proxy, which is the typical use case.
-If you require SOCKS 5 proxy, pick ``SOCKS5 proxy`` instead of ``HTTP(S) proxy``
-from the drop down menu. SOCKS 5 proxies are typically provided by some
-SSH implementations, for instance OpenSSH's ``-D`` parameter. This is
-useful for scenarios where SSH is employed to securely tunnel a client
-to the network running the ownCloud server.
-
-Limiting Bandwidth
------------------
-
-Starting with Version 1.4, the Client provides bandwidth limiter.
-This option can be found in the ``Network`` section of the
-``Settings Dialog``.
-
-You will find two settings for ``Download Bandwidth`` and
-``Upload Bandwidth``.
-
-Upload Bandwidth
-~~~~~~~~~~~~~~~~
-
-The default is to automatically limit the upload. The rationale
-for this default is that typically, Computers and laptops are
-not directly connected to the server, but via a Cable Modems
-or DSL lines, which provide significantly more downstream than
-upstream bandwith. Sataurating the upstream bandwidth would
-interfere with other applications, especially Voice-Over-IP or
-Games.
-
-The automatic limiter will throttle the speed to about 75%
-of the available upstream bandwidth. If you are communicating
-with the server via a fast, symetric connection, you can set the
-Limiter to ``No Limit`` instead. If want a stronger limitation,
-choose ``Limit to`` and specify a limit manually.
-
-
-Download Bandwidth
-~~~~~~~~~~~~~~~~~~
-
-Because the download bandwidth is usually no concern, it is not
-automatically limited. Should you find that the Client is taking
-up too much bandwidth, you can manually specify a limit (in KB).
-
-Options
-------
-.. index:: command line switches, command line, options, parameters
-.. include:: options.rst
-
-Config File
-----------
-.. index:: config file
-.. include:: conffile.rst
@@ -0,0 +1,178 @@
+Visual Tour
+===========
+
+.. index:: visual tour, usage
+
+ownCloud Client stays in the background, and is visible as an
+icon in your system tray (Windows, KDE), status bar (Mac OS X)
+or notification area (Ubuntu), like so:
+
+.. image:: images/icon.png
+
+If a setup is still required, it will open the setup. Otherwise, the
+main menu is opened, which provides several options and displays
+progress information:
+
+.. image:: images/menu.png
+
+Here is an explanation of the individual items in the menu:
+
+* ``Open ownCloud in browser``: Opens the ownCloud web interface
+* ``Open folder 'ownCloud'``: Opens the local folder. If you have
+  defined multiple sync targets, you should see multiple entries
+  here.
+* **Disk space indicator**: Shows how much space is used up on the server.
+* Operation indicator: Shows the status of the current sync process, or
+  ``Up to date`` if server and client are in sync.
+* **Recent Changes**: shows the last six files modified by sync operations,
+  and provides access to the Sync Protocol, which lists all changes
+  since the last restart of ownCloud Client.
+* ``Settings...``: provides access to the settings menu.
+* ``Help``: Opens a browser to display this help.
+* ``Quit ownCloud``: Quits ownCloud, ending a currently running sync run.
+
+The settings dialog is split up in three categories: ``Account Settings``,
+``General Settings`` and ``Network Settings``:
+
+Account Settings
+~~~~~~~~~~~~~~~~
+
+.. index:: account settings, user, password, Server URL
+
+The ``Account Settings`` tab provides an executive summary about the synced
+folders in your account and allows to modify them. It also provides a more
+detailed report about the storage usage. Finally, it allows to change
+the files that ownCloud Client should ignore (for details, see the
+``Ignored Files Editor`` section below), and to modify various aspects
+of the current account settings, such as user name, password and server URL.
+
+.. image:: images/settings_account.png
+   :scale: 50 %
+
+General Settings
+~~~~~~~~~~~~~~~~
+
+.. index:: general settings, auto start, startup, desktop notifications
+
+The tab provides several useful options:
+
+.. image:: images/settings_general.png
+   :scale: 50 %
+
+* **Launch on System Startup**: This option is automatically activated
+  once a user has conimaged his account. Unchecking the box will cause
+  ownCloud client to not launch on startup for a particular user.
+* **Show Desktop Nofications**: Do not show bubble notifications whenever
+  a set of sync operations has been performed.
+* **Use Monochrome Icons**: Use less obstrusive icons. Especially useful
+  on Mac OS.
+
+The acout menu provides information about authors as well as detailed
+information about the build conditions. Those are particularly valuable
+when filing a bug report.
+
+Network Settings
+~~~~~~~~~~~~~~~~
+
+.. index:: proxy settings, SOCKS, bandwith, throttling, limiting
+
+This tab consollidates ``Proxy Settings`` and ``Bandwith Limiting``:
+
+.. image:: images/settings_network.png
+   :scale: 50 %
+
+Proxy Settings
+^^^^^^^^^^^^^^
+
+* ``No Proxy``: Check this if ownCloud Client should circumvent the default
+  proxy conimaged on the system.
+* ``Use system proxy``: Default, will follow the systems proxy settings.
+  On Linux, this will only pick up the value of the variable ``http_proxy``.
+* ``Specify proxy manually as``: Allows to specify custom proxy settings.
+  If you require to go through a HTTP(S) proxy server such as Squid or Microsoft
+  Forefront TMG, pick ``HTTP(S)``. ``SOCKSv5`` on the other hand is particulary
+  useful in special company LAN setups, or in combination with the OpenSSH
+  dynamic application level forwarding feature (see ``ssh -D``).
+* ``Host``: Enter the host name or IP address of your proxy server, followed
+  by the port number. HTTP proxies usually listen on Ports 8080 (default) or
+  3128. SOCKS server usually listen on port 1080.
+* ``Proxy Server requires authentication``: Should be checked if the proxy
+  server does not allow anonymous usage. If you check this option, you must
+  provide username and password in the fields below, or ownless Cloud will no
+  longer be able to connect successfully.
+
+Bandwidth Limiting
+^^^^^^^^^^^^^^^^^^
+
+The ``Download Bandwidth`` (i.e. the bandwidth available for data flowing
+from the ownCloud Server to the client) can be either ``Unlimited``
+(the default), or limited to a custom value, specified in bytes
+
+The ``Upload Bandwith`` (i.e. the bandwith available for data flowing
+from the ownCloud Client to the server) additionally has the option
+to ``Limit automatically``: When this option is checked, the ownCloud
+Client will surrender available upstream bandwith to other applications.
+Use this option if you expirience problems with real time communication,
+such as Skype or other VoIP software, in conjunction with ownCloud Client.
+This is commonly the case with asymmetric internet connection, such as
+certain DSL lines with very limited upstream capacity.
+
+ownCloud Client will pick up changes immediately, but ongoing operations
+will finish using the old settings.
+
+The Sync Protocol
+~~~~~~~~~~~~~~~~~
+
+.. index:: sync protocol
+
+The ``Sync Protocol`` window, which can be invoked from either from the main
+menu (``Recent Changes`` -> ``Details...``) or the ``Account Settings``
+(``Info`` button), will provide you with an in-depth summary of the recent
+sync activity. It will also show files that have not been synched (ignored
+files). Those are ignored either because they are listed in the ignored
+files list (see ``Ignored Files Editor`` section below), or because they
+cannot be synced in a cross-platform manner because they contain special
+characters that cannot be stored on certain file systems.
+
+.. image:: images/sync_protocol.png
+   :scale: 50 %
+
+.. _ignoredFilesEditor-label:
+
+The Ignored Files Editor
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. index:: ignored files, exclude files, pattern
+
+The ignored files editor allows adding patterns for files or directories
+that should be excluded from the sync process. Next to normal characters,
+wildcards can be used to match an arbitrary number of characters, designated
+by an asterisk (``*``) or a single character, designated by a question mark
+(``?``).
+
+Global defaults cannot be directly modified within the editor. Hovering
+with the mouse will reveal the location of the global exclude definition
+file.
+
+In addition to this list, ownCloud Client always excludes files with
+characters that cannot be synched down to other file systems,
+see :ref:`ignored-files-label`.
+
+.. note:: Modifying the global exclude definition file might render the
+   client unusable or cause undesired behavior.
+
+.. note:: Custom entries are currently not validated for syntactical
+   correctness by the editor, but might fail to load correctly.
+
+.. image:: images/ignored_files_editor.png
+   :scale: 50%
+
+Examples:
+^^^^^^^^^
+-----------+------------------------------+
+| Pattern   | Matches                      |
+===========+==============================+
+| ``~$*``   | ``~$foo``, ``~$example.doc`` |
+-----------+------------------------------+
+| ``fl?p``  | ``flip``, ``flap``           |
+-----------+------------------------------+
@@ -4,5 +4,5 @@ Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 GenericName=Folder Sync
-Icon=@APPLICATION_SHORTNAME@
+Icon=@APPLICATION_EXECUTABLE@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing
@@ -11,7 +11,7 @@ else()
    set(theme_dir ${CMAKE_CURRENT_SOURCE_DIR}/../theme)
 endif()

-set(synclib_NAME ${APPLICATION_SHORTNAME}sync)
+set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)

 set(mirall_UI
 mirall/folderwizardsourcepage.ui
@@ -168,8 +168,8 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
    )
    if(NOT WIN32)
        configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in
-		${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop)
-        install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop DESTINATION share/applications )
+		${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop)
+        install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop DESTINATION share/applications )
    endif()
 else()
    install(TARGETS ${synclib_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
@@ -254,7 +254,7 @@ set( final_src
 include( AddAppIconMacro )
 set(ownCloud_old ${ownCloud})

-kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon*.png")
+kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_EXECUTABLE}-icon*.png")
 list(APPEND final_src ${ownCloud})
 set(ownCloud ${ownCloud_old})

@@ -262,16 +262,15 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
    set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")

 if(NOT WIN32)
-    file( GLOB _icons "${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon-*.png" )
+    file( GLOB _icons "${theme_dir}/colored/${APPLICATION_EXECUTABLE}-icon-*.png" )
    foreach( _file ${_icons} )
-        string( REPLACE "${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon-" "" _res ${_file} )
+        string( REPLACE "${theme_dir}/colored/${APPLICATION_EXECUTABLE}-icon-" "" _res ${_file} )
        string( REPLACE ".png" "" _res ${_res} )
-        install( FILES ${_file} RENAME ${APPLICATION_SHORTNAME}.png DESTINATION
-${CMAKE_INSTALL_DATADIR}/icons/hicolor/${_res}x${_res}/apps )
+        install( FILES ${_file} RENAME ${APPLICATION_EXECUTABLE}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps )
    endforeach( _file )
 endif(NOT WIN32)

-    install(FILES ${mirall_I18N} DESTINATION share/${APPLICATION_SHORTNAME}/i18n)
+    install(FILES ${mirall_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}/i18n)

    # we may not add MACOSX_BUNDLE here, if not building one

@@ -39,7 +39,7 @@ int main(int argc, char **argv)
        }
        return 0;
    } else {
-        if (!QSystemTrayIcon::isSystemTrayAvailable()) {
+        if (!QSystemTrayIcon::isSystemTrayAvailable() && qgetenv("DESKTOP_SESSION") != "ubuntu") {
            QMessageBox::critical(0, qApp->translate("main.cpp", "System Tray not available"),
                                  qApp->translate("main.cpp", "%1 requires on a working system tray. "
                                  "If you are running XFCE, please follow "
@@ -40,7 +40,7 @@ namespace Mirall {

 static const char progressBarStyleC[] =
        "QProgressBar {"
-        "border: 2px solid grey;"
+        "border: 1px solid grey;"
        "border-radius: 5px;"
        "text-align: center;"
        "}"
@@ -671,15 +671,23 @@ void AccountSettings::slotHideProgress()

 void AccountSettings::slotUpdateQuota(qint64 total, qint64 used)
 {
-    ui->quotaProgressBar->setEnabled(true);
-    // workaround the label only accepting ints (which may be only 32 bit wide)
-    ui->quotaProgressBar->setMaximum(100);
-    int qVal = qRound(used/(double)total * 100);
-    if( qVal > 100 ) qVal = 100;
-    ui->quotaProgressBar->setValue(qVal);
-    QString usedStr = Utility::octetsToString(used);
-    QString totalStr = Utility::octetsToString(total);
-    ui->quotaLabel->setText(tr("%1 of %2 in use.").arg(usedStr, totalStr));
+    if( total > 0 ) {
+        ui->quotaProgressBar->setVisible(true);
+        ui->quotaInfoLabel->setVisible(true);
+        ui->quotaProgressBar->setEnabled(true);
+        // workaround the label only accepting ints (which may be only 32 bit wide)
+        ui->quotaProgressBar->setMaximum(100);
+        int qVal = qRound(used/(double)total * 100);
+        if( qVal > 100 ) qVal = 100;
+        ui->quotaProgressBar->setValue(qVal);
+        QString usedStr = Utility::octetsToString(used);
+        QString totalStr = Utility::octetsToString(total);
+        ui->quotaLabel->setText(tr("%1 of %2 in use.").arg(usedStr, totalStr));
+    } else {
+        ui->quotaProgressBar->setVisible(false);
+        ui->quotaInfoLabel->setVisible(false);
+        ui->quotaLabel->setText(tr("Currently there is no storage usage information available."));
+    }
 }

 void AccountSettings::slotIgnoreFilesEditor()
@@ -131,7 +131,7 @@
       </widget>
      </item>
      <item>
-       <widget class="QLabel" name="label_2">
+       <widget class="QLabel" name="quotaInfoLabel">
        <property name="text">
         <string>&lt;b&gt;Note:&lt;/b&gt; Some folders, including network mounted or shared folders, might have different limits.</string>
        </property>
@@ -16,6 +16,8 @@

 #include <iostream>

+#include "config.h"
+
 #include "mirall/application.h"
 #include "mirall/systray.h"
 #include "mirall/folder.h"
@@ -81,8 +83,7 @@ static const char optionsC[] =
 QString applicationTrPath()
 {
 #ifdef Q_OS_LINUX
-    // FIXME - proper path!
-    return QString::fromLatin1("/usr/share/%1/i18n/").arg(Theme::instance()->appName());
+    return QString::fromLatin1(DATADIR"/i18n/");
 #endif
 #ifdef Q_OS_MAC
    return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
@@ -183,6 +184,11 @@ Application::Application(int &argc, char **argv) :

 Application::~Application()
 {
+    if (_settingsDialog) {
+        delete _settingsDialog.data();
+    }
+
+    delete _logBrowser;
    delete _tray; // needed, see ctor

    qDebug() << "* Mirall shutdown";
@@ -408,7 +414,9 @@ void Application::setupContextMenu()
    _contextMenu->addMenu(_recentActionsMenu);
    _contextMenu->addSeparator();
    _contextMenu->addAction(_actionSettings);
-    _contextMenu->addAction(_actionHelp);
+    if (!_theme->helpUrl().isEmpty()) {
+        _contextMenu->addAction(_actionHelp);
+    }
    _contextMenu->addSeparator();

    _contextMenu->addAction(_actionQuit);
@@ -511,6 +519,9 @@ void Application::slotSetupProxy()
    default:
        break;
    }
+
+    FolderMan::instance()->setDirtyProxy(true);
+    FolderMan::instance()->slotScheduleAllFolders();
 }

 void Application::slotRefreshQuotaDisplay( qint64 total, qint64 used )
@@ -61,101 +61,98 @@ CSyncThread::~CSyncThread()

 //Convert an error code from csync to a user readable string.
 // Keep that function thread safe as it can be called from the sync thread or the main thread
-QString CSyncThread::csyncErrorToString(CSYNC_STATUS err, const char *errString )
+QString CSyncThread::csyncErrorToString( CSYNC_ERROR_CODE err, const char *errString )
 {
    QString errStr;

    switch( err ) {
-    case CSYNC_STATUS_OK:
+    case CSYNC_ERR_NONE:
        errStr = tr("Success.");
        break;
-    case CSYNC_STATUS_NO_LOCK:
+    case CSYNC_ERR_LOG:
+        errStr = tr("CSync Logging setup failed.");
+        break;
+    case CSYNC_ERR_LOCK:
        errStr = tr("CSync failed to create a lock file.");
        break;
-    case CSYNC_STATUS_STATEDB_LOAD_ERROR:
+    case CSYNC_ERR_STATEDB_LOAD:
        errStr = tr("CSync failed to load the state db.");
        break;
-    case CSYNC_STATUS_STATEDB_WRITE_ERROR:
-        errStr = tr("CSync failed to write the state db.");
-        break;
-    case CSYNC_STATUS_NO_MODULE:
+    case CSYNC_ERR_MODULE:
        errStr = tr("<p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p>").arg(Theme::instance()->appNameGUI());
        break;
-    case CSYNC_STATUS_TIMESKEW:
+    case CSYNC_ERR_TIMESKEW:
        errStr = tr("The system time on this client is different than the system time on the server. "
                    "Please use a time synchronization service (NTP) on the server and client machines "
                    "so that the times remain the same.");
        break;
-    case CSYNC_STATUS_FILESYSTEM_UNKNOWN:
+    case CSYNC_ERR_FILESYSTEM:
        errStr = tr("CSync could not detect the filesystem type.");
        break;
-    case CSYNC_STATUS_TREE_ERROR:
+    case CSYNC_ERR_TREE:
        errStr = tr("CSync got an error while processing internal trees.");
        break;
-    case CSYNC_STATUS_MEMORY_ERROR:
+    case CSYNC_ERR_MEM:
        errStr = tr("CSync failed to reserve memory.");
        break;
-    case CSYNC_STATUS_PARAM_ERROR:
+    case CSYNC_ERR_PARAM:
        errStr = tr("CSync fatal parameter error.");
        break;
-    case CSYNC_STATUS_UPDATE_ERROR:
+    case CSYNC_ERR_UPDATE:
        errStr = tr("CSync processing step update failed.");
        break;
-    case CSYNC_STATUS_RECONCILE_ERROR:
+    case CSYNC_ERR_RECONCILE:
        errStr = tr("CSync processing step reconcile failed.");
        break;
-    case CSYNC_STATUS_PROPAGATE_ERROR:
+    case CSYNC_ERR_PROPAGATE:
        errStr = tr("CSync processing step propagate failed.");
        break;
-    case CSYNC_STATUS_REMOTE_ACCESS_ERROR:
+    case CSYNC_ERR_ACCESS_FAILED:
        errStr = tr("<p>The target directory does not exist.</p><p>Please check the sync setup.</p>");
        break;
-    case CSYNC_STATUS_REMOTE_CREATE_ERROR:
-    case CSYNC_STATUS_REMOTE_STAT_ERROR:
+    case CSYNC_ERR_REMOTE_CREATE:
+    case CSYNC_ERR_REMOTE_STAT:
        errStr = tr("A remote file can not be written. Please check the remote access.");
        break;
-    case CSYNC_STATUS_LOCAL_CREATE_ERROR:
-    case CSYNC_STATUS_LOCAL_STAT_ERROR:
+    case CSYNC_ERR_LOCAL_CREATE:
+    case CSYNC_ERR_LOCAL_STAT:
        errStr = tr("The local filesystem can not be written. Please check permissions.");
        break;
-    case CSYNC_STATUS_PROXY_ERROR:
+    case CSYNC_ERR_PROXY:
        errStr = tr("CSync failed to connect through a proxy.");
        break;
-    case CSYNC_STATUS_PROXY_AUTH_ERROR:
-        errStr = tr("CSync could not authenticate at the proxy.");
-        break;
-    case CSYNC_STATUS_LOOKUP_ERROR:
+    case CSYNC_ERR_LOOKUP:
        errStr = tr("CSync failed to lookup proxy or server.");
        break;
-    case CSYNC_STATUS_SERVER_AUTH_ERROR:
+    case CSYNC_ERR_AUTH_SERVER:
        errStr = tr("CSync failed to authenticate at the %1 server.").arg(Theme::instance()->appNameGUI());
        break;
-    case CSYNC_STATUS_CONNECT_ERROR:
+    case CSYNC_ERR_AUTH_PROXY:
+        errStr = tr("CSync failed to authenticate at the proxy.");
+        break;
+    case CSYNC_ERR_CONNECT:
        errStr = tr("CSync failed to connect to the network.");
        break;
-    case CSYNC_STATUS_TIMEOUT:
+    case CSYNC_ERR_TIMEOUT:
        errStr = tr("A network connection timeout happend.");
        break;
-    case CSYNC_STATUS_HTTP_ERROR:
+    case CSYNC_ERR_HTTP:
        errStr = tr("A HTTP transmission error happened.");
        break;
-    case CSYNC_STATUS_PERMISSION_DENIED:
-        errStr = tr("CSync failed due to not handled permission deniend.");
+    case CSYNC_ERR_PERM:
+        errStr = tr("CSync: Permission deniend.");
        break;
-    case CSYNC_STATUS_NOT_FOUND:
-        errStr = tr("CSync failed to find a specific file.");
+    case CSYNC_ERR_NOT_FOUND:
+        errStr = tr("CSync: File not found.");
        break;
-    case CSYNC_STATUS_FILE_EXISTS:
-        errStr = tr("CSync tried to create a directory that already exists.");
+    case CSYNC_ERR_EXISTS:
+        errStr = tr("CSync: Directory already exists.");
        break;
-    case CSYNC_STATUS_OUT_OF_SPACE:
-        errStr = tr("CSync: No space on %1 server available.").arg(Theme::instance()->appNameGUI());
+    case CSYNC_ERR_NOSPC:
+        errStr = tr("CSync: No space left on %1 server.").arg(Theme::instance()->appNameGUI());
        break;
-    case CSYNC_STATUS_QUOTA_EXCEEDED:
-        errStr = tr("CSync: No space on %1 server available.").arg(Theme::instance()->appNameGUI());
-        break;
-    case CSYNC_STATUS_UNSUCCESSFUL:
-        errStr = tr("CSync unspecified error.");
+    case CSYNC_ERR_UNSPEC:
+        errStr = tr("CSync: unspecified error.");

    default:
        errStr = tr("An internal error number %1 happend.").arg( (int) err );
@@ -190,7 +187,9 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
    item._file = QString::fromUtf8( file->path );
    item._instruction = file->instruction;
    item._dir = SyncFileItem::None;
-
+    if(file->error_string) {
+        item._errorString = QString::fromUtf8(file->error_string);
+    }
    SyncFileItem::Direction dir;

    int re = 0;
@@ -298,15 +297,16 @@ struct CSyncRunScopeHelper {
 };

 void CSyncThread::handleSyncError(CSYNC *ctx, const char *state) {
-    int err = csync_get_status( ctx );
-    const char *errMsg = csync_get_status_string( ctx );
-    QString errStr = csyncErrorToString( (CSYNC_STATUS)err, errMsg);
+    CSYNC_ERROR_CODE err = csync_get_error( ctx );
+    const char *errMsg = csync_get_error_string( ctx );
+    QString errStr = csyncErrorToString(err, errMsg);
    qDebug() << " #### ERROR during "<< state << ": " << errStr;
-
-    if( CSYNC_STATUS_IS_EQUAL( err, CSYNC_STATUS_SERVICE_UNAVAILABLE ) ||
-            CSYNC_STATUS_IS_EQUAL( err, CSYNC_STATUS_CONNECT_ERROR )) {
+    switch (err) {
+    case CSYNC_ERR_SERVICE_UNAVAILABLE:
+    case CSYNC_ERR_CONNECT:
        emit csyncUnavailable();
-    } else {
+        break;
+    default:
        emit csyncError(errStr);
    }
 }
@@ -40,7 +40,7 @@ public:
    CSyncThread(CSYNC *);
    ~CSyncThread();

-    static QString csyncErrorToString( CSYNC_STATUS, const char * );
+    static QString csyncErrorToString( CSYNC_ERROR_CODE, const char * );

    Q_INVOKABLE void startSync();

@@ -35,7 +35,8 @@

 namespace Mirall {

-void csyncLogCatcher(int /*verbosity*/,
+void csyncLogCatcher(CSYNC */*ctx*/,
+                     int /*verbosity*/,
                     const char */*function*/,
                     const char *buffer,
                     void */*userdata*/)
@@ -91,8 +92,8 @@ bool Folder::init()
        slotCSyncError(tr("Unable to create csync-context"));
        _csync_ctx = 0;
    } else {
-        csync_set_log_callback( csyncLogCatcher );
-        csync_set_log_level( 11 );
+        csync_set_log_callback(   _csync_ctx, csyncLogCatcher );
+        csync_set_log_verbosity(_csync_ctx, 11);

        MirallConfigFile cfgFile;
        csync_set_config_dir( _csync_ctx, cfgFile.configPath().toUtf8() );
@@ -102,9 +103,8 @@ bool Folder::init()
        cfgFile.getCredentials()->syncContextPreInit(_csync_ctx);

        if( csync_init( _csync_ctx ) < 0 ) {
-            qDebug() << "Could not initialize csync!" << csync_get_status(_csync_ctx) << csync_get_status_string(_csync_ctx);
-            slotCSyncError(CSyncThread::csyncErrorToString((CSYNC_STATUS) csync_get_status(_csync_ctx),
-                                                           csync_get_status_string(_csync_ctx)));
+            qDebug() << "Could not initialize csync!" << csync_get_error(_csync_ctx) << csync_get_error_string(_csync_ctx);
+            slotCSyncError(CSyncThread::csyncErrorToString(csync_get_error(_csync_ctx), csync_get_error_string(_csync_ctx)));
            csync_destroy(_csync_ctx);
            _csync_ctx = 0;
        }
@@ -205,7 +205,7 @@ void Folder::setSyncEnabled( bool doit )
      _syncResult.clearErrors();
      evaluateSync( QStringList() );
  } else {
-      // disable folder. Done through the _enabled-flag set above
+      _pollTimer.stop();
  }
 }

@@ -297,11 +297,21 @@ void Folder::bubbleUpSyncResult()
                    newItems++;
                    if (firstItemNew.isEmpty())
                        firstItemNew = item;
+
+                    if (item._type == SyncFileItem::Directory) {
+                        _watcher->addPath(path() + item._file);
+                    }
+
                    break;
                case CSYNC_INSTRUCTION_REMOVE:
                    removedItems++;
                    if (firstItemDeleted.isEmpty())
                        firstItemDeleted = item;
+
+                    if (item._type == SyncFileItem::Directory) {
+                        _watcher->removePath(path() + item._file);
+                    }
+
                    break;
                case CSYNC_INSTRUCTION_UPDATED:
                    updatedItems++;
@@ -488,6 +498,8 @@ void Folder::setProxy()
        csync_set_module_property(_csync_ctx, "proxy_port", &proxyPort );
        csync_set_module_property(_csync_ctx, "proxy_user", proxy.user().toUtf8().data()     );
        csync_set_module_property(_csync_ctx, "proxy_pwd" , proxy.password().toUtf8().data() );
+
+        FolderMan::instance()->setDirtyProxy(false);
    }
 }

@@ -526,6 +538,8 @@ void Folder::startSync(const QStringList &pathList)
            QMetaObject::invokeMethod(this, "slotCSyncFinished", Qt::QueuedConnection);
            return;
        }
+    } else if (FolderMan::instance()->isDirtyProxy()) {
+        setProxy();
    }

    if (_thread && _thread->isRunning()) {
@@ -37,7 +37,8 @@ FolderMan* FolderMan::_instance = 0;

 FolderMan::FolderMan(QObject *parent) :
    QObject(parent),
-    _syncEnabled( true )
+    _syncEnabled( true ),
+    _dirtyProxy( true )
 {
    // if QDir::mkpath would not be so stupid, I would not need to have this
    // duplication of folderConfigPath() here
@@ -109,6 +109,9 @@ public slots:

    void slotScheduleAllFolders();

+    bool isDirtyProxy() { return _dirtyProxy; }
+    void setDirtyProxy(bool value = true) { _dirtyProxy = value; }
+
 private slots:
    // slot to add a folder to the syncing queue
    void slotScheduleSync( const QString & );
@@ -136,6 +139,7 @@ private:
    QString        _currentSyncFolder;
    bool           _syncEnabled;
    QQueue<QString> _scheduleQueue;
+    bool            _dirtyProxy; // If the proxy need to be re-configured

    explicit FolderMan(QObject *parent = 0);
    static FolderMan *_instance;
@@ -172,5 +172,16 @@ void FolderWatcher::changeDetected(const QString& f)
    setProcessTimer();
 }

+void FolderWatcher::addPath(const QString &path )
+{
+    _d->addPath(path);
+}
+
+void FolderWatcher::removePath(const QString &path )
+{
+    _d->removePath(path);
+}
+
+
 } // namespace Mirall

@@ -88,6 +88,15 @@ public:
    void setEventInterval(int seconds);

    QStringList ignores() const;
+
+    /**
+     * Not all backends are recursive by default.
+     * Those need to be notified when a directory is added or removed while the watcher is disabled.
+     * This is a no-op for backend that are recursive
+     */
+    void addPath(const QString&);
+    void removePath(const QString&);
+
 public slots:
    /**
     * Enabled or disables folderChanged() events.
@@ -50,8 +50,7 @@ void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path)
    qDebug() << "(+) Watcher:" << path;

    if (!_inotify->addPath(path)) {
-        FolderWatcher *fw = qobject_cast<FolderWatcher*>(parent());
-        emit fw->error(tr("Could not monitor directories due to system limitations.\n"
+        emit _parent->error(tr("Could not monitor directories due to system limitations.\n"
                          "The application will not work reliably. Please check the\n"
                          "documentation for possible fixes."));
    }
@@ -119,9 +118,8 @@ void FolderWatcherPrivate::slotINotifyEvent(int mask, int /*cookie*/, const QStr
    }
    else if (mask & IN_DELETE) {
        //qDebug() << cookie << " DELETE: " << path;
-        if ( QFileInfo(path).isDir() && _inotify->directories().contains(path) ) {
-            qDebug() << "(-) Watcher:" << path;
-            _inotify->removePath(path);
+        if ( QFileInfo(path).isDir() ) {
+            removePath(path);
        }
    }
    else if (mask & IN_CLOSE_WRITE) {
@@ -160,4 +158,13 @@ void FolderWatcherPrivate::slotINotifyEvent(int mask, int /*cookie*/, const QStr
    _parent->setProcessTimer();
 }

+void FolderWatcherPrivate::removePath(const QString &path )
+{
+    if (_inotify->directories().contains(path) ) {
+        qDebug() << "(-) Watcher:" << path;
+        _inotify->removePath(path);
+    }
+}
+
+
 } // namespace Mirall
@@ -26,6 +26,8 @@ class FolderWatcherPrivate : public QObject {
    Q_OBJECT
 public:
    FolderWatcherPrivate(FolderWatcher *p);
+    void addPath(const QString &path) { slotAddFolderRecursive(path);  }
+    void removePath(const QString &);
 signals:
    void error(const QString& error);
 private slots:
@@ -31,6 +31,9 @@ public:
    FolderWatcherPrivate(FolderWatcher *p);
    ~FolderWatcherPrivate();

+    void addPath(const QString &) {}
+    void removePath(const QString &) {}
+
    void startWatching();
    void doNotifyParent();

@@ -48,6 +48,10 @@ class FolderWatcherPrivate : public QObject {
 public:
    FolderWatcherPrivate(FolderWatcher *p);
    ~FolderWatcherPrivate();
+
+    void addPath(const QString &) {}
+    void removePath(const QString &) {}
+
 private:
    FolderWatcher *_parent;
    WatcherThread *_thread;
@@ -53,12 +53,9 @@ GeneralSettings::GeneralSettings(QWidget *parent) :

    // OEM themes are not obliged to ship mono icons, so there
    // is no point in offering an option
-    QString themeDir = QString::fromLatin1(":/mirall/theme/1%1/")
+    QString themeDir = QString::fromLatin1(":/mirall/theme/%1/")
            .arg(Theme::instance()->systrayIconFlavor(true));
-    if (QDir(themeDir).exists())
-    {
-        _ui->monoIconsCheckBox->setVisible(false);
-    }
+    _ui->monoIconsCheckBox->setVisible(QDir(themeDir).exists());

 }

@@ -116,22 +116,28 @@ void ItemProgressDialog::setSyncResult( const SyncResult& result )
             columns << item._file;
             columns << folder;
             if( item._instruction == CSYNC_INSTRUCTION_IGNORE) {
-                 if( item._type == SyncFileItem::File ) {
-                     errMsg = tr("File ignored.");
-                     tooltip = tr("The file was ignored because it is listed in the clients ignore list\n"
-                                  "or the filename contains characters that are not syncable\nin a cross platform "
-                                  "environment.");
-                 } else if( item._type == SyncFileItem::Directory ){
-                     errMsg = tr("Directory ignored.");
-                     tooltip = tr("The directory was ignored because it is listed in the clients\nignore list "
-                                  "or the directory name contains\ncharacters that are not syncable in a cross  "
-                                  "platform environment.");
-                 } else if( item._type == SyncFileItem::SoftLink ) {
-                     errMsg = tr("Soft Link ignored.");
+                 if( item._type == SyncFileItem::SoftLink ) {
+                     errMsg = tr("Soft Link ignored");
                     tooltip = tr("Softlinks break the semantics of synchronization.\nPlease do not "
-                                  "use them in synced directories.");
+                                  "use them in synced directories");
                 } else {
-                     errMsg = tr("Ignored.");
+                     QString obj = tr("file");
+                     if( item._type == SyncFileItem::Directory ) {
+                         obj = tr("directory");
+                     }
+                     tooltip = tr("The %1 was ignored because it is listed in the clients ignore list\n"
+                                  "or the %1 name contains characters that are not syncable\nin a cross platform "
+                                  "environment").arg(obj);
+                     errMsg = tr("Item ignored");
+                     if( item._errorString == QLatin1String("File listed on ignore list.") ) {
+                         errMsg = tr("%1 on ignore list").arg(obj);
+                         tooltip = tr("The %1 was skipped because it is listed on the clients\n"
+                                      "list of names to ignore").arg(obj);
+                     } else if( item._errorString == QLatin1String("File contains invalid characters.") ) {
+                         errMsg = tr("Invalid characters");
+                         tooltip = tr("The %1 name contains one or more invalid characters which break\n"
+                                      "syncing in a cross platform environment").arg(obj);
+                     }
                 }
             } else if(  item._instruction == CSYNC_INSTRUCTION_CONFLICT ) {
                 errMsg = tr("Conflict file.");
@@ -149,7 +155,7 @@ void ItemProgressDialog::setSyncResult( const SyncResult& result )
             twitem->setToolTip(0, longTimeStr);
             twitem->setToolTip(3, tooltip);
             twitem->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Problem, true));
-             _ui->_treeWidget->addTopLevelItem(twitem);
+             _ui->_treeWidget->insertTopLevelItem(0, twitem);

         }
    }
@@ -203,28 +209,22 @@ void ItemProgressDialog::copyToClipboard()

    int topLevelItems = _ui->_treeWidget->topLevelItemCount();
    for (int i = 0; i < topLevelItems; i++) {
-        QTreeWidgetItem *item = _ui->_treeWidget->topLevelItem(i);
-        ts << left << qSetFieldWidth(0)
-           << item->data(0, Qt::DisplayRole).toString()
-           << endl;
-        int childItems = item->childCount();
-        for (int j = 0; j < childItems; j++) {
-            QTreeWidgetItem *child =item->child(j);
-                // time stamp
-            ts << left << qSetFieldWidth(10)
-               << child->data(0,Qt::DisplayRole).toString()
-                  // file name
-               << qSetFieldWidth(50)
-               << child->data(1,Qt::DisplayRole).toString()
-                  // action
-               << qSetFieldWidth(15)
-               << child->data(2, Qt::DisplayRole).toString()
-                  // size
-               << qSetFieldWidth(10)
-               << child->data(3, Qt::DisplayRole).toString()
-               << qSetFieldWidth(0)
-               << endl;
-        }
+        QTreeWidgetItem *child = _ui->_treeWidget->topLevelItem(i);
+        // time stamp
+        ts << left << qSetFieldWidth(10)
+            << child->data(0,Qt::DisplayRole).toString()
+                // file name
+            << qSetFieldWidth(64)
+            << child->data(1,Qt::DisplayRole).toString()
+            << qSetFieldWidth(0) << ' '
+                // action
+            << qSetFieldWidth(15)
+            << child->data(3, Qt::DisplayRole).toString()
+                // size
+            << qSetFieldWidth(10)
+            << child->data(4, Qt::DisplayRole).toString()
+            << qSetFieldWidth(0)
+            << endl;
    }

    QApplication::clipboard()->setText(text);
@@ -294,7 +294,7 @@ void ItemProgressDialog::slotProgressErrors( const QString& folder, const Progre
  // by error_code. A quota problem is considered an error, others might not??
  item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Error, true));
  item->setToolTip(0, longTimeStr);
-  _ui->_treeWidget->addTopLevelItem(item);
+  _ui->_treeWidget->insertTopLevelItem(0, item);
  Q_UNUSED(item);
 }

@@ -325,7 +325,7 @@ void ItemProgressDialog::slotProgressInfo( const QString& folder, const Progress

    QTreeWidgetItem *item = new QTreeWidgetItem(columns);
    item->setToolTip(0, longTimeStr);
-    _ui->_treeWidget->addTopLevelItem(item);
+    _ui->_treeWidget->insertTopLevelItem(0, item);
    Q_UNUSED(item);
 }

@@ -39,9 +39,6 @@
       <property name="uniformRowHeights">
        <bool>true</bool>
       </property>
-       <property name="sortingEnabled">
-        <bool>true</bool>
-       </property>
       <property name="columnCount">
        <number>4</number>
       </property>
@@ -128,6 +128,8 @@ LogBrowser::LogBrowser(QWidget *parent) :

 LogBrowser::~LogBrowser()
 {
+    MirallConfigFile cfg;
+    cfg.saveGeometry(this);
 }

 void LogBrowser::slotNewLog( const QString& msg )
@@ -227,11 +229,4 @@ void LogBrowser::slotClearLog()
    _logWidget->clear();
 }

-void LogBrowser::closeEvent(QCloseEvent *event)
-{
-    MirallConfigFile cfg;
-    cfg.saveGeometry(this);
-    QWidget::closeEvent(event);
-}
-
 } // namespace
@@ -47,9 +47,6 @@ public:

    void setLogFile(const QString& , bool );

-protected:
-    void closeEvent(QCloseEvent *event);
-
 protected slots:
    void slotNewLog( const QString &msg );
    void slotFind();
@@ -193,7 +193,7 @@ QString MirallConfigFile::excludeFile(Scope scope) const
            fi.setFile( QApplication::applicationDirPath(), exclFile );
 #endif
 #ifdef Q_OS_UNIX
-            fi.setFile( QString("/etc/%1").arg(Theme::instance()->appName()), exclFile );
+            fi.setFile( QString( SYSCONFDIR "/%1").arg(Theme::instance()->appName()), exclFile );
 #endif
 #ifdef Q_OS_MAC
            // exec path is inside the bundle
@@ -595,7 +595,7 @@ QString MirallConfigFile::proxyPassword() const

 int MirallConfigFile::useUploadLimit() const
 {
-    return getValue(useUploadLimitC, QString::null, -1).toInt();
+    return getValue(useUploadLimitC, QString::null, 0).toInt();
 }

 bool MirallConfigFile::useDownloadLimit() const
@@ -229,7 +229,7 @@
      <item row="0" column="0" colspan="2">
       <widget class="QRadioButton" name="noDownloadLimitRadioButton">
        <property name="text">
-         <string>No Limit</string>
+         <string>No limit</string>
        </property>
        <property name="checked">
         <bool>true</bool>
@@ -254,6 +254,12 @@
   </item>
   <item row="1" column="1">
    <widget class="QGroupBox" name="groupBox_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
     <property name="title">
      <string>Upload Bandwidth</string>
     </property>
@@ -261,7 +267,7 @@
      <item row="0" column="0" colspan="2">
       <widget class="QRadioButton" name="noUploadLimitRadioButton">
        <property name="text">
-         <string>No Limit</string>
+         <string>No limit</string>
        </property>
       </widget>
      </item>
@@ -237,8 +237,9 @@ void ownCloudInfo::slotGetQuotaFinished()
 {
    bool ok = false;
    QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
+    int http_result_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();

-    if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 207) {
+    if (http_result_code == 207) {
        // Parse DAV response
        QXmlStreamReader reader(reply);
        reader.addExtraNamespaceDeclaration(QXmlStreamNamespaceDeclaration("d", "DAV:"));
@@ -271,6 +272,7 @@ void ownCloudInfo::slotGetQuotaFinished()
        emit quotaUpdated(total, quotaUsedBytes);
        _lastEtag = etag;
    } else {
+        qDebug() << "Quota request *not* successful, http result code is " << http_result_code;
        _lastQuotaTotalBytes = 0;
        _lastQuotaUsedBytes = 0;
    }
@@ -33,15 +33,6 @@ ownCloudTheme::ownCloudTheme()
    // qDebug() << " ** running ownCloud theme!";
 }

-QString ownCloudTheme::appName() const
-{
-    /* If this is changed, existing configs are not found any more
-     * because the value is used by QDesktopServices to find the config
-     * file. Be aware.
-     */
-    return QLatin1String("ownCloud");
-}
-
 QString ownCloudTheme::configFileName() const
 {
    return QLatin1String("owncloud.cfg");
@@ -25,7 +25,6 @@ class ownCloudTheme : public Theme
 public:
    ownCloudTheme();

-    virtual QString appName() const;
    QString configFileName() const;
    QString about() const;
    QPixmap splashScreen() const;
@@ -66,7 +66,6 @@ SettingsDialog::SettingsDialog(Application *app, QWidget *parent) :
    NetworkSettings *networkSettings = new NetworkSettings;
    _ui->stack->addWidget(networkSettings);
    connect(networkSettings, SIGNAL(proxySettingsChanged()), app, SLOT(slotSetupProxy()));
-    connect(networkSettings, SIGNAL(proxySettingsChanged()), FolderMan::instance(), SLOT(slotScheduleAllFolders()));

    //connect(generalSettings, SIGNAL(resizeToSizeHint()), SLOT(resizeToSizeHint()));

@@ -102,6 +101,9 @@ SettingsDialog::SettingsDialog(Application *app, QWidget *parent) :

 SettingsDialog::~SettingsDialog()
 {
+    MirallConfigFile cfg;
+    cfg.saveGeometry(this);
+
    delete _ui;
 }

@@ -114,13 +116,6 @@ void SettingsDialog::addAccount(const QString &title, QWidget *widget)

 }

-void SettingsDialog::closeEvent(QCloseEvent *event)
-{
-    MirallConfigFile cfg;
-    cfg.saveGeometry(this);
-    QWidget::closeEvent(event);
-}
-
 void SettingsDialog::slotUpdateAccountState()
 {
    FolderMan *folderMan = FolderMan::instance();
@@ -41,9 +41,6 @@ public:

    void addAccount(const QString &title, QWidget *widget);

-protected:
-    void closeEvent(QCloseEvent *event);
-
 protected slots:
    void slotUpdateAccountState();

@@ -6,15 +6,24 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>704</width>
-    <height>299</height>
+    <width>693</width>
+    <height>457</height>
   </rect>
  </property>
  <property name="windowTitle">
   <string>Settings</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
    <number>0</number>
   </property>
   <property name="spacing">
@@ -78,7 +78,12 @@ QString Theme::statusHeaderText( SyncResult::Status status ) const

 QString Theme::appNameGUI() const
 {
-    return appName();
+    return QLatin1String(APPLICATION_NAME);
+}
+
+QString Theme::appName() const
+{
+    return QLatin1String(APPLICATION_SHORTNAME);
 }

 QString Theme::version() const
@@ -239,8 +244,6 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const
        statusIcon = QLatin1String("state-sync");
        break;
    case SyncResult::SyncPrepare:
-        statusIcon = QLatin1String("state-sync");
-        break;
    case SyncResult::Success:
        statusIcon = QLatin1String("state-ok");
        break;
@@ -48,7 +48,8 @@ public:
     * Use and redefine this if the human readable name contains spaces,
     * special chars and such.
     *
-     * By default, appName() is returned.
+     * By default, the name is derived from the APPLICATION_NAME
+     * cmake variable.
     *
     * @return QString with human readable app name.
     */
@@ -61,9 +62,16 @@ public:
     * it is used for config files etc. If you need a more sophisticated
     * name in the GUI, redefine appNameGUI.
     *
+     * By default, the name is derived from the APPLICATION_SHORTNAME
+     * cmake variable, and should be the same. This method is only
+     * reimplementable for legacy reasons.
+     *
+     * Warning: Do not modify this value, as many things, e.g. settings
+     * depend on it! You most likely want to modify \ref appNameGUI().
+     *
     * @return QString with app name.
     */
-    virtual QString appName() const = 0;
+    virtual QString appName() const;

    /**
     * @brief configFileName
@@ -17,6 +17,7 @@

 #include <QCoreApplication>
 #include <QSettings>
+#include <QTextStream>
 #include <QDir>
 #include <QFile>
 #include <QUrl>
@@ -102,33 +103,30 @@ void Utility::setupFavLink(const QString &folder)

 QString Utility::octetsToString( qint64 octets )
 {
-    static const qint64 kb = 1024;
-    static const qint64 mb = 1024 * kb;
-    static const qint64 gb = 1024 * mb;
-    static const qint64 tb = 1024 * gb;
+    static const qint64 kb = 1000;
+    static const qint64 mb = 1000 * kb;
+    static const qint64 gb = 1000 * mb;
+    static const qint64 tb = 1000 * gb;

+    QString s;
+    qreal value = octets;
    if (octets >= tb) {
-        if (octets < 10*tb) {
-            return compactFormatDouble(qreal(octets)/qreal(tb), 1, QLatin1String("TB"));
-        }
-        return QString::number(qRound64(qreal(octets)/qreal(tb))) + QLatin1String(" TB");
+        s = QCoreApplication::translate("Utility", "%L1 TB");
+        value /= tb;
    } else if (octets >= gb) {
-        if (octets < 10*gb) {
-            return compactFormatDouble(qreal(octets)/qreal(gb), 1, QLatin1String("GB"));
-        }
-        return QString::number(qRound64(qreal(octets)/qreal(gb))) + QLatin1String(" GB");
+        s = QCoreApplication::translate("Utility", "%L1 GB");
+        value /= gb;
    } else if (octets >= mb) {
-        if (octets < 10*mb) {
-            return compactFormatDouble(qreal(octets)/qreal(mb), 1, QLatin1String("MB"));
-        }
-        return QString::number(qRound64(qreal(octets)/qreal(mb))) + QLatin1String(" MB");
+        s = QCoreApplication::translate("Utility", "%L1 MB");
+        value /= mb;
    } else if (octets >= kb) {
-        return QString::number(qRound64(qreal(octets)/qreal(kb))) + QLatin1String(" KB");
-    } else if (octets == 1){
-        return QLatin1String("1 byte");
-    } else {
-        return QString::number(octets) + QLatin1String(" bytes");
+        s = QCoreApplication::translate("Utility", "%L1 kB");
+        value /= kb;
+    } else  {
+        s = QCoreApplication::translate("Utility", "%L1 B");
    }
+
+    return (value > 9.95)  ? s.arg(qRound(value)) : s.arg(value, 0, 'g', 2);
 }

 // Qtified version of get_platforms() in csync_owncloud.c
@@ -286,16 +284,24 @@ void Utility::setLaunchOnStartup(const QString &appName, const QString& guiName,
            qDebug() << "Could not create autostart directory";
            return;
        }
-        QSettings desktopFile(desktopFileLocation, QSettings::IniFormat);
-        desktopFile.beginGroup("Desktop Entry");
-        desktopFile.setValue(QLatin1String("Name"), guiName);
-        desktopFile.setValue(QLatin1String("GenericName"), QLatin1String("File Synchronizer"));
-        desktopFile.setValue(QLatin1String("Exec"), QCoreApplication::applicationFilePath());
-        desktopFile.setValue(QLatin1String("Terminal"), false);
-        desktopFile.setValue(QLatin1String("Icon"), appName);
-        desktopFile.setValue(QLatin1String("Categories"), QLatin1String("Network"));
-        desktopFile.setValue(QLatin1String("StartupNotify"), false);
-        desktopFile.endGroup();
+        QFile iniFile(desktopFileLocation);
+        if (!iniFile.open(QIODevice::WriteOnly)) {
+            qDebug() << "Could not write auto start entry" << desktopFileLocation;
+            return;
+        }
+        QTextStream ts(&iniFile);
+        ts.setCodec("UTF-8");
+        ts << QLatin1String("[Desktop Entry]") << endl
+           << QLatin1String("Name=") << guiName << endl
+           << QLatin1String("GenericName=") << QLatin1String("File Synchronizer") << endl
+           << QLatin1String("Exec=") << QCoreApplication::applicationFilePath() << endl
+           << QLatin1String("Terminal=") << "false" << endl
+           << QLatin1String("Icon=") << appName << endl
+           << QLatin1String("Categories=") << QLatin1String("Network") << endl
+           << QLatin1String("Type=") << QLatin1String("Application") << endl
+           << QLatin1String("StartupNotify=") << "false" << endl
+           << QLatin1String("X-GNOME-Autostart-enabled=") << "true" << endl
+            ;
    } else {
        if (!QFile::remove(desktopFileLocation)) {
            qDebug() << "Could not remove autostart desktop file";
@@ -34,6 +34,9 @@
     <property name="alignment">
      <set>Qt::AlignCenter</set>
     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
    </widget>
   </item>
   <item>
@@ -108,6 +108,12 @@
     <property name="text">
      <string>TextLabel</string>
     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
    </widget>
   </item>
   <item row="4" column="0" colspan="3">
@@ -121,7 +127,6 @@
  <zorder>horizontalSpacer</zorder>
  <zorder>verticalSpacer</zorder>
  <zorder>horizontalSpacer_2</zorder>
-  <zorder>horizontalLayoutWidget</zorder>
  <zorder>topLabel</zorder>
  <zorder>bottomLabel</zorder>
 </widget>
@@ -19,6 +19,9 @@
     <property name="text">
      <string>TextLabel</string>
     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
    </widget>
   </item>
   <item row="1" column="0">
@@ -1,6 +1,5 @@
 *.filepart
 *~
-*.bak
 *.part
 *.crdownload

@@ -17,10 +16,6 @@ csync_journal.db.ctmp
 desktop.ini

 *.kate-swp
-*.aux
-*.nav
-*.out
-*.toc

 *_conflict-*
 ]*.~*
@@ -10,7 +10,7 @@ macro(owncloud_add_test test_class)
    add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${${OWNCLOUD_TEST_CLASS}_MOCS})

    target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
-        ${APPLICATION_SHORTNAME}sync
+        ${APPLICATION_EXECUTABLE}sync
        ${QT_QTTEST_LIBRARY}
        ${QT_QTCORE_LIBRARY}
    )
@@ -26,33 +26,51 @@ private slots:
    }
    void testOctetsToString()
    {
-        QVERIFY(octetsToString(1) == "1 byte");
-        QVERIFY(octetsToString(2) == "2 bytes");
-        QVERIFY(octetsToString(1024) == "1 KB");
-        QVERIFY(octetsToString(1024*1024) == "1 MB");
-        QVERIFY(octetsToString(1024LL*1024*1024) == "1 GB");
-        QVERIFY(octetsToString(1024LL*1024*1024*1024) == "1 TB");
+        QCOMPARE(octetsToString(999) , QString("999 B"));
+        QCOMPARE(octetsToString(1000) , QString("1 kB"));
+        QCOMPARE(octetsToString(1010) , QString("1 kB"));
+        QCOMPARE(octetsToString(1110) , QString("1.1 kB"));
+
+        QCOMPARE(octetsToString(9110) , QString("9.1 kB"));
+        QCOMPARE(octetsToString(9910) , QString("9.9 kB"));
+        QCOMPARE(octetsToString(9999) , QString("10 kB"));
+
+        QCOMPARE(octetsToString(123456) , QString("123 kB"));
+        QCOMPARE(octetsToString(1234567) , QString("1.2 MB"));
+        QCOMPARE(octetsToString(12345678) , QString("12 MB"));
+        QCOMPARE(octetsToString(123456789) , QString("123 MB"));
+        QCOMPARE(octetsToString(1000LL*1000*1000 * 5) , QString("5 GB"));
+
+        QCOMPARE(octetsToString(1), QString("1 B"));
+        QCOMPARE(octetsToString(2), QString("2 B"));
+        QCOMPARE(octetsToString(1024), QString("1 kB"));
+        QCOMPARE(octetsToString(1024*1024), QString("1 MB"));
+        QCOMPARE(octetsToString(1024LL*1024*1024), QString("1.1 GB"));
+        QCOMPARE(octetsToString(1024LL*1024*1024*1024), QString("1.1 TB"));
    }

    void testLaunchOnStartup()
    {
- 	const QString appName = "testLaunchOnStartup";
- 	const QString guiName = "LaunchOnStartup GUI Name";
+        qsrand(QDateTime::currentDateTime().toTime_t());
+        QString postfix = QString::number(qrand());

-	QVERIFY(hasLaunchOnStartup(appName) == false);
-	setLaunchOnStartup(appName, guiName, true);
-	QVERIFY(hasLaunchOnStartup(appName) == true);
-	setLaunchOnStartup(appName, guiName, false);
-	QVERIFY(hasLaunchOnStartup(appName) == false);
+        const QString appName = QString::fromLatin1("testLaunchOnStartup.%1").arg(postfix);
+        const QString guiName = "LaunchOnStartup GUI Name";
+
+        QVERIFY(hasLaunchOnStartup(appName) == false);
+        setLaunchOnStartup(appName, guiName, true);
+        QVERIFY(hasLaunchOnStartup(appName) == true);
+        setLaunchOnStartup(appName, guiName, false);
+        QVERIFY(hasLaunchOnStartup(appName) == false);
    }

    void testToCSyncScheme()
    {
-	QVERIFY(toCSyncScheme("http://example.com/owncloud/") ==
+        QVERIFY(toCSyncScheme("http://example.com/owncloud/") ==
                              "owncloud://example.com/owncloud/");
-	QVERIFY(toCSyncScheme("https://example.com/owncloud/") ==
+        QVERIFY(toCSyncScheme("https://example.com/owncloud/") ==
                              "ownclouds://example.com/owncloud/");
-}
+    }
 };

 #endif
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Sincronització iniciada</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Ajuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Obre la carpeta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Actualitzat</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Fitxers gestionats:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>No hi ha fitxers de sincronització configurats</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync ha fallat en no implementar el permís denegat.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync ha fallat en trobar un fitxer específic.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync ha intentat crear una carpeta que ja existeix.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: No hi ha espai disponible al servidor %1.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Error inespecífic de CSync.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Error</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>El fil de CSync ha acabat.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation type="unfinished"/>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Estat indefinit.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Espera per començar la sincronització.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>S&apos;està sincronitzant.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>La darrera sincronització va ser correcta.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Error de configuració.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>TextLabel</translation>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>Desa el fitxer de registre al disc per depuració</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Error</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;El fitxer &apos;%1&apos;&lt;br/&gt;no es pot obrir en mode escriptura.&lt;br/&gt;&lt;br/&gt;La sortida del registre &lt;b&gt;no&lt;/b&gt; es pot desar!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Desa el fitxer de registre</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>No s&apos;ha pogut escriure el fitxer de registre</translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1913,6 +1928,34 @@ name</source>
        <translation>Connexió SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1929,7 +1972,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation type="unfinished"/>
@@ -1938,12 +1981,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1954,13 +1997,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Baixa</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Puja</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1992,7 +2035,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>esborrat</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2026,7 +2069,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>elimina</translation>
    </message>
 </context>
 <context>
@@ -2034,22 +2077,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Estat indefinit</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Pendent d&apos;iniciar la sincronització</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>La sincronització s&apos;està executant</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Sincronització amb èxit</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2059,12 +2102,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Error de sincronització - Feu clic al botó per més detalls.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Error de configuració</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -171,7 +171,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="453"/>
        <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Připojeno k &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="454"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>Synchronizace %1 zahájena</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>Synchronizace zahájena pro %n nastavený adresář.</numerusform><numerusform>Synchronizace zahájena pro %n nastavené adresáře.</numerusform><numerusform>Synchronizace zahájena pro %n nastavených adresářů.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Otevřít %1 v prohlížeči</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Počítám kvóty...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Neznámý stav</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Nastavení...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Podrobnosti...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Nápověda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation>Ukončit %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Otevřít složku %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation>%1% z %2 v používání</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Aktuální</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Nic.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Poslední změny</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Spravované složky:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Otevřít složku &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Kvóta nedostupná</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation>Žádné položky nebyly nedávno synchronizovány</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Synchronizuji %1 z %2 (%3 z %4)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Složka %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Nejsou nastaveny žádné synchronizované složky.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync selhalo z důvodu nezpracovaného odmítnutí práv.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation>CSync: Přístup zamítnut.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync se nezdařilo najít požadovaný soubor.</translation>
+        <source>CSync: File not found.</source>
+        <translation>CSync: Soubor nenalezen.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync se pokusilo vytvořit adresář, který již existuje.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation>CSync: Adresář již existuje.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Nedostatek volného místa na serveru %1.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation>CSync: Nedostatek místa na serveru %1.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Nespecifikovaná chyba CSync.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation>CSync: neznámá chyba.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -536,87 +536,87 @@
    <message>
        <location filename="../src/mirall/folder.cpp" line="291"/>
        <source>File %1</source>
-        <translation type="unfinished"/>
+        <translation>Soubor %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
-        <translation>je k dispozici nový soubor</translation>
+        <translation>Je k dispozici nový soubor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation>&apos;%1&apos; byl sesynchronizován na tento počítač.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation>Jsou k dispozici nové soubory</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation><numerusform>&apos;%1&apos; a další %n soubor(y) byl sesynchronizován na tento počítač.</numerusform><numerusform>&apos;%1&apos; a další %n soubor(y) byly sesynchronizovány na tento počítač.</numerusform><numerusform>&apos;%1&apos; a dalších %n soubor(ů) bylo sesynchronizováno na tento počítač.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation>Soubor odebrán</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation>&apos;%1&apos; bylo odebráno.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation>Soubory odebrány</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation><numerusform>&apos;%1&apos; a další %n soubor(y) byly odebrány.</numerusform><numerusform>&apos;%1&apos; a další %n soubor(y) byly odebrány.</numerusform><numerusform>&apos;%1&apos; a dalších %n soubor(ů) bylo odebráno.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation>Soubor aktualizován</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation>&apos;%1&apos; byl aktualizován.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation>Soubory aktualizovány</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation><numerusform>&apos;%1&apos; a další %n soubor(y) byly aktualizovány.</numerusform><numerusform>&apos;%1&apos; a další %n soubor(y) byly aktualizovány.</numerusform><numerusform>&apos;%1&apos; a dalších %n soubor(ů) bylo aktualizováno.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Chyba</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Vlákno CSync ukončeno.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>Tato synchronizace by smazala všechny soubory v místní složce &apos;%1&apos;
 Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte &quot;Ponechat soubory&quot;. Pokud chcete místní data odstranit, zvolte &quot;Odstranit všechny soubory&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -625,17 +625,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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Odstranit všechny soubory?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Odstranit všechny soubory</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Ponechat soubory</translation>
    </message>
@@ -643,57 +643,57 @@ Opravdu chcete provést tuto akci?</translation>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Nelze obnovit stav složky</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Byl nalezen starý záznam synchronizace &apos;%1&apos;, ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Nedefinovaný stav.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Vyčkává na spuštění synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Příprava na synchronizaci.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Synchronizace probíhá.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Server je nyní nedostupný.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Poslední synchronizace byla úspěšná.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Chyba nastavení.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronizace je pozastavena)</translation>
    </message>
@@ -720,13 +720,13 @@ Opravdu chcete provést tuto akci?</translation>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
        <translation>Nelze sledovat složky kvůli systémovým omezením.
-Aplikace nebude pracovat spolehlivě. Zkontrolujte prosím
-dokumentaci pro možnost opravy.</translation>
+Aplikace nebude pracovat správně. Řiďte se prosím
+dokumentací pro možnost opravy.</translation>
    </message>
 </context>
 <context>
@@ -921,17 +921,17 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
        <translation>Detailní protokol synchronizace</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>Textový štítek</translation>
    </message>
@@ -972,56 +972,74 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>Soubor ignorován.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>Adresář ignorován.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>soubor</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
+        <translation>adresář</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>Symbolický odkaz ignorován.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>Ignorováno.</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation>Soubor s konfliktem.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
 name</source>
-        <translation type="unfinished"/>
+        <translation>Soubor byl změněn na serveru i na lokálním disku, na základě čehož
+byl vytvořen tzv. soubor s konfliktem. Změny v lokálním souboru budou
+zkopírovány do souboru s konfliktem, přičemž soubor ze serveru bude
+dostupný pod původním názvem</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="231"/>
@@ -1082,23 +1100,23 @@ name</source>
        <translation>Uložit soubor záznamu na disk pro ladění.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Chyba</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Soubor &apos;%1&apos;&lt;br/&gt;nelze otevřít pro zápis.&lt;br/&gt;&lt;br/&gt;Výstup záznamu &lt;b&gt;nelze&lt;/b&gt; uložit.&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Uložit log</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Nemohu zapisovat do log souboru</translation>
    </message>
@@ -1152,29 +1170,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Omezit na</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBytů/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation>Bez limitu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Rychlost odesílání</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Omezovat automaticky</translation>
    </message>
@@ -1219,7 +1237,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="57"/>
        <source>Connect...</source>
-        <translation type="unfinished"/>
+        <translation>Připojit...</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="107"/>
@@ -1234,7 +1252,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="116"/>
        <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 v tomto nastavení, nastavení složek bude zapomenuto a bude vytvořena synchronizace jedné kořenové složky!&lt;/small&gt;&lt;/p&gt;</translation>
+        <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="123"/>
@@ -1323,7 +1341,7 @@ name</source>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="114"/>
        <source>Trying to connect to %1 at %2 to determine authentication type...</source>
-        <translation>Pokouším se připojit k %1 na %2 pro zjištění typ ověření...</translation>
+        <translation>Pokouším se připojit k %1 na %2 pro zjištění typu ověření...</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="162"/>
@@ -1920,6 +1938,34 @@ name</source>
        <translation>SSL spojení</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation>%L1 TB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation>%L1 GB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation>%L1 MB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation>%L1 kB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation>%L1 B</translation>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1936,7 +1982,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Pokud zatím nemáte ownCloud server, získáte více informací na &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt;</translation>
@@ -1945,12 +1991,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Sestaveno z Gitu revize &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; na %3, %4 s použitím OCsync %5 a Qt %6.&lt;/small&gt;&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation>&lt;p&gt;Verze %2. Pro více informací navštivte &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Vytvořili Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.&lt;br&gt;Založeno na Mirall od Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</translation>
    </message>
@@ -1961,79 +2007,79 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Stáhnout</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Odeslat</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
        <source>Context</source>
-        <translation type="unfinished"/>
+        <translation>Kontext</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
        <source>Inactive</source>
-        <translation type="unfinished"/>
+        <translation>Neaktivní</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>Spuštění</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
        <source>Finished</source>
-        <translation type="unfinished"/>
+        <translation>Dokončeno</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
        <source>For deletion</source>
-        <translation type="unfinished"/>
+        <translation>Ke smazání</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>smazáno</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
        <source>downloading</source>
-        <translation type="unfinished"/>
+        <translation>stahování</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
        <source>uploading</source>
-        <translation type="unfinished"/>
+        <translation>odesílání</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
        <source>inactive</source>
-        <translation type="unfinished"/>
+        <translation>neaktivní</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
        <source>starting</source>
-        <translation type="unfinished"/>
+        <translation>spouštění</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
        <source>finished</source>
-        <translation type="unfinished"/>
+        <translation>dokončeno</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>smazat</translation>
    </message>
 </context>
 <context>
@@ -2041,47 +2087,47 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Nedefinovaný stav</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Čekám na zahájení synchronizace</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizace běží</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizace úspěšná</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
        <source>Sync Success, problems with individual files.</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizace úspěšná, problémy u jednotlivých souborů.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Chyba synchronizace - klikněte na informační tlačítko pro podrobnosti.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Chyba nastavení</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
        <source>The server is currently unavailable</source>
-        <translation type="unfinished"/>
+        <translation>Server je momentálně nedostupný</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation type="unfinished"/>
+        <translation>Připravuji na synchronizaci</translation>
    </message>
 </context>
 </TS>
@@ -172,7 +172,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="453"/>
        <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Verbunden mit &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="454"/>
@@ -228,112 +228,112 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Sync gestartet</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>Synchronisation wurde für %n konfigurierten Sync-Ordner gestartet.</numerusform><numerusform>Synchronisation wurde für %n konfigurierte Sync-Ordner gestartet.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>%1 im Browser öffnen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Berechne Quote...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Unbekannter Status</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Einstellungen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Details...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Hilfe</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
-        <translation>Beenden %1</translation>
+        <translation>%1 beenden</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Ordner %1 öffnen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation>%1% von %2 benutzt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Aktuell</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Keine.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Letzte Änderungen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Verwaltete Ordner:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Ordner &apos;%1&apos; öffnen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Quote unbekannt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation>Keine kürzlich synchronisierten Elemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Synchronisiere %1 von %2 (%3 von %4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Ordner %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Keine Sync-Ordner konfiguriert.</translation>
    </message>
@@ -457,28 +457,28 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation>CSync: Berechtigung verweigert.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync konnte eine bestimmte Datei nicht finden.</translation>
+        <source>CSync: File not found.</source>
+        <translation>CSync: Datei nicht gefunden.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync versuchte, ein Verzeichnis zu erstellen, welches bereits existiert.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation>CSync: Verzeichnis existiert bereits.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Kein Platz auf Server %1 frei.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation>CSync: Nicht genügend Speicherplatz auf %1 Server verfügbar.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>CSync unbekannter Fehler.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation>CSync: unbekannter Fehler.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -537,87 +537,87 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
    <message>
        <location filename="../src/mirall/folder.cpp" line="291"/>
        <source>File %1</source>
-        <translation type="unfinished"/>
+        <translation>Datei %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation>Neue Datei verfügbar</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation>&apos;%1&apos; wurde mit diesem Gerät synchronisiert.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation>Neue Dateien sind verfügbar</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation><numerusform>&apos;%1&apos; und %n andere Datei(en) wurde(n) mit diesem Gerät synchronisiert.</numerusform><numerusform>&apos;%1&apos; und %n andere Datei(en) wurde(n) mit diesem Gerät synchronisiert.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation>Datei gelöscht</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation>&apos;%1&apos; wurde gelöscht.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation>Dateien gelöscht</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation><numerusform>%1&apos; und %n andere Datei(en) wurden entfernt.</numerusform><numerusform>%1&apos; und %n andere Datei(en) wurden entfernt.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation>Datei aktualisiert</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation>&apos;%1&apos; wurde aktualisiert.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation>Dateien aktualisiert</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation><numerusform>%1&apos; und %n andere Datei(en) wurden aktualisiert.</numerusform><numerusform>%1&apos; und %n andere Datei(en) wurden aktualisiert.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Fehler</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Der CSync-Thread wurde beendet.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner &apos;%1&apos; entfernen.
 Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie &quot;Dateien behalten&quot;. Wenn Sie ihre Daten löschen wollen, wählen Sie &quot;Alle Dateien entfernen&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -626,17 +626,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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Alle Dateien löschen?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Lösche alle Dateien</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Dateien behalten</translation>
    </message>
@@ -644,57 +644,57 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Ein altes Synchronisations-Journal &apos;%1&apos; wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Undefinierter Zustand.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Wartet auf Beginn der Synchronistation</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Synchronisation wird vorbereitet.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Synchronisation läuft.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Der Server ist momentan nicht erreichbar.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Die letzte Synchronisation war erfolgreich.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Setup-Fehler.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronisation ist pausiert)</translation>
    </message>
@@ -721,7 +721,7 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -922,17 +922,17 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
        <translation>Detailliertes Synchronisationsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>Textfeld</translation>
    </message>
@@ -973,56 +973,71 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>Datei ignoriert.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>Verzeichnis ignoriert.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>Symbolische Verknüpfung ignoriert</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>Ignoriert.</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation>Konfliktdatei.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
 name</source>
-        <translation type="unfinished"/>
+        <translation>Die Datei wurde sowohl auf dem Server als auch im lokalen Repository geändert und verursacht somit einen Konflikt. Die lokalen Änderungen wurden in die Konflikt-Datei kopiert während die Änderungen vom Server in der Datei mit dem Original-Namen zu finden sind.</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="231"/>
@@ -1083,23 +1098,23 @@ name</source>
        <translation>Speichere die Protokolldatei zur Fehleranalyse</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Fehler</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Datei &apos;%1&apos;&lt;br/&gt;kann nicht zum Schreiben geöffnet werden.&lt;br/&gt;&lt;br/&gt;Die Protokolldatei kann &lt;b&gt;nicht&lt;/b&gt; gespeichert werden!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Log-Datei speichern</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Log-Datei konnte nicht geschrieben werden</translation>
    </message>
@@ -1153,29 +1168,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Begrenzen auf</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBytes/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation>Keine Begrenzung</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Upload-Bandbreite</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Automatisch begrenzen</translation>
    </message>
@@ -1220,7 +1235,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="57"/>
        <source>Connect...</source>
-        <translation type="unfinished"/>
+        <translation>Verbinde...</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="107"/>
@@ -1921,6 +1936,34 @@ name</source>
        <translation>SSL-Verbindung</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation>%L1 TB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation>%L1 GB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation>%L1 MB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation>%L1 kB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation>%L1 B</translation>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1937,7 +1980,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Wenn Sie noch keinen ownCloud-Server haben, informieren Sie sich unter &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt;.</translation>
@@ -1946,12 +1989,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Erstellt aus Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; vom %3, %4 mit OCsync %5 und Qt %6.&lt;/small&gt;&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation>&lt;p&gt;Version %2. Für mehr Informationen besuchen Sie &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt; Von Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc., &lt;br&gt; Basierend auf Mirall von Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</translation>
    </message>
@@ -1962,79 +2005,79 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Herunterladen</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Hochladen</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
        <source>Context</source>
-        <translation type="unfinished"/>
+        <translation>Kontext</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
        <source>Inactive</source>
-        <translation type="unfinished"/>
+        <translation>Inaktiv</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>Start</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
        <source>Finished</source>
-        <translation type="unfinished"/>
+        <translation>Abgeschlossen</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
        <source>For deletion</source>
-        <translation type="unfinished"/>
+        <translation>Zu löschen</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>gelöscht</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
        <source>downloading</source>
-        <translation type="unfinished"/>
+        <translation>Herunterladen</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
        <source>uploading</source>
-        <translation type="unfinished"/>
+        <translation>Lade hoch</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
        <source>inactive</source>
-        <translation type="unfinished"/>
+        <translation>Inaktiv</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
        <source>starting</source>
-        <translation type="unfinished"/>
+        <translation>Starte</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
        <source>finished</source>
-        <translation type="unfinished"/>
+        <translation>abgeschlossen</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>löschen</translation>
    </message>
 </context>
 <context>
@@ -2042,47 +2085,47 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Status undefiniert</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Warte, um mit der Synchronistation zu beginnen</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Sync läuft</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Sync erfolgreich</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
        <source>Sync Success, problems with individual files.</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisierung abgeschlossen, Probleme mit einzelnen Dateien.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Sync-Fehler - Klicken Sie auf den Info-Knopf für weitere Informationen</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Setup-Fehler</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
        <source>The server is currently unavailable</source>
-        <translation type="unfinished"/>
+        <translation>Der Server ist vorübergehend nicht erreichbar.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisation wird vorbereitet</translation>
    </message>
 </context>
 </TS>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Ο συγχρονισμος ξεκινησε</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Άνοιγμα %1 στον περιηγητή</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Άγνωστη κατάσταση</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Ρυθμίσεις...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Λεπτομέρειες...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Βοήθεια</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Άνοιγμα %1 φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Ενημερωμένο</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Πρόσφατες Αλλαγές</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Διαχείριση αρχείων:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Άνοιγμα καταλόγου &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Συγχρονισμός %1 από %2 (%3 από %4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Φάκελος %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync απέτυχε λόγω μη γίνεται deniend άδεια. </translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>Το CSync απέτυχε να βρει ένα συγκεκριμένο αρχείο. </translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>Το CSync προσπαθησε να δημιουργησει εναν χωρο αποθηκευσης που υπηρχε ηδη.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Δεν υπαρχει διαθεσιμος χωρος στον %1 διακομιστη.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>CSync αγνωστο σφαλμα.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Σφάλμα</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Η διεργασία CSync τερματίζεται.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Αφαίρεση Όλων των Αρχείων;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Αφαίρεση όλων των αρχείων</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Διατήρηση αρχείων</translation>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Απροσδιόριστη κατάσταση.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Αναμονή έναρξης συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Προετοιμασία για συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Ο συγχρονισμός εκτελείται.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Σφάλμα Ρύθμισης.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>TextLabel</translation>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>Αποθήκευση του αρχείου καταγραφών στον δίσκο, για αποσφαλμάτωση. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Σφάλμα</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Το αρχειο &apos;%1&apos;&lt;br/&gt;δεν μπορει να ανοιχθει για το γραψιμο.&lt;br/&gt;&lt;br/&gt;Το αρχείο καταγραφής δεν &lt;b&gt;μπορεί&lt;/b&gt; να αποθηκευτεί!&lt;/nobr&gt; </translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Αποθήκευση αρχείου συμβάντων</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Δεν ήταν δυνατή η εγγραφή στο αρχείο συμβάντων</translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBytes/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
-        <translation>Χωρίς Όριο</translation>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1913,6 +1928,34 @@ name</source>
        <translation>Σύνδεση SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1929,7 +1972,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Εάν δεν έχετε ένα διακομιστή ownCloud, δείτε στην διεύθυνση &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; για περισσότερες πληροφορίες.</translation>
@@ -1938,12 +1981,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1954,13 +1997,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Λήψη</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Μεταφόρτωση</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1992,7 +2035,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>διαγράφηκε</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2026,7 +2069,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>διαγραφή</translation>
    </message>
 </context>
 <context>
@@ -2034,22 +2077,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Απροσδιόριστη κατάσταση</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Αναμονή έναρξης συγχρονισμού</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Ο Συγχρονισμός Εκτελείται</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Επιτυχημένος Συγχρονισμός</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2059,12 +2102,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα στην ενημέρωση - Κάντε click για λεπτομέρειες. </translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα Ρυθμίσεων</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -229,12 +229,12 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -242,102 +242,102 @@
        </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -461,27 +461,27 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
+        <source>CSync: Permission deniend.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
+        <source>CSync: File not found.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
+        <source>CSync: Directory already exists.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
+        <source>CSync: No space left on %1 server.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
+        <source>CSync: unspecified error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@@ -544,22 +544,22 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -567,22 +567,22 @@
        </translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -590,22 +590,22 @@
        </translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -613,40 +613,40 @@
        </translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder &apos;%1&apos;.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation type="unfinished"></translation>
    </message>
@@ -654,57 +654,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"></translation>
    </message>
@@ -731,7 +731,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -928,17 +928,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation type="unfinished"></translation>
    </message>
@@ -979,51 +979,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1089,23 +1104,23 @@ name</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation type="unfinished"></translation>
    </message>
@@ -1159,29 +1174,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1927,6 +1942,34 @@ name</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1943,7 +1986,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation type="unfinished"></translation>
@@ -1952,12 +1995,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"></translation>
    </message>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>Sincronización %1 iniciada</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>Iniciada la sincronización de %n carpeta de sincronización configurada.</numerusform><numerusform>Iniciada la sincronización de %n carpetas de sincronización configuradas.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Abrir %1 en el navegador</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Calculando cuota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Estado desconocido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Configuraciones...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Detalles...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Ayuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation>Cancelar %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Abrir carpeta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation>%1% de %2 en uso</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Actualizado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Ninguno.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Cambios recientes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Carpetas administradas:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Abrir carpeta &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Cuota no disponible</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Archivo %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>No hay carpetas de sincronización configuradas.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync: Falló debido a un permiso denegado.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync: Falló en encontrar un archivo especifico.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync trató de crear un directorio que ya existe.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: No queda espacio disponible en el servidor %1.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Error no especificado de CSync</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,84 +539,84 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation>Nuevo archivo disponible</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation>&apos;%1&apos; ha sido sincronizado con este equipo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation>Nuevos archivos disponibles</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation><numerusform>&apos;%1&apos; y %n archivos adicionales han sido sincronizados con este equipo.</numerusform><numerusform>&apos;%1&apos; y %n archivos adicionales han sido sincronizados con este equipo.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation>Archivo eliminado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation>&apos;%1&apos; ha sido eliminado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation>Archivos eliminados</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation><numerusform>&apos;%1&apos; y %n archivos adicionales han sido eliminados.</numerusform><numerusform>&apos;%1&apos; y %n archivos adicionales han sido eliminados.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation>Archivo actualizado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation>&apos;%1&apos; ha sido actualizado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation>Archivos actualizados</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation><numerusform>&apos;%1&apos; y %n archivos adicionales han sido actualizados.</numerusform><numerusform>&apos;%1&apos; y %n archivos adicionales han sido actualizados.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Error</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Terminó el hilo Csync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización &apos;%1&apos;.
 Si ud. o su administrador han restablecido su cuenta en el servidor, elija &quot;Conservar Archivos&quot;. Si desea eliminar toda su información, elija &quot;Eliminar todos los archivos&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -625,17 +625,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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Eliminar todos los archivos?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Eliminar todos los archivos</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Conservar archivos</translation>
    </message>
@@ -643,57 +643,57 @@ Está seguro de que desea realizar esta operación?</translation>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>No se ha podido restablecer el estado de la carpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Una antigua jornada sincronizada &apos;%1&apos; se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Estado no definido.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Esperando el inicio de la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Preparándose para sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Sincronización en funcionamiento.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>El servidor no está disponible en el momento</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>La última sincronización fue exitosa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>La última sincronización fue exitosa pero con advertencias para archivos individuales.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Error de configuración.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Sincronización en pausa)</translation>
    </message>
@@ -720,7 +720,7 @@ Está seguro de que desea realizar esta operación?</translation>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -919,17 +919,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>Texto de un etiqueta</translation>
    </message>
@@ -970,51 +970,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>Archivo ignorado.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>Carpeta ignorada.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>archivo</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
-        <translation type="unfinished"/>
+        <source>directory</source>
+        <translation>carpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>Ignorado.</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1080,23 +1095,23 @@ name</source>
        <translation>Guardar el archivo de registro a un archivo en disco para depuración.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Error</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Archivo &apos;%1&apos;&lt;br/&gt;no se puede abrir para escritura.&lt;br/&gt;&lt;br/&gt;¡El archivo de registro &lt;b&gt;no&lt;/b&gt; puede ser guardado!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Guardar archivo de registro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>No se pudo escribir al archivo de registro</translation>
    </message>
@@ -1150,29 +1165,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Limitar a</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBytes/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
-        <translation>Sin límite</translation>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Acho de banda de subida</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Limitar automáticamente</translation>
    </message>
@@ -1918,6 +1933,34 @@ name</source>
        <translation>Conexión SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1934,7 +1977,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Si aún no tiene un servidor ownCloud, visite &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; para obtener más información.</translation>
@@ -1943,12 +1986,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation>&lt;p&gt;Versión %2. Para más información visite &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.&lt;br&gt;Basado en Mirall por Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</translation>
    </message>
@@ -1959,13 +2002,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Descargar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Subir</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1997,7 +2040,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>borrado</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2031,7 +2074,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>eliminar</translation>
    </message>
 </context>
 <context>
@@ -2039,22 +2082,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Estado indefinido</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Esperando para comenzar la sincronización</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Sincronización ejecutándose</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Sincronización exitosa</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2064,12 +2107,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Error de sincronización - Pulse el botón de información para obtener más detalles.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Error de instalación</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -65,22 +65,22 @@
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="20"/>
        <source>Account Maintenance</source>
-        <translation type="unfinished"/>
+        <translation>Mantenimiento de cuenta</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="29"/>
        <source>Edit Ignored Files</source>
-        <translation type="unfinished"/>
+        <translation>Editar Archivos ignorados</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="36"/>
        <source>Modify Account</source>
-        <translation type="unfinished"/>
+        <translation>Modificar Cuenta</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="46"/>
        <source>Sync Status</source>
-        <translation type="unfinished"/>
+        <translation>Estado de la sincronización</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="52"/>
@@ -191,7 +191,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="581"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>Inicio</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="590"/>
@@ -201,7 +201,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="597"/>
        <source>Completely</source>
-        <translation type="unfinished"/>
+        <translation>Completamente</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="629"/>
@@ -211,7 +211,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="632"/>
        <source>Completely finished.</source>
-        <translation type="unfinished"/>
+        <translation>Completamente terminado.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="639"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>Sincronización de %1 iniciada</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Ayuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Abrir directorio %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>actualizado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Directorios administrados:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Directorio %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Los directorios de sincronización no están configurados.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync: Falló debido a un permiso denegado.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync: Falló en encontrar un archivo especifico.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>Csync trató de crear un directorio que ya existía.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: No hay más espacio disponible en el servidor %1.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Error no especificado de CSync</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Error</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>El proceso CSync finalizó.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation type="unfinished"/>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>No se pudo  </translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Una antigua sincronización con journaling &apos;%1&apos; fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Estado no definido.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Esperando el comienzo de la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
-        <translation type="unfinished"/>
+        <translation>Preparando la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Sincronización en funcionamiento.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
-        <translation type="unfinished"/>
+        <translation>El servidor actualmente no está disponible.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>La última sincronización fue exitosa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Error de configuración.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -701,7 +701,7 @@ Are you sure you want to perform this operation?</source>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/>
        <source>File</source>
-        <translation type="unfinished"/>
+        <translation>Archivo</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="200"/>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,24 +914,24 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>EtiquetaDeTexto</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/>
        <source>File</source>
-        <translation type="unfinished"/>
+        <translation>Archivo</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>Guardar el log en un archivo en disco para depuración.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Error</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt;no puede ser abierto para escritura.&lt;br/&gt;&lt;br/&gt;¡El archivo de log &lt;b&gt;no&lt;/b&gt; puede ser guardado!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Guardar archivo de log</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>No fue posible escribir al archivo de log</translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1914,6 +1929,34 @@ name</source>
        <translation>Conexión SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1930,7 +1973,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Si todavía no tenés un servidor ownCloud, visitá &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; para obtener más información.</translation>
@@ -1939,12 +1982,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1955,13 +1998,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Descargar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Subir</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1977,7 +2020,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>Inicio</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
@@ -1993,7 +2036,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>borrado</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2027,7 +2070,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>borrar</translation>
    </message>
 </context>
 <context>
@@ -2035,22 +2078,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Estado indefinido</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Esperando para comenzar sincronización</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Sincronización en ejecución</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Sincronización Exitosa</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2060,12 +2103,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Error de sincronización - Pulsá el botón de información para obtener más detalles.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Error de instalación</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Sinkronizazioa hasi da</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Laguntza</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Ireki %1 karpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Eguneratua</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Kudeatutako karpetak:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Ez dago sinkronizazio karpetarik definituta.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSyncek huts egin du fitxategi zehatz bat aurkitzen.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSyncek dagoeneko existitzen zen karpeta bat sortzen saiatu da.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Ez dago lekurik %1 zerbitzarian.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>CSyncen zehaztugabeko errorea.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Errorea</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>CSync haria bukatu da.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation type="unfinished"/>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Definitu gabeko egoera.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Itxoiten sinkronizazioa hasteko.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Sinkronizazioa martxan da.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Konfigurazio errorea.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation type="unfinished"/>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation type="unfinished"/>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>fitxategia</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
-        <translation type="unfinished"/>
+        <source>directory</source>
+        <translation>direktorioa</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>Gorde egunkari fitxategia fitxategi batean arazteko.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Errorea</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;&apos;%1&apos; Fitxategia&lt;br/&gt; ezin da idazteko ireki.&lt;br/&gt;&lt;br/&gt;Egunkariaren irteera &lt;b&gt;ezin&lt;/b&gt; da gorde!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Gorde egunkari fitxategia</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Ezin da egunkari fitxategia idatzi</translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1913,6 +1928,34 @@ name</source>
        <translation>SSL Konexioa</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1929,7 +1972,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation type="unfinished"/>
@@ -1938,12 +1981,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1954,13 +1997,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Deskargatu</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Igo</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1992,7 +2035,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>ezabatuta</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2026,7 +2069,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>ezabatu</translation>
    </message>
 </context>
 <context>
@@ -2034,22 +2077,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Definitu gabeko egoera</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Itxoiten sinkronizazioaren hasiera</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Sinkronizazioa martxan da</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Sinkronizazioa ongi burutu da</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2059,12 +2102,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Sinkronizazio Errorea -Klikatu info botoia xehetasun gehiagorako.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Konfigurazio Errorea</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 همگام سازی شروع شد.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>راه‌نما</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>تا تاریخ</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>پوشه های مدیریت شده:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>پوشه  %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>هیچ پوشه ای همگام سازی شده‌ای تنظیم نشده است</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
+        <source>CSync: Permission deniend.</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>عدم موفقیت CSync در پیدا کردن یک فایل خاص.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>خطای نامشخص CSync </translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>خطا</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation type="unfinished"/>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>موقعیت تعریف نشده</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>صبر کنید تا همگام سازی آغاز شود</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>همگام سازی در حال اجراست</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>آخرین همگام سازی موفقیت آمیز بود</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>خطا در پیکر بندی.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>برچسب متنی</translation>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>خطا</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation type="unfinished"/>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1913,6 +1928,34 @@ name</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1929,7 +1972,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>اگر شما هنوز یک سرور ownCloud  ندارید، &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; را برای اطلاعات بیشتر ببینید. </translation>
@@ -1938,12 +1981,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1954,13 +1997,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>دانلود</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>بارگزاری</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1992,7 +2035,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>حذف شده</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2026,7 +2069,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>پاک کردن</translation>
    </message>
 </context>
 <context>
@@ -171,7 +171,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="453"/>
        <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Muodosta yhteys - &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="454"/>
@@ -211,7 +211,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="632"/>
        <source>Completely finished.</source>
-        <translation type="unfinished"/>
+        <translation>Kokonaan valmis.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="639"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Avaa %1 selaimeen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Tuntematon tila</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Asetukset...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Tiedot...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Ohje</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation>Lopeta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
-        <translation type="unfinished"/>
+        <translation>Avaa %1-kansio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
+        <translation>%1%/%2 käytössä</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Ajan tasalla</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Viimeisimmät muutokset</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Hallitut kansiot:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Avaa kansio &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
-        <translation type="unfinished"/>
+        <translation>Kohteita ei ole synkronoitu äskettäin</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Synkronoidaan %1/%2 (%3/%4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Kansio %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Synkronointikansioita ei ole määritetty.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
+        <source>CSync: Permission deniend.</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync ei löytänyt tiettyä tiedostoa.</translation>
+        <source>CSync: File not found.</source>
+        <translation>CSync: Tiedostoa ei löydy.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync yritti luoda olemassa olevan kansion.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation>CSync: Kansio on jo olemassa.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: %1-palvelimella ei ole tilaa vapaana.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation>CSync: %1-palvelimella ei ole tilaa jäljellä.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation type="unfinished"/>
+        <source>CSync: unspecified error.</source>
+        <translation>CSync: määrittämätön virhe.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -536,103 +536,103 @@
    <message>
        <location filename="../src/mirall/folder.cpp" line="291"/>
        <source>File %1</source>
-        <translation type="unfinished"/>
+        <translation>Tiedosto %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation>Uusi tiedosto saatavilla</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation>&apos;%1&apos; on synkronoitu tälle koneelle.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation>Uusia tiedostoja saatavilla</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation>Tiedosto poistettu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation>&apos;%1&apos; poistettiin.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation>Tiedostoja poistettu</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation>Tiedosto päivitetty</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation>&apos;%1&apos; on päivitetty.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation>Tiedostoja päivitetty</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Virhe</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Csyncin säikeen suoritus päättyi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Poistetaanko kaikki tiedostot?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Poista kaikki tiedostot</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Säilytä tiedostot</translation>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Määrittelemätön tila.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Odottaa synkronoinnin alkamista.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Valmistellaan synkronointia.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Synkronointi on meneillään.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Palvelin ei ole käytettävissä.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Asetusvirhe.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synkronointi on keskeytetty)</translation>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -781,7 +781,7 @@ documentation for possible fixes.</source>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="191"/>
        <source>Add Remote Folder</source>
-        <translation type="unfinished"/>
+        <translation>Lisää etäkansio</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="192"/>
@@ -887,13 +887,13 @@ Checked items will also be deleted if they prevent a directory from being remove
        <location filename="../src/mirall/ignorelisteditor.cpp" line="105"/>
        <location filename="../src/mirall/ignorelisteditor.cpp" line="128"/>
        <source>Add Ignore Pattern</source>
-        <translation type="unfinished"/>
+        <translation>Lisää ohituskaava</translation>
    </message>
    <message>
        <location filename="../src/mirall/ignorelisteditor.cpp" line="106"/>
        <location filename="../src/mirall/ignorelisteditor.cpp" line="129"/>
        <source>Add a new ignore pattern:</source>
-        <translation type="unfinished"/>
+        <translation>Lisää uusi ohituskaava:</translation>
    </message>
    <message>
        <location filename="../src/mirall/ignorelisteditor.cpp" line="140"/>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>TekstiLeima</translation>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>Tallenna loki tiedostoon virheenetsintää varten.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Virhe</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Tiedostoa &apos;%1&apos;&lt;br/&gt;ei voida avata kirjoittamista varten.&lt;br/&gt;&lt;br/&gt;Lokitulostusta&lt;b&gt;ei&lt;/b&gt;pystytä tallentamaan!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Tallenna lokitiedosto</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Lokitiedostoon kirjoitus epäonnistui</translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Rajoita</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>kilotavua/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation>Ei rajoitusta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Rajoita automaattisesti</translation>
    </message>
@@ -1202,7 +1217,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="47"/>
        <source>Connect to %1</source>
-        <translation type="unfinished"/>
+        <translation>Muodosta yhteys - %1</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="48"/>
@@ -1212,17 +1227,17 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="57"/>
        <source>Connect...</source>
-        <translation type="unfinished"/>
+        <translation>Yhdistä...</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="107"/>
        <source>Your entire account will be synced to the local folder &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Koko tilisi synkronoidaan paikalliseen kansioon &apos;%1&apos;.</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="110"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
-        <translation type="unfinished"/>
+        <translation>%1-kansio &apos;%2&apos; on synkronoitu paikalliseen kansioon &apos;%3&apos;</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="116"/>
@@ -1237,7 +1252,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="233"/>
        <source>Local Sync Folder</source>
-        <translation type="unfinished"/>
+        <translation>Paikallinen synkronointikansio</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1250,12 +1265,12 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudhttpcredspage.cpp" line="41"/>
        <source>Connect to %1</source>
-        <translation type="unfinished"/>
+        <translation>Muodosta yhteys - %1</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudhttpcredspage.cpp" line="42"/>
        <source>Enter user credentials</source>
-        <translation type="unfinished"/>
+        <translation>Anna käyttäjätunnus</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudhttpcredspage.cpp" line="158"/>
@@ -1268,12 +1283,12 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="43"/>
        <source>Connect to %1</source>
-        <translation type="unfinished"/>
+        <translation>Muodosta yhteys - %1</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="44"/>
        <source>Setup ownCloud server</source>
-        <translation type="unfinished"/>
+        <translation>Määritä ownCloud-palvelimen asetukset</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="100"/>
@@ -1444,7 +1459,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudwizardresultpage.cpp" line="39"/>
        <source>Everything set up!</source>
-        <translation type="unfinished"/>
+        <translation>Kaikki valmiina!</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudwizardresultpage.cpp" line="78"/>
@@ -1913,6 +1928,34 @@ name</source>
        <translation>SSL-yhteys</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation>%L1 Tt</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation>%L1 Gt</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation>%L1 Mt</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation>%L1 kt</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation>%L1 t</translation>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1929,7 +1972,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Jos käytössäsi ei ole vielä ownCloud-palvelinta, lue lisätietoja osoitteessa &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt;.</translation>
@@ -1938,12 +1981,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1954,13 +1997,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Lataa</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Lähetä</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1986,27 +2029,27 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
        <source>For deletion</source>
-        <translation type="unfinished"/>
+        <translation>Poistettavaksi</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>poistettu</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
        <source>downloading</source>
-        <translation type="unfinished"/>
+        <translation>ladataan</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
        <source>uploading</source>
-        <translation type="unfinished"/>
+        <translation>lähetetään</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
@@ -2026,7 +2069,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>poista</translation>
    </message>
 </context>
 <context>
@@ -2034,22 +2077,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Tila on määrittelemätön.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Odotetaan synkronoinnin käynnistymistä</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Synkronointi meneillään</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Synkronointi valmistui</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2059,22 +2102,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Synkronointivirhe – Napsauta Tietoja.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Asetusvirhe.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
        <source>The server is currently unavailable</source>
-        <translation type="unfinished"/>
+        <translation>Palvelin ei ole juuri nyt tavoitettavissa</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation type="unfinished"/>
+        <translation>Valmistaudutaan synkronointiin</translation>
    </message>
 </context>
 </TS>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Synchronisation démarrée </translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Aide</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Ouvrir le répertoire %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>À jour</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Répertoires suivis :</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Dossier %1 : %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Aucun répertoire synchronisé n&apos;est configuré.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync a échoué en raison d&apos;une erreur de permission non prise en charge.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync n&apos;a pu trouver le fichier spécifié.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync a tenté de créer un répertoire déjà présent.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync : Aucun espace disponibla sur le serveur %1.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Erreur CSync inconnue.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Erreur</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Le processus CSync s&apos;est terminé.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation type="unfinished"/>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Impossible de réinitialiser l&apos;état du dossier</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n&apos;est utilisée en ce moment.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Statut indéfini.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>En attente de synchronisation .</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>La synchronisation est en cours.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Dernière synchronisation effectuée avec succès</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Erreur d&apos;installation.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>Zone de texte</translation>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>Enregistrer le fichier de log sur le disque à des fins de débogage.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Erreur</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Le fichier &apos;%1&apos;&lt;br/&gt;ne peut être ouvert en écriture.&lt;br/&gt;&lt;br/&gt;La sortie &lt;b&gt;ne peut pas&lt;/b&gt; être consignée dans un fichier de log !&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Sauvegarder le fichier de log</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Impossible d&apos;écrire dans le fichier de log</translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1913,6 +1928,34 @@ name</source>
        <translation>Connexion SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1929,7 +1972,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Si vous n&apos;avez pas encre de serveur ownCloud, consultez &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; pour obtenir plus d&apos;informations.</translation>
@@ -1938,12 +1981,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1954,13 +1997,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Télécharger</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Envoyer</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1992,7 +2035,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>supprimé</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2026,7 +2069,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>supprimer</translation>
    </message>
 </context>
 <context>
@@ -2034,22 +2077,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Statut indéfini</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisation en attente</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisation en cours</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisation réussie</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2059,12 +2102,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Erreur de synchronisation - Cliquez sur le bouton info pour plus de détails.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur de configuration</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -171,7 +171,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="453"/>
        <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Conectado a &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="454"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>Comezou a sincronización %1</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>Comezou a sincronización para %n cartafol con sincronización configurada.</numerusform><numerusform>Comezou a sincronización para %n cartafoles con sincronización configurada.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Abrir %1 nun navegador</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Calculando a cota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Estado descoñecido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Axustes...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Detalles...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Axuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation>Saír de %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Abrir o cartafol %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation>Usado %1% de %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Actualizado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Nada.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Cambios recentes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Cartafoles xestionados:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Abrir o cartafol «%1»</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Cota n/d</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation>Non hai elementos sincronizados recentemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Cartafol %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Non se configuraron cartafoles de sincronización.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>Produciuse un fallo en CSync por mor dun permiso denegado.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation>CSync: Permiso denegado.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync non puido atopar o ficheiro especificado.</translation>
+        <source>CSync: File not found.</source>
+        <translation>CSync: Non se atopa o ficheiro.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSYNC tenta crear un directorio que xa existe.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation>CSync: O directorio xa existe.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Non hai espazo dispoñíbel no servidor %1.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation>CSync: Non queda espazo no servidor %1.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Produciuse un erro non especificado de CSync</translation>
+        <source>CSync: unspecified error.</source>
+        <translation>CSync: Produciuse un erro non especificado.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -536,87 +536,87 @@
    <message>
        <location filename="../src/mirall/folder.cpp" line="291"/>
        <source>File %1</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiro %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation>Novo ficheiro dispoñíbel</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation>«%1» foi sincronizado con esta máquina.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation>Novos ficheiros dispoñíbeis</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation><numerusform>«%1» e outro %n ficheiro foron sincronizados con esta máquina.</numerusform><numerusform>«%1» e outros %n ficheiros foron sincronizados con esta máquina.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation>Ficheiro retirado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation>«%1» foi retirado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation>Ficheiros retirados</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation><numerusform>«%1» e outro %n ficheiro foron retirados.</numerusform><numerusform>«%1» e outros %n ficheiros foron retirados.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation>Ficheiro actualizado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation>«%1» foi actualizado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation>Ficheiros actualizados</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation><numerusform>«%1» e outro %n ficheiro foron actualizados.</numerusform><numerusform>«%1» e outros %n ficheiros foron actualizados.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Erro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Rematou o fío en CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>Esta sincronización retirará todos os ficheiros do cartafol local de  sincronización «%1».
 Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros».</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -625,17 +625,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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Retirar todos os ficheiros?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Retirar todos os ficheiros</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Manter os ficheiros</translation>
    </message>
@@ -643,57 +643,57 @@ Confirma que quere realizar esta operación?</translation>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Non foi posíbel restabelecer o estado do cartafol</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Atopouse un diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Estado sen definir.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Agardando polo comezo da sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Preparando para sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Estase sincronizando.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>O servidor non está dispoñíbel actualmente.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>A última sincronización fíxose correctamente.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Erro de configuración.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (sincronización en pausa)</translation>
    </message>
@@ -720,7 +720,7 @@ Confirma que quere realizar esta operación?</translation>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -921,17 +921,17 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
        <translation>Protocolo de sincronización detallado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>Etiqueta de texto</translation>
    </message>
@@ -972,56 +972,74 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>Ficheiro ignorado.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>Directorio ignorado.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>ficheiro</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
+        <translation>directorio</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>Ligazón branda ignorada.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>Ignorado.</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation>Ficheiro de conflitos.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
 name</source>
-        <translation type="unfinished"/>
+        <translation>O ficheiro foi cambiado no servidor e no repositorio local e como resultado
+crease o que se chama un conflito. O cambio local copiase no ficheiro de
+conflitos, mentres que o ficheiro do lado do servidor está dispoñíbel baixo
+o nome orixinal</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="231"/>
@@ -1082,23 +1100,23 @@ name</source>
        <translation>Gardar o ficheiro de rexistro a un ficheiro no disco para depuración.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Erro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;O ficheiro «%1»&lt;br/&gt; non se pode abrir para escritura.&lt;br/&gt;&lt;br/&gt;A saída do rexistro &lt;b&gt;non&lt;/n&gt; se pode gardar!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Gardar o ficheiro de rexistro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Non foi posíbel escribir no ficheiro de rexistro</translation>
    </message>
@@ -1152,29 +1170,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Limitar a</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBytes/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation>Sen límite</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Largo de banda de envíos</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Limitar automáticamente</translation>
    </message>
@@ -1219,7 +1237,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="57"/>
        <source>Connect...</source>
-        <translation type="unfinished"/>
+        <translation>Conectar...</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="107"/>
@@ -1920,6 +1938,34 @@ name</source>
        <translation>Conexión SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1936,7 +1982,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Se aínda non ten un servidor ownCloud, vexa  &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; para obter máis información.</translation>
@@ -1945,12 +1991,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Construído desde a revisión &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; no Git o %3, %4 empregando OCsync %5 e Qt %6.&lt;/small&gt;&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation>&lt;p&gt;Versión %2.Versión &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, ownCloud Inc.&lt;br&gt;Baseado no Mirall por Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</translation>
    </message>
@@ -1961,79 +2007,79 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Descargar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Enviar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
        <source>Context</source>
-        <translation type="unfinished"/>
+        <translation>Contexto</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
        <source>Inactive</source>
-        <translation type="unfinished"/>
+        <translation>Inactivo</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>Iniciar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
        <source>Finished</source>
-        <translation type="unfinished"/>
+        <translation>Rematado</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
        <source>For deletion</source>
-        <translation type="unfinished"/>
+        <translation>Para eliminar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>eliminado</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
        <source>downloading</source>
-        <translation type="unfinished"/>
+        <translation>descargando</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
        <source>uploading</source>
-        <translation type="unfinished"/>
+        <translation>enviando</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
        <source>inactive</source>
-        <translation type="unfinished"/>
+        <translation>inactivo</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
        <source>starting</source>
-        <translation type="unfinished"/>
+        <translation>iniciando</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
        <source>finished</source>
-        <translation type="unfinished"/>
+        <translation>rematado</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>eliminar</translation>
    </message>
 </context>
 <context>
@@ -2041,47 +2087,47 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Estado sen definir</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Agardando o comezo da sincronización</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Sincronización en proceso</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Sincronización realizada</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
        <source>Sync Success, problems with individual files.</source>
-        <translation type="unfinished"/>
+        <translation>A sincronización foi correcta, houbo algún problema con algún ficheiro individual.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Erro de sincronización - Fai clic no botón de información para ver os detalles.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Erro de configuración</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
        <source>The server is currently unavailable</source>
-        <translation type="unfinished"/>
+        <translation>O servidor non está dispoñíbel actualmente</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation type="unfinished"/>
+        <translation>Preparando para sincronizar</translation>
    </message>
 </context>
 </TS>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 szinkronizálás elindult</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Kvóta kiszámítása...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Ismeretlen állapot</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Beállítások...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Részletek...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Súgó</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Frissítve</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Legutóbbi változások</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Kezelt mappák:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Kvóta n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Mappa %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Nincsenek megadva szinkronizálandó mappák.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync hiba, nincs kezelési jogosultság.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>A CSync nem találja a megadott fájlt.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>A CSync megpróbált létrehozni egy már létező mappát.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Nincs szabad tárhely az %1 kiszolgálón.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>CSync ismeretlen hiba.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Hiba</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <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="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Összes fájl eltávolítása</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Fájlok megtartása</translation>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Ismeretlen állapot.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Várakozás a szinkronizálás elindítására.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Előkészítés szinkronizációhoz.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Szinkronizálás fut.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>A kiszolgáló jelenleg nem érhető el.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Legutolsó szinkronizálás sikeres volt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Beállítás hiba.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation type="unfinished"/>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>Fájl ignorálva.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>Mappa ignorálva.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>fájl</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
+        <translation>mappa</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>Szoftlink ignorálva.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>Ignorálva.</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>A naplófájl mentése a helyi gépre.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Hiba</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;&apos;%1&apos; fájlt&lt;br/&gt;nem lehet írásra megnyitni.&lt;br/&gt;&lt;br/&gt;A naplózás kimenete &lt;b&gt;nem&lt;/b&gt; menthető!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Naplófájl mentése</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>A naplófájl írása sikertelen </translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBájt/mp</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
-        <translation>Nincs limit</translation>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Feltöltési sávszélesség</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1913,6 +1928,34 @@ name</source>
        <translation>SSL-kapcsolat</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1929,7 +1972,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation type="unfinished"/>
@@ -1938,12 +1981,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1954,13 +1997,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Letöltés</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Feltöltés</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1992,7 +2035,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>törölve</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2026,7 +2069,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>töröl</translation>
    </message>
 </context>
 <context>
@@ -9,7 +9,7 @@
    <message>
        <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/>
        <source>Pick a local folder on your computer to sync</source>
-        <translation type="unfinished"/>
+        <translation>Scegli una cartella locale sul tuo computer da sincronizzare</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/>
@@ -101,7 +101,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="64"/>
        <source>Add Folder...</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi cartella...</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="98"/>
@@ -146,7 +146,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="287"/>
        <source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Vuoi davvero ripristinare la cartella &lt;i&gt;%1&lt;/i&gt; e ricostruire il database del client?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="319"/>
@@ -171,7 +171,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="453"/>
        <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Connesso a &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="454"/>
@@ -221,118 +221,118 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="682"/>
        <source>%1 of %2 in use.</source>
-        <translation type="unfinished"/>
+        <translation>%1 di %2 utilizzati.</translation>
    </message>
 </context>
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Sincronizzazione iniziata</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>Sincronizzazione avviata per %n cartella configurata.</numerusform><numerusform>Sincronizzazione avviata per %n cartelle configurate.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Apri %1 nel browser...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Calcolo quota in corso...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Stato sconosciuto</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Impostazioni...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Dettagli...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Aiuto</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
-        <translation type="unfinished"/>
+        <translation>Esci da %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Apri la cartella %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
+        <translation>%1% di %2 utilizzati</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Aggiornato</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Nessuna.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Modifiche recenti</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Cartelle gestite:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Apri la cartella &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Quota n/d</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation>Nessun elemento sincronizzato di recente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Sincronizzazione di %1 di %2 (%3 di %4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Cartella %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Nessuna cartella configurata per la sincronizzazione.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>Problema di CSync dovuto alla mancata gestione dei permessi.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation>CSync: Permesso negato.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync non è riuscito a trovare un file specifico.</translation>
+        <source>CSync: File not found.</source>
+        <translation>CSync: file non trovato.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync ha cercato di creare una cartella già esistente.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation>CSync: cartella già esistente.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
+        <source>CSync: No space left on %1 server.</source>
        <translation>CSync: spazio insufficiente sul server %1.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Errore di CSync non specificato.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation>CSync: errore non specificato.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -531,92 +531,92 @@
    <message>
        <location filename="../src/mirall/folder.cpp" line="290"/>
        <source>File %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>File %1: %2</translation>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="291"/>
        <source>File %1</source>
-        <translation type="unfinished"/>
+        <translation>File %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
-        <translation type="unfinished"/>
+        <translation>Nuovo file disponibile</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos; è stato sincronizzato con questa macchina.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
-        <translation type="unfinished"/>
+        <translation>Nuovi file disponibili</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>&apos;%1&apos; e %n altro file sono stati sincronizzati con questa macchina.</numerusform><numerusform>&apos;%1&apos; e %n altri file sono stati sincronizzati con questa macchina.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
-        <translation type="unfinished"/>
+        <translation>File rimosso</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos; è stato rimosso.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
-        <translation type="unfinished"/>
+        <translation>File rimossi</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>&apos;%1&apos; e %n altro file sono stati rimossi.</numerusform><numerusform>&apos;%1&apos; e %n altri file sono stati rimossi.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
-        <translation type="unfinished"/>
+        <translation>File aggiornato</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos; è stato aggiornato.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
-        <translation type="unfinished"/>
+        <translation>File aggiornati</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>&apos;%1&apos; e %n altro file sono stati aggiornati.</numerusform><numerusform>&apos;%1&apos; e %n altri file sono stati aggiornati.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Errore</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Il thread di CSync è stato terminato.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale &apos;%1&apos;.
 Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli &quot;Mantieni i file&quot;. Se desideri che i dati siano rimossi, scegli &quot;Rimuovi tutti i file&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -625,17 +625,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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Vuoi rimuovere tutti i file?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Rimuovi tutti i file</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Mantieni i file</translation>
    </message>
@@ -643,57 +643,57 @@ Sei sicuro di voler eseguire questa operazione?</translation>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Impossibile ripristinare lo stato della cartella</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>È stato trovato un vecchio diario di sincronizzazione &apos;%1&apos;, ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Stato non definito.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Attende l&apos;inizio della sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Preparazione della sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>La sincronizzazione è in corso.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Il server è attualmente non disponibile.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>L&apos;ultima sincronizzazione è stato completata correttamente.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
-        <translation type="unfinished"/>
+        <translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Errore di configurazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation> %1 (La sincronizzazione è sospesa)</translation>
    </message>
@@ -720,11 +720,13 @@ Sei sicuro di voler eseguire questa operazione?</translation>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
-        <translation type="unfinished"/>
+        <translation>Impossibile controllare le cartelle a causa di limitazioni di sistema.
+L&apos;applicazione non funzionerà in modo corretto. Leggi la
+documentazione per trovare possibili soluzioni.</translation>
    </message>
 </context>
 <context>
@@ -919,17 +921,17 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
        <translation>Protocollo di sincronizzazione dettagliato</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>EtichettaTesto</translation>
    </message>
@@ -970,56 +972,73 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>File ignorato.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>Cartella ignorata.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>Collegamento ignorato.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>Ignorato.</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation>File in conflitto.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
 name</source>
-        <translation type="unfinished"/>
+        <translation>Il file è stato modificato sul server e sul deposito locale e ciò genera
+un cosiddetto conflitto. La modifica locale viene copiata sul file in
+conflitto, mentre il file sul server è disponibile con il nome originale</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="231"/>
@@ -1039,7 +1058,7 @@ name</source>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="286"/>
        <source>No more storage space available on server.</source>
-        <translation type="unfinished"/>
+        <translation>Spazio di archiviazione insufficiente sul server.</translation>
    </message>
 </context>
 <context>
@@ -1080,23 +1099,23 @@ name</source>
        <translation>Salva un file di log sul disco per il debug.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Errore</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Il file &apos;%1&apos;&lt;br/&gt;non può essere aperto in scrittura.&lt;br/&gt;&lt;br/&gt;Il risultato del log &lt;b&gt;non&lt;/b&gt; può essere salvato!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Salva file di log</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Impossibile scrivere il file di log</translation>
    </message>
@@ -1150,29 +1169,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Limita a</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KByte/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation>Nessun limite</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Ampiezza di banda in uscita</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Limita automaticamente</translation>
    </message>
@@ -1217,7 +1236,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="57"/>
        <source>Connect...</source>
-        <translation type="unfinished"/>
+        <translation>Connetti...</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="107"/>
@@ -1227,7 +1246,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="110"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
-        <translation type="unfinished"/>
+        <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="116"/>
@@ -1472,7 +1491,7 @@ name</source>
    <message>
        <location filename="../src/mirall/settingsdialog.cpp" line="49"/>
        <source>%1</source>
-        <translation type="unfinished"/>
+        <translation>%1</translation>
    </message>
    <message>
        <location filename="../src/mirall/settingsdialog.cpp" line="56"/>
@@ -1918,6 +1937,34 @@ name</source>
        <translation>Connessione SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation>%L1 TB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation>%L1 GB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation>%L1 MB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation>%L1 kB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation>%L1 B</translation>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1934,7 +1981,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Se non hai ancora un server ownCloud, visita &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; per ulteriori informazioni.</translation>
@@ -1943,12 +1990,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Compilato dalla revisione Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; il %3, %4 utilizzando OCsync %5 e Qt %6.&lt;/small&gt;&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation>&lt;p&gt;Versione %2. Per ulteriori informazioni, visita &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;scritto da Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc..&lt;br&gt;Basato su Mirall di Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</translation>
    </message>
@@ -1959,79 +2006,79 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Scarica</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Carica</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
        <source>Context</source>
-        <translation type="unfinished"/>
+        <translation>Contesto</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
        <source>Inactive</source>
-        <translation type="unfinished"/>
+        <translation>Inattivo</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>Avvia</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
        <source>Finished</source>
-        <translation type="unfinished"/>
+        <translation>Completato</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
        <source>For deletion</source>
-        <translation type="unfinished"/>
+        <translation>Da eliminare</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>eliminati</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
        <source>downloading</source>
-        <translation type="unfinished"/>
+        <translation>scaricamento in corso</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
        <source>uploading</source>
-        <translation type="unfinished"/>
+        <translation>caricamento in corso</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
        <source>inactive</source>
-        <translation type="unfinished"/>
+        <translation>inattivo</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
        <source>starting</source>
-        <translation type="unfinished"/>
+        <translation>avvio in corso</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
        <source>finished</source>
-        <translation type="unfinished"/>
+        <translation>completato</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>elimina</translation>
    </message>
 </context>
 <context>
@@ -2039,47 +2086,47 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Stato non definito</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>In attesa di sincronizzazione</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>La sincronizzazione è in corso</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Sincronizzazione completata</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
        <source>Sync Success, problems with individual files.</source>
-        <translation type="unfinished"/>
+        <translation>Sincronizzazione avvenuta, problemi con singoli file.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Errore di sincronizzazione - Clic sul pulsante informazioni per i dettagli.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Errore di configurazione</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
        <source>The server is currently unavailable</source>
-        <translation type="unfinished"/>
+        <translation>Il server è attualmente non disponibile.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation type="unfinished"/>
+        <translation>Preparazione della sincronizzazione</translation>
    </message>
 </context>
 </TS>
@@ -171,7 +171,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="453"/>
        <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; へ接続しました。</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="454"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 同期開始</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>設定された %n フォルダの同期を開始しました。</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>%1 をブラウザーで開く</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>制限容量を計算中...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>不明な状態</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>設定</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>詳細...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>ヘルプ</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation>%1 を終了</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>%1 フォルダを開く</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation>%2 のうち %1% を使用中</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>最近です</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>なし</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>最近変更されたファイル</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>管理フォルダ:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>フォルダ ’%1’ を開く</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>クオータ n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation>最近同期されたアイテムはありません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>%2 の %1 (%4 分の %3) を同期中</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>フォルダ %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>同期フォルダが設定されていません。</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation>CSync: 権限により拒否されました。</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSyncは特定のファイルを見つけることができませんでした。</translation>
+        <source>CSync: File not found.</source>
+        <translation>CSync: ファイルが見つかりません。</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSyncはすでに存在するディレクトリを作成しようとしました。</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation>CSync: ディレクトリが既に存在します。</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
+        <source>CSync: No space left on %1 server.</source>
        <translation>CSync: %1 サーバには利用可能な空きがありません。</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>CSyncの未指定のエラーです。</translation>
+        <source>CSync: unspecified error.</source>
+        <translation>CSync: 不明なエラー。</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -536,87 +536,87 @@
    <message>
        <location filename="../src/mirall/folder.cpp" line="291"/>
        <source>File %1</source>
-        <translation type="unfinished"/>
+        <translation>ファイル %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation>新しいファイルがあります</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation>&apos;%1&apos; はこのマシンに同期しています。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation>新しいファイルがあります</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation><numerusform>&apos;%1&apos; とその他 %n 個のファイルがこのマシンに同期しています。</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation>ファイルは削除済みです</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation>&apos;%1&apos; は削除済みです。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation>ファイルは削除済みです</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation><numerusform>&apos;%1&apos; とその他 %n 個のファイルは削除済みです。</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation>ファイルはアップロード済みです</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation>&apos;%1&apos; は更新されています</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation>ファイルは更新されています</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation><numerusform>&apos;%1&apos; とその他 %n 個のファイルは更新済みです。</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>エラー</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>CSyncのスレッドが終了しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>この同期により、ローカルの同期フォルダ &apos;%1&apos;にある全ファイルが削除されます。
 あなた、またはあなたの管理者がサーバー上のあなたのアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -625,17 +625,17 @@ Are you sure you want to perform this operation?</source>
 本当にこの操作を実行しますか？</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>すべてのファイルを削除しますか？</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>すべてのファイルを削除</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>ファイルを残す</translation>
    </message>
@@ -643,57 +643,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>フォルダーの状態をリセット出来ませんでした</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>古い同期ジャーナル  &apos;%1&apos; が見つかりましたが、削除出来ませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>未定義の状態。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>同期開始を待機中</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>同期の準備中。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>同期を実行中です。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>サーバは現在利用できません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>最後の同期は成功しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>設定エラー。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (同期を一時停止)</translation>
    </message>
@@ -720,7 +720,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -921,17 +921,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation>同期状況詳細</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>テキストラベル</translation>
    </message>
@@ -972,56 +972,71 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>対象外ファイル</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>対象外ディレクトリ</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>ファイル</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
+        <translation>ディレクトリ</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>対象外ソフトリンク</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>無視されました。</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation>競合ファイル</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
 name</source>
-        <translation type="unfinished"/>
+        <translation>サーバー側とローカル側のファイルが変更された為、競合ファイルが作成されました。ローカル側の変更は、競合Conflictファイルへコピーされ、サーバー側のファイルは、元々のファイル名で利用できます。</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="231"/>
@@ -1082,23 +1097,23 @@ name</source>
        <translation>デバッグ目的でディスクにログファイルを保存する</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>エラー</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;ファイル &apos;%1&apos;&lt;br/&gt;を書き込み用で開けませんでした。&lt;br/&gt;&lt;br/&gt;ログ出力を&lt;b&gt;保存できません&lt;/b&gt;でした！&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>ログファイルを保存</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>ログファイルに書き込めませんでした</translation>
    </message>
@@ -1152,29 +1167,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>制限</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBytes/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation>無制限</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>アップロード帯域制限</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>自動的に制限</translation>
    </message>
@@ -1219,7 +1234,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="57"/>
        <source>Connect...</source>
-        <translation type="unfinished"/>
+        <translation>接続...</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="107"/>
@@ -1920,6 +1935,34 @@ name</source>
        <translation>SSL接続</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation>%L1 TB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation>%L1 GB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation>%L1 MB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation>%L1 kB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation>%L1 B</translation>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1936,7 +1979,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>ownCloudサーバーをまだ持っていないなら、&lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt;で詳細を見ましょう。</translation>
@@ -1945,12 +1988,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;%3, %4 のGitリビジョン&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;からのビルド OCsync %5 と Qt %6 を利用&lt;/small&gt;&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation>&lt;p&gt;Version %2. 詳細な情報は、&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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</translation>
    </message>
@@ -1961,79 +2004,79 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>ダウンロード</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>アップロード</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
        <source>Context</source>
-        <translation type="unfinished"/>
+        <translation>コンテキスト</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
        <source>Inactive</source>
-        <translation type="unfinished"/>
+        <translation>無効</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>開始</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
        <source>Finished</source>
-        <translation type="unfinished"/>
+        <translation>終了</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
        <source>For deletion</source>
-        <translation type="unfinished"/>
+        <translation>削除対象</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>削除</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
        <source>downloading</source>
-        <translation type="unfinished"/>
+        <translation>ダウンロード中</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
        <source>uploading</source>
-        <translation type="unfinished"/>
+        <translation>アップロード中</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
        <source>inactive</source>
-        <translation type="unfinished"/>
+        <translation>無効</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
        <source>starting</source>
-        <translation type="unfinished"/>
+        <translation>開始</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
        <source>finished</source>
-        <translation type="unfinished"/>
+        <translation>終了</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>削除</translation>
    </message>
 </context>
 <context>
@@ -2041,47 +2084,47 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>未定義の状態</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>同期開始を待っています</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>同期を実行中</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>同期成功</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
        <source>Sync Success, problems with individual files.</source>
-        <translation type="unfinished"/>
+        <translation>同期成功、いくつかのファイルで問題があります。</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>同期エラー: ボタンを押して詳細を確認してください。</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>設定エラー</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
        <source>The server is currently unavailable</source>
-        <translation type="unfinished"/>
+        <translation>サーバは現在利用できません</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation type="unfinished"/>
+        <translation>同期の準備中</translation>
    </message>
 </context>
 </TS>
@@ -171,7 +171,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="453"/>
        <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Verbonden met &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="454"/>
@@ -211,7 +211,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="632"/>
        <source>Completely finished.</source>
-        <translation>Helemaal klaar.</translation>
+        <translation>Helemaal klaar</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="639"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
-        <translation>%1 Sync Gestart</translation>
+        <translation>%1 Synchronisatie gestart</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>Synchronisatie begonnen voor %n geconfigureerde synchronisatie map(pen).</numerusform><numerusform>Synchronisatie begonnen voor %n geconfigureerde synchronisatie map(pen).</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Open %1 in browser</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Quota worden berekend ...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Onbekende status</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Instellingen...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Details ...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Help</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
-        <translation>Verlaat %1</translation>
+        <translation>%1 afsluiten</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Open %1 map</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation>%1% van %2 gebruikt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Bijgewerkt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Geen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Recente wijzigingen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Beheerde mappen:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Open map &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Quota niet beschikbaar</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
-        <translation>Recent geen bestanden gesynchroniseerd</translation>
+        <translation>Recent niets gesynchroniseerd</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Synchroniseert %1 van %2 (%3 van %4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Map %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Geen synchronisatie-mappen geconfigureerd.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation>CSync: toestemming geweigerd.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync kon een bepaald bestand niet vinden.</translation>
+        <source>CSync: File not found.</source>
+        <translation>CSync: bestand niet gevonden.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync probeerde een al bestaande directory aan te maken.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation>CSync: map bestaat al.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Geen ruimte op %1 server beschikbaar.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation>CSync: geen ruimte over op %1-server.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>CSync ongedefinieerde fout.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation>CSync: ongedefinieerde fout.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -536,87 +536,87 @@
    <message>
        <location filename="../src/mirall/folder.cpp" line="291"/>
        <source>File %1</source>
-        <translation type="unfinished"/>
+        <translation>Bestand %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation>Nieuw bestand beschikbaar</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation>&apos;%1&apos; is gesynchroniseerd naar deze computer.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation>Nieuwe bestanden beschikbaar</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation><numerusform>&apos;%1&apos; en %n andere bestanden zijn gesynchroniseerd met deze machine..</numerusform><numerusform>&apos;%1&apos; en %n andere bestanden zijn gesynchroniseerd met deze machine..</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation>Bestand verwijderd</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation>&apos;%1&apos; is verwijderd.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation>Bestanden verwijderd</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation><numerusform>&apos;%1&apos; en %n andere bestanden zijn verwijderd.</numerusform><numerusform>&apos;%1&apos; en %n andere bestanden zijn verwijderd.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation>Bestand bijgewerkt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation>&apos;%1&apos; is bijgewerkt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation>Bestanden bijgewerkt</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation><numerusform>&apos;%1&apos; en %n andere bestanden zijn bijgewerkt.</numerusform><numerusform>&apos;%1&apos; en %n andere bestanden zijn bijgewerkt.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Fout</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>De CSync thread is beëindigd.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap &apos;%1&apos;.
 Als u of uw beheerder uw account op de server heeft gereset, kies dan &quot;Bewaar bestanden&quot;. Als u uw bestanden wilt verwijderen, kies dan &quot;Verwijder alle bestanden&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -625,17 +625,17 @@ Dit kan komen doordat de folder ongemerkt gereconfigureerd is of doordat alle be
 Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Verwijder alle bestanden?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Verwijder alle bestanden</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Bewaar bestanden</translation>
    </message>
@@ -643,57 +643,57 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Kan je beginstaat van de map niet resetten</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Een oud synchronisatieverslag  &apos;%1&apos; is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Ongedefiniëerde staat</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>In afwachting van synchronisatie.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Synchronisatie wordt voorbereid</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Bezig met synchroniseren.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>De server is nu niet beschikbaar.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Laatste synchronisatie was succesvol.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Installatiefout.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronisatie onderbroken)</translation>
    </message>
@@ -720,7 +720,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -796,12 +796,12 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="211"/>
        <source>Folder was successfully created on %1.</source>
-        <translation>Map was succesvol gecreërd op %1.</translation>
+        <translation>Map is succesvol aangemaakt op %1.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="214"/>
        <source>Failed to create the folder on %1.&lt;br/&gt;Please check manually.</source>
-        <translation>Creëren van de map op %1 mislukt.&lt;br/&gt;Controleer handmatig.</translation>
+        <translation>Aanmaken van de map op %1 mislukt.&lt;br/&gt;Controleer handmatig.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="264"/>
@@ -921,17 +921,17 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
        <translation>Gedetailleerde synchronisatiehistorie</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>TekstLabel</translation>
    </message>
@@ -972,56 +972,74 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>bestand overgeslagen</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>map overgeslagen</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>bestand</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
+        <translation>directory</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>soft link overgeslagen</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>overgeslagen</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation>Conflicterend bestand.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
 name</source>
-        <translation type="unfinished"/>
+        <translation>Het bestand is gewijzigd zowel op de server en als in de lokale opslag⏎
+met als resultaat een zogenaamd conflict. De lokale wijziging is⏎
+gekopieerd naar het conflicterende bestand, terwijl het bestand dat⏎
+op de server staat beschikbaar blijft met de originele naam.</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="231"/>
@@ -1082,23 +1100,23 @@ name</source>
        <translation>Sla het logbestand op om te debuggen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Fout</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Bestand &apos;%1&apos;&lt;br/&gt;kan niet worden geopend voor schrijven.&lt;br/&gt;&lt;br/&gt;De logging output kan &lt;b&gt;niet&lt;/b&gt; worden weggeschreven!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Opslaan logbestand</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Kon niet schrijven naar logbestand</translation>
    </message>
@@ -1152,29 +1170,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Beperkt tot</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBytes/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation>Geen beperking</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Bandbreedte uploaden</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Beperkt automatisch</translation>
    </message>
@@ -1219,7 +1237,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="57"/>
        <source>Connect...</source>
-        <translation type="unfinished"/>
+        <translation>Verbinden...</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="107"/>
@@ -1239,7 +1257,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="123"/>
        <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. Kies een oplossing!&lt;/small&gt;&lt;/p&gt;</translation>
+        <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="233"/>
@@ -1348,7 +1366,7 @@ name</source>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
        <source>Creating local sync folder %1... </source>
-        <translation>Creër lokale sync map %1...</translation>
+        <translation>Maak lokale synchronisatiemap %1...</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
@@ -1507,7 +1525,7 @@ name</source>
    <message>
        <location filename="../src/mirall/sslerrordialog.cpp" line="140"/>
        <source>with Certificate %1</source>
-        <translation>met Certificaat %1</translation>
+        <translation>met certificaat %1</translation>
    </message>
    <message>
        <location filename="../src/mirall/sslerrordialog.cpp" line="148"/>
@@ -1547,7 +1565,7 @@ name</source>
    <message>
        <location filename="../src/mirall/sslerrordialog.cpp" line="163"/>
        <source>Effective Date: %1</source>
-        <translation>Effectieve Datum: %1</translation>
+        <translation>Ingangsdatum: %1</translation>
    </message>
    <message>
        <location filename="../src/mirall/sslerrordialog.cpp" line="164"/>
@@ -1748,7 +1766,7 @@ name</source>
        <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
        <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/>
        <source>TextLabel</source>
-        <translation>TekstLabel</translation>
+        <translation>Tekstlabel</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetuppage.ui" line="47"/>
@@ -1758,23 +1776,23 @@ name</source>
    <message>
        <location filename="../src/mirall/owncloudsetuppage.ui" line="60"/>
        <source>CheckBox</source>
-        <translation>CheckBox</translation>
+        <translation>Checkbox</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetuppage.ui" line="75"/>
        <source>&amp;Username:</source>
-        <translation>Gebruikersnaam:</translation>
+        <translation>&amp;Gebruikersnaam</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetuppage.ui" line="85"/>
        <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="296"/>
        <source>Enter the ownCloud username.</source>
-        <translation>Voer de ownCloud username in.</translation>
+        <translation>Voer de ownCloud gebruikersnaam in.</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetuppage.ui" line="92"/>
        <source>&amp;Password:</source>
-        <translation>Wachtwoord:</translation>
+        <translation>&amp;Wachtwoord</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetuppage.ui" line="102"/>
@@ -1802,7 +1820,7 @@ name</source>
        <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/>
        <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/>
        <source>Enter the url of the ownCloud you want to connect to (without http or https).</source>
-        <translation>Voer de url in van de ownCloud waarmee je wilt verbinden (met http of https).</translation>
+        <translation>Voer de url in van de ownCloud-server waarmee u wilt verbinden (met http of https).</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="107"/>
@@ -1893,7 +1911,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudwizardresultpage.ui" line="66"/>
        <source>Your entire account is synced to the local folder </source>
-        <translation>Uw complete account is gesynchroniseerd met de lokale map</translation>
+        <translation>Uw volledige account is gesynchroniseerd met de lokale map</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudwizardresultpage.ui" line="100"/>
@@ -1920,6 +1938,34 @@ name</source>
        <translation>SSL Connectie</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation>%L1 TB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation>%L1 GB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation>%L1 MB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation>%L1 kB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation>%L1 B</translation>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1936,22 +1982,21 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
-        <translation>Als u nog geen ownCloud-server heeft,&lt;br/&gt;
-bezoek dan &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; voor meer informatie.</translation>
+        <translation>Bezoek &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; als u nog geen ownCloud-server heeft.</translation>
    </message>
 </context>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Gecompileerd van Git revisie &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; op %3, %4 m.b.v. OCsync %5 en Qt %6.&lt;/small&gt;&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation>&lt;p&gt;Versie %2. Bezoek voor meer informatie &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Geschreven door Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.&lt;br&gt;Gebaseerd op Mirall van Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</translation>
    </message>
@@ -1962,79 +2007,79 @@ bezoek dan &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt;
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Downloaden</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Uploaden</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
        <source>Context</source>
-        <translation type="unfinished"/>
+        <translation>Context</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
        <source>Inactive</source>
-        <translation type="unfinished"/>
+        <translation>Inactief</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>Start</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
        <source>Finished</source>
-        <translation type="unfinished"/>
+        <translation>Klaar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
        <source>For deletion</source>
-        <translation type="unfinished"/>
+        <translation>Voor verwijdering</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>verwijderd</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
        <source>downloading</source>
-        <translation type="unfinished"/>
+        <translation>Aan het downloaden</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
        <source>uploading</source>
-        <translation type="unfinished"/>
+        <translation>Aan het uploaden</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
        <source>inactive</source>
-        <translation type="unfinished"/>
+        <translation>inactief</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
        <source>starting</source>
-        <translation type="unfinished"/>
+        <translation>beginnend</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
        <source>finished</source>
-        <translation type="unfinished"/>
+        <translation>klaar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>verwijderen</translation>
    </message>
 </context>
 <context>
@@ -2042,47 +2087,47 @@ bezoek dan &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt;
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Ongedefinieerde status</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisatie in afwachting</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Bezig met synchroniseren</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisatie geslaagd.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
        <source>Sync Success, problems with individual files.</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisatie geslaagd met problemen met individuele bestanden.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Synchroniseerfout - Klik op de info knop voor details.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Installatiefout</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
        <source>The server is currently unavailable</source>
-        <translation type="unfinished"/>
+        <translation>Server is op dit moment niet beschikbaar.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation type="unfinished"/>
+        <translation>Voorbereiden synchronisatie</translation>
    </message>
 </context>
 </TS>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Synchronizacja rozpoczęta</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Otwórz %1 w przeglądarce</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Obliczam quote...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Nieznany status</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Ustawienia...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Szczegóły...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Pomoc</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Otwórz folder %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Aktualne</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Brak.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Zarządzane foldery:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Otwórz katalog &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Quota n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Folder %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Nie skonfigurowano synchronizowanych folderów.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync nie obsługiwane, odmowa uprawnień.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync nie mógł odnaleźć określonego pliku.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync próbował utworzyć katalog, który już istnieje.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Brak dostępnego miejsca na serwerze %1.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Nieokreślony błąd CSync.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Błąd</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>Wątek CSync zakończony.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Usunąć wszystkie pliki?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Usuń wszystkie pliki</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Pozostaw pliki</translation>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Nie udało się zresetować stanu folderu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Niezdefiniowany stan</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Czekają na uruchomienie synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Przygotowuję do synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Synchronizacja w toku</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Serwer jest obecnie niedostępny.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Błąd ustawień.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation> %1 (Synchronizacja jest zatrzymana)</translation>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation>Szczegółowy protokół synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>Etykieta</translation>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>Plik zignorowany.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation type="unfinished"/>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>plik</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
-        <translation type="unfinished"/>
+        <source>directory</source>
+        <translation>Katalog</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>Zapisz plik dziennika do pliku na dysku w celu debugowania.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Błąd</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Plik &apos;%1&apos;&lt;br&gt;nie może zostać otwarty do zapisu.&lt;br/&gt;&lt;br/&gt;Dane wyjściowe dziennika &lt;b&gt;nie&lt;/b&gt; mogą być zapisane!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Zapisz plik dziennika</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Nie można zapisać w pliku dziennika</translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBajtów/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
-        <translation>Brak limitu</translation>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1914,6 +1929,34 @@ Kliknij</translation>
        <translation>Połączenie szyfrowane</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1930,7 +1973,7 @@ Kliknij</translation>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation type="unfinished"/>
@@ -1939,12 +1982,12 @@ Kliknij</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1955,13 +1998,13 @@ Kliknij</translation>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Pobierz</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Wyślij</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1993,7 +2036,7 @@ Kliknij</translation>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>usunięto</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2027,7 +2070,7 @@ Kliknij</translation>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>usuń</translation>
    </message>
 </context>
 <context>
@@ -2035,22 +2078,22 @@ Kliknij</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Stan niezdefiniowany</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Trwa oczekiwanie na uruchomienie synchronizacji</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizacja uruchomiona</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Udana synchronizacja</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2060,12 +2103,12 @@ Kliknij</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Błąd synchronizacji - kliknij przycisk Info aby uzyskać szczegółowe informacje.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Błąd ustawień</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 A sincronização inicou.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Ajuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Abrir a pasta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Actualizado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Pastas Geridas:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Nenhuma pasta de sincronização configurada.</translation>
    </message>
@@ -457,28 +457,28 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync: Erro devido a permissões de negação não tratadas.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync: Erro a encontrar um ficheiro específico.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>O CSync tentou criar uma pasta que já existe.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Não ha espaço disponível no servidor %1</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>CSync: erro não especificado</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -540,100 +540,100 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Erro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>A operação CSync terminou.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation type="unfinished"/>
    </message>
@@ -641,57 +641,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Estado indefinido.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>A aguardar o inicio da sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>A sincronização está a correr.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>A última sincronização foi efectuada com sucesso.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Erro na instalação.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -718,7 +718,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -915,17 +915,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>TextLabel</translation>
    </message>
@@ -966,51 +966,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation type="unfinished"/>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>ficheiro</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
-        <translation type="unfinished"/>
+        <source>directory</source>
+        <translation>diretório</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1076,23 +1091,23 @@ name</source>
        <translation>Guarde o ficheiro de registo no disco para debug.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Erro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;O ficheiro &apos;%1&apos;&lt;br/&gt;não pode ser aberto para escrita.&lt;br/&gt;&lt;br/&gt;O ficheiro de registo &lt;b&gt;not&lt;/b&gt; pode ser guardado!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Guardar ficheiro de log</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Não foi possível escrever no ficheiro de log</translation>
    </message>
@@ -1146,29 +1161,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1914,6 +1929,34 @@ name</source>
        <translation>Ligação SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1930,7 +1973,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation type="unfinished"/>
@@ -1939,12 +1982,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1955,13 +1998,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Transferir</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Carregar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1993,7 +2036,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>apagado</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2027,7 +2070,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>apagar</translation>
    </message>
 </context>
 <context>
@@ -2035,22 +2078,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Estado indefinido</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>A aguardar o início da sincronização.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>A sincronização está a decorrer</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>A sincronização foi efectuada com sucesso</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2060,12 +2103,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Erro na sincronização. Clique no botão info para detalhes.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Erro na configuração</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -171,7 +171,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="453"/>
        <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Conectado à &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="454"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Sincronização Iniciada</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>Sincronização iniciada para %n pasta(s) configurada(s).</numerusform><numerusform>Sincronização iniciada para %n pasta(s) configurada(s).</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Abrir %1 no navegador</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Calculando cota...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Status desconhecido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Configurações...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Detalhes...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Ajuda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation>Sair %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Abrir pasta %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation>%1% de %2 em uso</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Até a data</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Nenhum.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Alterações Recentes</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Pastas Gerenciadas:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Abrir pasta &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Cota n/a</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation>Não há itens sincronizados recentemente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Pasta %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Pastas de sincronização não configuradas.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync falhou devido a uma negativa de permissão não resolvida.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation>CSync: Permissão negada.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync falhou ao procurar um arquivo específico.</translation>
+        <source>CSync: File not found.</source>
+        <translation>CSync: Arquivo não encontrado.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync tentou criar um diretório que já existe.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation>CSync: Diretório já existe.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
+        <source>CSync: No space left on %1 server.</source>
        <translation>CSync: sem espaço disponível no servidor %1.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Erro não especificado no CSync.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation>CSync: Erro não especificado.</translation>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -536,87 +536,87 @@
    <message>
        <location filename="../src/mirall/folder.cpp" line="291"/>
        <source>File %1</source>
-        <translation type="unfinished"/>
+        <translation>Arquivo %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation>Novo arquivo disponível</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation>&apos;%1&apos; foi sincronizado com esta máquina</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation>Novos arquivos disponíveis</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation>Arquivo removido</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation>&apos;%1&apos; foi removido.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation>Arquivos removidos</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation>Arquivo atualizado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation>&apos;%1&apos; foi atualizado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation>Arquivos atualizados</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Erro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>A thread CSync foi terminada.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>Esta sincronização irá remover todos os arquivos na pasta de sincronização local &apos;%1&apos;.
 Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha &quot;Manter arquivos&quot;. Se você deseja que seus dados sejam removidos, escolha &quot;Remover todos os arquivos&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -625,17 +625,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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Remover Todos os Arquivos?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Remover Rodos os Arquivos</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Manter arquivos</translation>
    </message>
@@ -643,57 +643,57 @@ Você tem certeza que quer executar esta operação?</translation>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Não foi possível redefinir o estado da pasta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Uma velha revista de sincronização &apos;%1&apos; foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Estado indefinido.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Aguardando o inicio da sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Preparando para sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>A sincronização está ocorrendo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Servidor indisponível no momento.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>A última sincronização foi feita com sucesso.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Erro de configuração.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Pausa na Sincronização) </translation>
    </message>
@@ -720,7 +720,7 @@ Você tem certeza que quer executar esta operação?</translation>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -920,17 +920,17 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
        <translation>Protocolo de Sincronização Detalhado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>TextLabel</translation>
    </message>
@@ -971,56 +971,73 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>Arquivo ignorado.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>Diretório ignorado.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>Soft Link ignorado.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>Ignorado.</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation>Arquivo de conflito.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
 name</source>
-        <translation type="unfinished"/>
+        <translation>O arquivo foi alterado no repositório do servidor e local, e, como resultado,
+foi criado um chamado conflito. A mudança de local foi copiado para o arquivo de conflito
+enquanto o arquivo do lado do servidor está disponível sob o nome original</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="231"/>
@@ -1081,23 +1098,23 @@ name</source>
        <translation>Salvar arquivo de log para um arquivo no disco para depuração.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Erro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Arquivo &apos;%1&apos;&lt;br/&gt;não pode ser aberto para escrita.&lt;br/&gt;&lt;br/&gt;A saída de log &lt;b&gt;não&lt;/b&gt; pode ser salva!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Salvar arquivo de log</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Incapaz de gravar arquivo de log</translation>
    </message>
@@ -1151,29 +1168,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Limitar a</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>KBytes/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation>Sem Limite</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Enviar banda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Limite automático</translation>
    </message>
@@ -1218,7 +1235,7 @@ name</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="57"/>
        <source>Connect...</source>
-        <translation type="unfinished"/>
+        <translation>Conectar...</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="107"/>
@@ -1919,6 +1936,34 @@ name</source>
        <translation>Conexão SSL</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation>%L1 TB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation>%L1 GB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation>%L1 MB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation>%L1 kB</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation>%L1 B</translation>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1935,7 +1980,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Se você ainda não tem um servidor ownCloud, acesse &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</translation>
@@ -1944,12 +1989,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Construído a partir de revisão Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 usando OCsync %5 e Qt %6.&lt;/small&gt;&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation>&lt;p&gt;Versão %2. Para mais informações visite &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, ownCloud Inc.&lt;br&gt;BAseado em Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</translation>
    </message>
@@ -1960,79 +2005,79 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Baixar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Upload</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
        <source>Context</source>
-        <translation type="unfinished"/>
+        <translation>Contexto</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
        <source>Inactive</source>
-        <translation type="unfinished"/>
+        <translation>Inativo</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
        <source>Start</source>
-        <translation type="unfinished"/>
+        <translation>Iniciar</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
        <source>Finished</source>
-        <translation type="unfinished"/>
+        <translation>Finalizado</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
        <source>For deletion</source>
-        <translation type="unfinished"/>
+        <translation>Para deleção</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>excluído</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
        <source>downloading</source>
-        <translation type="unfinished"/>
+        <translation>baixando</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
        <source>uploading</source>
-        <translation type="unfinished"/>
+        <translation>enviando</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
        <source>inactive</source>
-        <translation type="unfinished"/>
+        <translation>inativo</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
        <source>starting</source>
-        <translation type="unfinished"/>
+        <translation>iniciando</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
        <source>finished</source>
-        <translation type="unfinished"/>
+        <translation>finalizado</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>remover</translation>
    </message>
 </context>
 <context>
@@ -2040,47 +2085,47 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Status indefinido</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Aguardando para iniciar sincronização</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Sincronização em andamento</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Sucesso da Sincronização</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
        <source>Sync Success, problems with individual files.</source>
-        <translation type="unfinished"/>
+        <translation>Sincronização com Sucesso, problemas com arquivos individuais.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Erro da Sincronização - Clique no botão info para detalhes</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Erro na Configuração</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
        <source>The server is currently unavailable</source>
-        <translation type="unfinished"/>
+        <translation>Servidor indisponível no momento.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation type="unfinished"/>
+        <translation>Preparando para sincronização</translation>
    </message>
 </context>
 </TS>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>%1 Синхронизация начата</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation><numerusform>Синхронизация начата для %n выбранной папки.</numerusform><numerusform>Синхронизация начата для %n выбранных папки(ок).</numerusform><numerusform>Синхронизация начата для %n выбранных папки(ок).</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation>Открыть %1 в браузере</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Расчёт квоты...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Неизвестный статус</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Настройки...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation>Детали...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Помощь</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation>Выход %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Открыть %1 папку</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Актуальная версия</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation>Пусто</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation>Недавние изменения</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Управляемые папки:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation>Открыть папку &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation>Квота недоступна</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation>Недавно ничего не синхронизировалсь</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation>%1 (%2, %3)</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation>Синхронизируются  %1 из %2 (%3 из %4) </translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Папка %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Нет папок для синхронизации.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>CSync упал в связи с отутствием обработки из-за отказа в доступе.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>CSync не смог найти заданный файл.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>CSync пытался создать директорию, которая уже существует.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>CSync: Нет доступного пространства на сервере %1 server.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Неизвестная ошибка CSync.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,84 +539,84 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Ошибка</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>CSync поток закрыт.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation>Это действие может удалить все файлы в локальной папке &apos;%1&apos;.
 Если вы или ваш администратор заново создали вашу учётную запись на сервере, выберите &quot;Сохранить файлы&quot;. Если вы хотите стереть всё - выберите &quot;Удалить все файлы&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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>
@@ -625,17 +625,17 @@ Are you sure you want to perform this operation?</source>
 Вы уверены, что хотите выполнить операцию?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation>Удалить все файлы?</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Удалить все файлы</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Сохранить файлы</translation>
    </message>
@@ -643,57 +643,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Невозможно сбросить состояние папки</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Найден старый журнал синхронизации &apos;%1&apos;, и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Неопределенное состояние.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Ожидает, чтобы начать синхронизацию.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation>Подготовка к синхронизации.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Идет синхронизация.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Сервер недоступен.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Последняя синхронизация прошла успешно.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Ошибка установки.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation>%! (синхронизация приостановлена)</translation>
    </message>
@@ -720,7 +720,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -919,17 +919,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation>Подробная информация о протоколе</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation>3</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation>4</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>TextLabel</translation>
    </message>
@@ -970,51 +970,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
-        <translation>Файл проигнорирован.</translation>
+        <source>Soft Link ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation>Папка проигнорирована.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>файл</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
+        <source>directory</source>
+        <translation>директория</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
-        <translation>Мягкая ссылка проигнорирована.</translation>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
-        <translation>Проигнорирован.</translation>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1080,23 +1095,23 @@ name</source>
        <translation>Сохранить файл журнала на диск для отладки.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Ошибка</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Файл &apos;%1&apos;&lt;br/&gt;не может быть открыт на запись.&lt;br/&gt;&lt;br/&gt;Журнал &lt;b&gt;не может&lt;/b&gt; быть сохранён!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Сохранить файл журнала</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>Файл журнала не может быть записан</translation>
    </message>
@@ -1150,29 +1165,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation>Ограничить до</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation>Кбайт/сек</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
-        <translation>Без ограничений</translation>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation>Пропускная способность закачки</translation>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation>Ограничивать автоматически</translation>
    </message>
@@ -1918,6 +1933,34 @@ name</source>
        <translation>SSL соединение </translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1934,7 +1977,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Если у Вас ещё нет сервера ownCloud, обратитесь за дополнительной информацией на &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt;</translation>
@@ -1943,12 +1986,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Собрано из исходников Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; на %3, %4 используя OCsync %5 и Qt %6.&lt;/small&gt;&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1959,13 +2002,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Скачать</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Загрузка</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1997,7 +2040,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>удален</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2031,7 +2074,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>удалить</translation>
    </message>
 </context>
 <context>
@@ -2039,22 +2082,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Статус неопределён</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Ожидание начала синхронизации</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Синхронизация запущена</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Синхронизация прошла успешно</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2064,12 +2107,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Ошибка синхронизации - Нажмите кнопку информации для подробного описания.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Ошибка установки</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
@@ -227,112 +227,112 @@
 <context>
    <name>Mirall::Application</name>
    <message>
-        <location filename="../src/mirall/application.cpp" line="246"/>
+        <location filename="../src/mirall/application.cpp" line="252"/>
        <source>%1 Sync Started</source>
        <translation>Usklajevanje %1 je začeto</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="247"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
        <source>Sync started for %n configured sync folder(s).</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="319"/>
+        <location filename="../src/mirall/application.cpp" line="325"/>
        <source>Open %1 in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="321"/>
+        <location filename="../src/mirall/application.cpp" line="327"/>
        <source>Calculating quota...</source>
        <translation>Preračunavanje kvote...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="323"/>
+        <location filename="../src/mirall/application.cpp" line="329"/>
        <source>Unknown status</source>
        <translation>Neznan status</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="325"/>
+        <location filename="../src/mirall/application.cpp" line="331"/>
        <source>Settings...</source>
        <translation>Nastavitve...</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="326"/>
+        <location filename="../src/mirall/application.cpp" line="332"/>
        <source>Details...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="331"/>
+        <location filename="../src/mirall/application.cpp" line="337"/>
        <source>Help</source>
        <translation>Pomoč</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="333"/>
+        <location filename="../src/mirall/application.cpp" line="339"/>
        <source>Quit %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
+        <location filename="../src/mirall/application.cpp" line="389"/>
        <source>Open %1 folder</source>
        <translation>Odpri %1 mapo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="526"/>
+        <location filename="../src/mirall/application.cpp" line="537"/>
        <source>%1% of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
+        <location filename="../src/mirall/application.cpp" line="609"/>
        <source>Up to date</source>
        <translation>Ni posodobitev</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="362"/>
+        <location filename="../src/mirall/application.cpp" line="368"/>
        <source>None.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="372"/>
        <source>Recent Changes</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="393"/>
+        <location filename="../src/mirall/application.cpp" line="399"/>
        <source>Managed Folders:</source>
        <translation>Upravljane mape:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="396"/>
+        <location filename="../src/mirall/application.cpp" line="402"/>
        <source>Open folder &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="530"/>
        <source>Quota n/a</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="552"/>
+        <location filename="../src/mirall/application.cpp" line="563"/>
        <source>No items synced recently</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="561"/>
+        <location filename="../src/mirall/application.cpp" line="572"/>
        <source>%1 (%2, %3)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="576"/>
+        <location filename="../src/mirall/application.cpp" line="587"/>
        <source>Syncing %1 of %2 (%3 of %4) </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="814"/>
+        <location filename="../src/mirall/application.cpp" line="825"/>
        <source>Folder %1: %2</source>
        <translation>Mapa %1: %2</translation>
    </message>
    <message>
-        <location filename="../src/mirall/application.cpp" line="820"/>
+        <location filename="../src/mirall/application.cpp" line="831"/>
        <source>No sync folders configured.</source>
        <translation>Ni nastavljenih map za usklajevanje.</translation>
    </message>
@@ -456,28 +456,28 @@
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="143"/>
-        <source>CSync failed due to not handled permission deniend.</source>
-        <translation>Delovanje CSync je zaradi neustreznih dovoljenj spodletelo.</translation>
+        <source>CSync: Permission deniend.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="146"/>
-        <source>CSync failed to find a specific file.</source>
-        <translation>Iskanje določene datoteke s CSync je spodletelo.</translation>
+        <source>CSync: File not found.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="149"/>
-        <source>CSync tried to create a directory that already exists.</source>
-        <translation>Prišlo je do napake na CSync zaradi poskusa ustvarjanja mape z že obstoječim imenom.</translation>
+        <source>CSync: Directory already exists.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="152"/>
-        <source>CSync: No space on %1 server available.</source>
-        <translation>Odziv CSync: na strežniku %1 ni razpoložljivega prostora.</translation>
+        <source>CSync: No space left on %1 server.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="155"/>
-        <source>CSync unspecified error.</source>
-        <translation>Nedoločena napaka CSync.</translation>
+        <source>CSync: unspecified error.</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/csyncthread.cpp" line="158"/>
@@ -539,100 +539,100 @@
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>New file available</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="332"/>
+        <location filename="../src/mirall/folder.cpp" line="342"/>
        <source>&apos;%1&apos; has been synced to this machine.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>New files available</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="334"/>
+        <location filename="../src/mirall/folder.cpp" line="344"/>
        <source>&apos;%1&apos; and %n other file(s) have been synced to this machine.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>File removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="340"/>
+        <location filename="../src/mirall/folder.cpp" line="350"/>
        <source>&apos;%1&apos; has been removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>Files removed</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="342"/>
+        <location filename="../src/mirall/folder.cpp" line="352"/>
        <source>&apos;%1&apos; and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>File updated</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="348"/>
+        <location filename="../src/mirall/folder.cpp" line="358"/>
        <source>&apos;%1&apos; has been updated.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>Files updated</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/mirall/folder.cpp" line="350"/>
+        <location filename="../src/mirall/folder.cpp" line="360"/>
        <source>&apos;%1&apos; and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="392"/>
+        <location filename="../src/mirall/folder.cpp" line="402"/>
        <source>Error</source>
        <translation>Napaka</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="421"/>
+        <location filename="../src/mirall/folder.cpp" line="431"/>
        <source>The CSync thread terminated.</source>
        <translation>CSync nit je zaključena.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="661"/>
+        <location filename="../src/mirall/folder.cpp" line="675"/>
        <source>This sync would remove all the files in the local sync folder '%1'.
 If you or your administrator have reset your account on the server, choose &quot;Keep files&quot;. If you want your data to be removed, choose &quot;Remove all files&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="664"/>
+        <location filename="../src/mirall/folder.cpp" line="678"/>
        <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="668"/>
+        <location filename="../src/mirall/folder.cpp" line="682"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="670"/>
+        <location filename="../src/mirall/folder.cpp" line="684"/>
        <source>Remove all files</source>
        <translation>Odstrani vse dokumente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folder.cpp" line="671"/>
+        <location filename="../src/mirall/folder.cpp" line="685"/>
        <source>Keep files</source>
        <translation>Ohrani dokumente</translation>
    </message>
@@ -640,57 +640,57 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderMan</name>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="133"/>
+        <location filename="../src/mirall/folderman.cpp" line="134"/>
        <source>Could not reset folder state</source>
        <translation>Stanja mape ni mogoče ponastaviti</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="134"/>
+        <location filename="../src/mirall/folderman.cpp" line="135"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Obstaja strarejši dnevnik sinhronizacije  &apos;%1&apos;, vendar ne more biti odstranjen. Preverite, da ni v uporabi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="566"/>
+        <location filename="../src/mirall/folderman.cpp" line="567"/>
        <source>Undefined State.</source>
        <translation>Nedoločeno stanje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="569"/>
+        <location filename="../src/mirall/folderman.cpp" line="570"/>
        <source>Waits to start syncing.</source>
        <translation>Čakam na začetek usklajevanja.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="572"/>
+        <location filename="../src/mirall/folderman.cpp" line="573"/>
        <source>Preparing for sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="575"/>
+        <location filename="../src/mirall/folderman.cpp" line="576"/>
        <source>Sync is running.</source>
        <translation>Usklajevanje se izvaja.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="578"/>
+        <location filename="../src/mirall/folderman.cpp" line="579"/>
        <source>Server is currently not available.</source>
        <translation>Strežnik trenutno ni na voljo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="581"/>
+        <location filename="../src/mirall/folderman.cpp" line="582"/>
        <source>Last Sync was successful.</source>
        <translation>Zadnje usklajevanje je bilo uspešno.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="586"/>
+        <location filename="../src/mirall/folderman.cpp" line="587"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="589"/>
+        <location filename="../src/mirall/folderman.cpp" line="590"/>
        <source>Setup Error.</source>
        <translation>Napaka nastavitev.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderman.cpp" line="595"/>
+        <location filename="../src/mirall/folderman.cpp" line="596"/>
        <source>%1 (Sync is paused)</source>
        <translation type="unfinished"/>
    </message>
@@ -717,7 +717,7 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>Mirall::FolderWatcherPrivate</name>
    <message>
-        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="54"/>
+        <location filename="../src/mirall/folderwatcher_inotify.cpp" line="53"/>
        <source>Could not monitor directories due to system limitations.
 The application will not work reliably. Please check the
 documentation for possible fixes.</source>
@@ -914,17 +914,17 @@ Checked items will also be deleted if they prevent a directory from being remove
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="60"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="57"/>
        <source>3</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="65"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="62"/>
        <source>4</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.ui" line="73"/>
+        <location filename="../src/mirall/itemprogressdialog.ui" line="70"/>
        <source>TextLabel</source>
        <translation>Besedilna oznaka</translation>
    </message>
@@ -965,51 +965,66 @@ Checked items will also be deleted if they prevent a directory from being remove
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/>
-        <source>File ignored.</source>
+        <source>Soft Link ignored</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="121"/>
-        <source>The file was ignored because it is listed in the clients ignore list
-or the filename contains characters that are not syncable
-in a cross platform environment.</source>
+        <source>Softlinks break the semantics of synchronization.
+Please do not use them in synced directories</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="125"/>
-        <source>Directory ignored.</source>
-        <translation type="unfinished"/>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="124"/>
+        <source>file</source>
+        <translation>datoteka</translation>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="126"/>
-        <source>The directory was ignored because it is listed in the clients
-ignore list or the directory name contains
-characters that are not syncable in a cross  platform environment.</source>
-        <translation type="unfinished"/>
+        <source>directory</source>
+        <translation>direktorij</translation>
    </message>
    <message>
-        <location filename="../src/mirall/itemprogressdialog.cpp" line="130"/>
-        <source>Soft Link ignored.</source>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="128"/>
+        <source>The %1 was ignored because it is listed in the clients ignore list
+or the %1 name contains characters that are not syncable
+in a cross platform environment</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="131"/>
-        <source>Softlinks break the semantics of synchronization.
-Please do not use them in synced directories.</source>
+        <source>Item ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="133"/>
+        <source>%1 on ignore list</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="134"/>
-        <source>Ignored.</source>
+        <source>The %1 was skipped because it is listed on the clients
+list of names to ignore</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="137"/>
-        <source>Conflict file.</source>
+        <source>Invalid characters</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/itemprogressdialog.cpp" line="138"/>
+        <source>The %1 name contains one or more invalid characters which break
+syncing in a cross platform environment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="143"/>
+        <source>Conflict file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/itemprogressdialog.cpp" line="144"/>
        <source>The file was changed on server and local repository and as a result it
 created a so called conflict. The local change is copied to the conflict
 file while the file from the server side is available under the original
@@ -1075,23 +1090,23 @@ name</source>
        <translation>Shrani beleženje v dnevniško datoteko na disk za nadaljnje razhroščevanje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="162"/>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="164"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Error</source>
        <translation>Napaka</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="163"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="165"/>
        <source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
        <translation>&lt;nobr&gt;Datoteke &apos;%1&apos;&lt;br/&gt;ni mogoče odpreti za pisanje.&lt;br/&gt;&lt;br/&gt;Dnevniškega zapisa &lt;b&gt;ni mogoče&lt;/b&gt; shraniti!&lt;/nobr&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="208"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="210"/>
        <source>Save log file</source>
        <translation>Shrani dnevniško datoteko</translation>
    </message>
    <message>
-        <location filename="../src/mirall/logbrowser.cpp" line="218"/>
+        <location filename="../src/mirall/logbrowser.cpp" line="220"/>
        <source>Could not write to log file </source>
        <translation>V dnevniško datoteko ni mogoče pisati.</translation>
    </message>
@@ -1145,29 +1160,29 @@ name</source>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="188"/>
-        <location filename="../src/mirall/networksettings.ui" line="281"/>
+        <location filename="../src/mirall/networksettings.ui" line="287"/>
        <source>Limit to</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="210"/>
-        <location filename="../src/mirall/networksettings.ui" line="306"/>
+        <location filename="../src/mirall/networksettings.ui" line="312"/>
        <source>KBytes/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="232"/>
-        <location filename="../src/mirall/networksettings.ui" line="264"/>
-        <source>No Limit</source>
+        <location filename="../src/mirall/networksettings.ui" line="270"/>
+        <source>No limit</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="258"/>
+        <location filename="../src/mirall/networksettings.ui" line="264"/>
        <source>Upload Bandwidth</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/networksettings.ui" line="271"/>
+        <location filename="../src/mirall/networksettings.ui" line="277"/>
        <source>Limit automatically</source>
        <translation type="unfinished"/>
    </message>
@@ -1913,6 +1928,34 @@ name</source>
        <translation>SSL povezava</translation>
    </message>
 </context>
+<context>
+    <name>Utility</name>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="114"/>
+        <source>%L1 TB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="117"/>
+        <source>%L1 GB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="120"/>
+        <source>%L1 MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="123"/>
+        <source>%L1 kB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/utility.cpp" line="126"/>
+        <source>%L1 B</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>main.cpp</name>
    <message>
@@ -1929,7 +1972,7 @@ name</source>
 <context>
    <name>ownCloudTheme</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="99"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
        <source>If you don&apos;t have an ownCloud server yet, see &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; for more info.</source>
        <comment>Top text in setup wizard. Keep short!</comment>
        <translation>Če nimate strežnika ownCloud, obiščite &lt;a href=&quot;https://owncloud.com&quot;&gt;owncloud.com&lt;/a&gt; za več informacij.</translation>
@@ -1938,12 +1981,12 @@ name</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="57"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using OCsync %5 and Qt %6.&lt;/small&gt;&lt;p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/owncloudtheme.cpp" line="65"/>
+        <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
        <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, ownCloud Inc.&lt;br&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;%7</source>
        <translation type="unfinished"/>
    </message>
@@ -1954,13 +1997,13 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
        <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Prejmi</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
        <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Pošlji</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
@@ -1992,7 +2035,7 @@ name</source>
        <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
        <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
        <source>deleted</source>
-        <translation type="unfinished"/>
+        <translation>izbrisano</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="74"/>
@@ -2026,7 +2069,7 @@ name</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
        <source>delete</source>
-        <translation type="unfinished"/>
+        <translation>izbriši</translation>
    </message>
 </context>
 <context>
@@ -2034,22 +2077,22 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="48"/>
        <source>Status undefined</source>
-        <translation type="unfinished"/>
+        <translation>Stanje je nedoločeno</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="51"/>
        <source>Waiting to start sync</source>
-        <translation type="unfinished"/>
+        <translation>Čakam na začetek usklajevanja</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="54"/>
        <source>Sync is running</source>
-        <translation type="unfinished"/>
+        <translation>Usklajevanje v teku</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="57"/>
        <source>Sync Success</source>
-        <translation type="unfinished"/>
+        <translation>Usklajevanje je bilo uspešno</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="60"/>
@@ -2059,12 +2102,12 @@ name</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="63"/>
        <source>Sync Error - Click info button for details.</source>
-        <translation type="unfinished"/>
+        <translation>Napaka pri usklajevanju - Kliknite gumb info za prikaz podrobnosti.</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="66"/>
        <source>Setup Error</source>
-        <translation type="unfinished"/>
+        <translation>Napaka pri nastavitvi</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="69"/>
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Daniel Molkentin	9ce09713b6	1.4.0 final	2013-09-04 11:09:12 +02:00
Klaas Freitag	4fa6faf608	Hide quota and display explanation if no quota info is available.	2013-09-03 14:25:28 +02:00
Klaas Freitag	a24ae13d9c	Added logging to quota info result slot.	2013-09-03 14:25:28 +02:00
Daniel Molkentin	64dd0d1b45	Consistent look for top-labels	2013-09-03 14:24:34 +02:00
Daniel Molkentin	da63b1223c	Doc: more polishing - add description of syncing limitations - update out-of-date comments Fixes #788	2013-09-03 12:35:40 +02:00
Jenkins for ownCloud	36f32c2aef	[tx-robot] updated from transifex	2013-09-03 06:30:41 -04:00
Daniel Molkentin	063acadc3b	Doc: new interface chapter	2013-09-02 19:28:06 +02:00
Klaas Freitag	81c720c05b	Remove dots from the end of error messages.	2013-09-02 17:37:16 +02:00
Klaas Freitag	edcdcb945a	Show the reason why a file was ignored.	2013-09-02 17:25:23 +02:00
Daniel Molkentin	5df6430bb2	Doc: Do not enforce theme when building without submodules	2013-09-02 15:55:03 +02:00
Daniel Molkentin	9a0096d07c	Docs: Allow to build with org and com branding	2013-09-02 14:01:15 +02:00
Jenkins for ownCloud	25d33d6057	[tx-robot] updated from transifex	2013-09-01 12:30:19 -04:00
Daniel Molkentin	ab4c6247c7	Fix display of "Monochrome icon" setting The logic was inverse, and there was a typo in the string. Oh my...	2013-08-31 14:14:24 +02:00
Jenkins for ownCloud	1b69dbb38b	[tx-robot] updated from transifex	2013-08-30 09:22:37 -04:00
Daniel Molkentin	bfdd488b00	Tests: make tests run in parallel	2013-08-29 14:50:55 +02:00
Daniel Molkentin	54c8809bf4	Tests: Fix indentation	2013-08-29 14:50:18 +02:00
Daniel Molkentin	0873665bec	Tests: Move all comparisons from QVERIFY to QCOMPARE	2013-08-29 14:48:40 +02:00
Olivier Goffart	02b3033ca3	Use the same convention as on the server to format strings * use power of 10 SI units * use "B" instead of "bytes" * use at least 2 significant digit, but no more than one digit after the period	2013-08-29 12:06:41 +02:00
Olivier Goffart	a27c8ad90c	Fix crash in case of error the QObject::parent() is 0	2013-08-28 21:26:42 +02:00
Daniel Molkentin	18a58f73de	Startup: Unity has no proper Systray implementation ...so it can't respond to isSysTrayAvailable()	2013-08-28 15:45:52 +02:00
Daniel Molkentin	d1451a3c90	Mac: Use hdiutil attach instead of open during signing	2013-08-28 12:53:34 +02:00
Jenkins for ownCloud	0bef47b2f3	[tx-robot] updated from transifex	2013-08-28 05:24:20 -04:00
Jenkins for ownCloud	ccc05d6658	[tx-robot] updated from transifex	2013-08-27 10:23:30 -04:00
Olivier Goffart	c15de69156	Reconfigure the proxy when needed	2013-08-27 10:02:59 +02:00
Thomas Müller	8bfb44fd28	Inverting the logic to set the prefix for SYSCONF_INSTALL_DIR	2013-08-26 22:42:17 +02:00
Daniel Molkentin	79d3b84fad	Reintroduce workaround for /etc in root if files go to /usr	2013-08-26 21:59:52 +02:00
Daniel Molkentin	b97701586e	Properly install icons	2013-08-26 21:18:56 +02:00
Daniel Molkentin	b120345fe7	Icon file needs to use app_executable as well	2013-08-26 20:54:10 +02:00
Daniel Molkentin	ec5c65a530	install correct file	2013-08-26 20:35:56 +02:00
Daniel Molkentin	77e7a1fa8d	Fix casing in settings dialog	2013-08-26 20:22:24 +02:00
Daniel Molkentin	f6d45b68ef	More clear error messages	2013-08-26 20:20:10 +02:00
Daniel Molkentin	24d76a0d75	desktop file == executable	2013-08-26 20:20:10 +02:00
Olivier Goffart	c3326efe94	Do not sort the entries in the syc protocol dialog alphabetically The entries should be sorted chronogically. But now the QTreeWidget can only sort them alphabetically by the time, which is not what we want. Disalbe the sorting, and always insert the elements in the reverse order. Fix #890	2013-08-26 17:27:44 +02:00
Daniel Molkentin	c0e056bb84	Only show help if a URL is provided	2013-08-26 14:27:39 +02:00
Jenkins for ownCloud	8a7df36701	[tx-robot] updated from transifex	2013-08-25 18:19:18 -04:00
Jenkins for ownCloud	39ec6b1bb2	[tx-robot] updated from transifex	2013-08-23 19:15:56 -04:00
Daniel Molkentin	30b2406533	Fix windows packaging	2013-08-23 15:37:24 +02:00
Daniel Molkentin	076d5dda0e	RC1	2013-08-23 14:35:15 +02:00
Olivier Goffart	e78eab46ff	Fix saving the geometry of the log browser	2013-08-23 12:41:29 +02:00
Olivier Goffart	19a08f8d5e	Make remember the size of the settings dialog Before, we saved the geometry in the closeEvent which is only called if the user press the [x] in the title bar. But it is not called when the user accept the dialog (by pressing the close button or the enter key) So save the geometry in the destructor of the dialog instead. One also must call delete from the Application destructor because it was leaking	2013-08-23 12:25:16 +02:00
Olivier Goffart	c6319117fd	Better default size for the setting dialog	2013-08-23 11:59:49 +02:00
Olivier Goffart	4c10ed4ada	Remove some entries from the default exclude list. If the user really want to have those entries excluded it can add them manually. But one cannot change the default so if user want the .bak files synced, he would not be able to do it	2013-08-23 11:17:02 +02:00
Daniel Molkentin	b0ab3ca80b	Theme: Add documentation after recent changes	2013-08-23 10:36:09 +02:00
Daniel Molkentin	9f89a2fe76	More adjustments around the application name - libname is now derived from binary name (which is lowercase) - remove superflouos reimplementation of appName() in owncloud theme - APPLICATION_SHORTNAME is now optional (and if not set, equals APPLICATION_NAME	2013-08-23 10:30:03 +02:00
Daniel Molkentin	e386bfb550	fix x-compilation	2013-08-23 00:36:05 +02:00
Jenkins for ownCloud	0189a3f1bd	[tx-robot] updated from transifex	2013-08-22 10:35:38 -04:00
Olivier Goffart	d3a333e03c	Fix the 'copy button' in the protocol log Fix #863 Also added more padding for the filename because it might be big, and in case it's not enough, always add at least a space.	2013-08-22 16:20:04 +02:00
Olivier Goffart	04d3e282fb	Stop the poll timer when the folder is disabled No need to request etag every 30 second for disabled folder. When the folder is re-enabled, the Timer is actived again after the sync	2013-08-22 12:35:28 +02:00
Olivier Goffart	4be5f970d5	Default to no limit upload We don't want to make the transfer slow by default	2013-08-22 12:26:34 +02:00
Daniel Molkentin	31ceff181e	Amendment to last commit	2013-08-22 09:51:35 +02:00
Daniel Molkentin	42abf4101c	Honor cmake's install prefix since the entire ting is so incredibly broken in cmake, use the approach taken by csync (which emulates the approach of autotools), to get the directories right. This mandates changes in the theme, which need discussion (APPLICATION_SHORTNAME must now equal appName(), and APPLICATION_NAME should equal appGuiName()).	2013-08-22 09:40:25 +02:00
Daniel Molkentin	f09cae74fb	Merge pull request #897 from onnozweers/patch-1 Adding "Type=Application" to desktop file (to fix autostart in Ubuntu)	2013-08-21 16:50:25 -07:00
onnozweers	13a6393ec5	Adding "Type=Application" to desktop file (to fix autostart in Ubuntu)	2013-08-21 22:11:02 +02:00
Jenkins for ownCloud	ace57f9dd4	[tx-robot] updated from transifex	2013-08-21 07:10:45 -04:00
Daniel Molkentin	e5117a98c9	Quota bar: Reduce border width to 1px per request As requested by Jan	2013-08-21 11:34:49 +02:00
Daniel Molkentin	c1f7af7e6f	Write desktop file manually, add gnome startup property Fixes #893	2013-08-21 11:09:56 +02:00
Olivier Goffart	b4c116e2a2	Add the new directories comming from the sync in the watcher	2013-08-21 00:45:36 +02:00